aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/preview.php
diff options
context:
space:
mode:
authorScrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>2016-02-17 13:21:07 +0000
committerRoeland Jago Douma <rullzer@owncloud.com>2016-02-19 09:43:11 +0100
commit0d0151a3e1fff5d98f2c764a90e7ebf4f98ae729 (patch)
tree1e5c1ea5113b1d1dfb2d51b86ecfe3fd244b8e9f /lib/private/preview.php
parentae2304f23f04f1d6c84f2a049a4b0fdc0c9023c6 (diff)
downloadnextcloud-server-0d0151a3e1fff5d98f2c764a90e7ebf4f98ae729.tar.gz
nextcloud-server-0d0151a3e1fff5d98f2c764a90e7ebf4f98ae729.zip
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
Diffstat (limited to 'lib/private/preview.php')
-rw-r--r--lib/private/preview.php22
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/private/preview.php b/lib/private/preview.php
index df6eeceddcb..4039109a570 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -202,7 +202,7 @@ class Preview {
/**
* returns the max width set in ownCloud's config
*
- * @return string
+ * @return integer
*/
public function getConfigMaxX() {
return $this->configMaxWidth;
@@ -211,7 +211,7 @@ class Preview {
/**
* returns the max height set in ownCloud's config
*
- * @return string
+ * @return integer
*/
public function getConfigMaxY() {
return $this->configMaxHeight;
@@ -546,7 +546,7 @@ class Preview {
/**
* Determines the size of the preview we should be looking for in the cache
*
- * @return int[]
+ * @return integer[]
*/
private function simulatePreviewDimensions() {
$askedWidth = $this->getMaxX();
@@ -570,7 +570,7 @@ class Preview {
*
* @param int $originalWidth
* @param int $originalHeight
- * @return \int[]
+ * @return integer[]
*/
private function applyAspectRatio($askedWidth, $askedHeight, $originalWidth = 0, $originalHeight = 0) {
if(!$originalWidth){
@@ -602,7 +602,7 @@ class Preview {
* @param int $askedHeight
* @param int $previewWidth
* @param int $previewHeight
- * @return \int[]
+ * @return integer[]
*/
private function applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight) {
$originalRatio = $previewWidth / $previewHeight;
@@ -628,7 +628,7 @@ class Preview {
* @param int $askedWidth
* @param int $askedHeight
*
- * @return \int[]
+ * @return integer[]
*/
private function fixSize($askedWidth, $askedHeight) {
if ($this->scalingUp) {
@@ -921,9 +921,9 @@ class Preview {
* @param int $askedWidth
* @param int $askedHeight
* @param int $previewWidth
- * @param null $previewHeight
+ * @param integer $previewHeight
*
- * @return int[]
+ * @return double[]
*/
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 null $previewHeight
+ * @param double $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 null $previewHeight
+ * @param double $previewHeight
*/
private function cropAndFill($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) {
if ($previewWidth > $askedWidth) {
@@ -1218,7 +1218,7 @@ class Preview {
* @param int $maxDim
* @param string $dimName
*
- * @return mixed
+ * @return integer
*/
private function limitMaxDim($dim, $maxDim, $dimName) {
if (!is_null($maxDim)) {