Browse Source

Fix more things

remotes/origin/users-ajaxloadgroups
Joas Schilling 10 years ago
committed by Roeland Jago Douma
parent
commit
8756a22c60
  1. 1
      lib/private/group/manager.php
  2. 8
      lib/private/preview.php
  3. 2
      lib/public/appframework/utility/icontrollermethodreflector.php
  4. 3
      lib/public/search/pagedprovider.php

1
lib/private/group/manager.php

@ -152,6 +152,7 @@ class Manager extends PublicEmitter implements IGroupManager {
/**
* @param string $gid
* @return \OCP\IGroup
*/
protected function getGroupObject($gid) {
$backends = array();

8
lib/private/preview.php

@ -921,9 +921,9 @@ class Preview {
* @param int $askedWidth
* @param int $askedHeight
* @param int $previewWidth
* @param integer $previewHeight
* @param int $previewHeight
*
* @return double[]
* @return int[]
*/
private function scale($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) {
$scalingUp = $this->getScalingUp();
@ -971,7 +971,7 @@ class Preview {
* @param int $askedWidth
* @param int $askedHeight
* @param int $previewWidth
* @param double $previewHeight
* @param int $previewHeight
*/
private function crop($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight = null) {
$cropX = floor(abs($askedWidth - $previewWidth) * 0.5);
@ -990,7 +990,7 @@ class Preview {
* @param int $askedWidth
* @param int $askedHeight
* @param int $previewWidth
* @param double $previewHeight
* @param int $previewHeight
*/
private function cropAndFill($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) {
if ($previewWidth > $askedWidth) {

2
lib/public/appframework/utility/icontrollermethodreflector.php

@ -35,8 +35,8 @@ interface IControllerMethodReflector {
/**
* @param object $object an object or classname
* @param string $method the method which we want to inspect
* @since 8.0.0
* @return void
* @since 8.0.0
*/
public function reflect($object, $method);

3
lib/public/search/pagedprovider.php

@ -58,8 +58,7 @@ abstract class PagedProvider extends Provider {
* Search for $query
* @param string $query
* @param int $page pages start at page 1
* @param int $size, 0 = SIZE_ALL
* @param integer $size
* @param int $size 0 = SIZE_ALL
* @return array An array of OCP\Search\Result's
* @since 8.0.0
*/

Loading…
Cancel
Save