mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7836 from nextcloud/image-type-hinting 

Fix float/integer handling in image API
This commit is contained in:
Morris Jobke 2018-01-17 11:40:35 +01:00 committed by GitHub
parent 6e95bd7a51 e4b3ee8d8f
commit 9222dcd940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Preview/Generator.php
View File

@ -345,9 +345,9 @@ class Generator {
$scaleH = $maxHeight / $widthR;
$scaleW = $width;
}
$preview->preciseResize(round($scaleW), round($scaleH));
$preview->preciseResize((int)round($scaleW), (int)round($scaleH));
}
$cropX = floor(abs($width - $preview->width()) * 0.5);
$cropX = (int)floor(abs($width - $preview->width()) * 0.5);
$cropY = 0;
$preview->crop($cropX, $cropY, $width, $height);
} else {

6
lib/private/Preview/GeneratorHelper.php
View File

@ -27,7 +27,7 @@ use OCP\Files\File;
use OCP\Files\IRootFolder;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\IImage;
use OCP\Image as img;
use OCP\Image as OCPImage;
use OCP\Preview\IProvider;
/**
@ -79,7 +79,9 @@ class GeneratorHelper {
* @return IImage
*/
public function getImage(ISimpleFile $maxPreview) {
return new img($maxPreview->getContent());
$image = new OCPImage();
$image->loadFromData($maxPreview->getContent());
return $image;
}
/**

18
lib/private/legacy/image.php
View File

@ -550,6 +550,16 @@ class OC_Image implements \OCP\IImage {
* @return bool|resource An image resource or false on error
*/
public function loadFromFile($imagePath = false) {
try {
// detect if it is a path or maybe the images as string
// needed because the constructor iterates over all load* methods
$result = @realpath($imagePath);
if ($result === false) {
return false;
}
} catch (Error $e) {
return false;
}
// exif_imagetype throws "read error!" if file is less than 12 byte
if (!@is_file($imagePath) || !file_exists($imagePath) || filesize($imagePath) < 12 || !is_readable($imagePath)) {
return false;
@ -873,7 +883,7 @@ class OC_Image implements \OCP\IImage {
$newHeight = $maxSize;
}
$this->preciseResize(round($newWidth), round($newHeight));
$this->preciseResize((int)round($newWidth), (int)round($newHeight));
return true;
}
@ -882,7 +892,7 @@ class OC_Image implements \OCP\IImage {
* @param int $height
* @return bool
*/
public function preciseResize($width, $height) {
public function preciseResize(int $width, int $height): bool {
if (!$this->valid()) {
$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
return false;
@ -982,7 +992,7 @@ class OC_Image implements \OCP\IImage {
* @param int $h Height
* @return bool for success or failure
*/
public function crop($x, $y, $w, $h) {
public function crop(int $x, int $y, int $w, int $h): bool {
if (!$this->valid()) {
$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
return false;
@ -1033,7 +1043,7 @@ class OC_Image implements \OCP\IImage {
$newWidth = min($maxWidth, $ratio * $maxHeight);
$newHeight = min($maxHeight, $maxWidth / $ratio);
$this->preciseResize(round($newWidth), round($newHeight));
$this->preciseResize((int)round($newWidth), (int)round($newHeight));
return true;
}

4
lib/public/IImage.php
View File

@ -147,7 +147,7 @@ interface IImage {
* @return bool
* @since 8.1.0
*/
public function preciseResize($width, $height);
public function preciseResize(int $width, int $height): bool;
/**
* Crops the image to the middle square. If the image is already square it just returns.
@ -168,7 +168,7 @@ interface IImage {
* @return bool for success or failure
* @since 8.1.0
*/
public function crop($x, $y, $w, $h);
public function crop(int $x, int $y, int $w, int $h): bool;
/**
* Resizes the image to fit within a boundary while preserving ratio.