summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2016-02-18 10:50:00 +0100
committerRoeland Jago Douma <rullzer@owncloud.com>2016-02-19 09:43:11 +0100
commit8756a22c60b1128c02b05149f1d8bd8abb250a5b (patch)
tree1827bdb5ea5751a2e4a6325c7783edb94b4d6d19 /lib/private
parent8e3667887396629caeeda2f3727dfb41391e7484 (diff)
downloadnextcloud-server-8756a22c60b1128c02b05149f1d8bd8abb250a5b.tar.gz
nextcloud-server-8756a22c60b1128c02b05149f1d8bd8abb250a5b.zip
Fix more things
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/group/manager.php1
-rw-r--r--lib/private/preview.php8
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 1f4092ed606..7eca249c701 100644
--- a/lib/private/group/manager.php
+++ b/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();
diff --git a/lib/private/preview.php b/lib/private/preview.php
index 4039109a570..4fca56dd984 100644
--- a/lib/private/preview.php
+++ b/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) {