From ace042da88af63db39bbc2871de57b4e1f8bb13f Mon Sep 17 00:00:00 2001 From: nao-pon Date: Sat, 30 Apr 2016 15:51:02 +0900 Subject: [PATCH] [php:plugin:AutoResize] use `elFinderVolumeDriver::imageUtil()` --- php/plugins/AutoResize/plugin.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/php/plugins/AutoResize/plugin.php b/php/plugins/AutoResize/plugin.php index 8e6517445..fa279cc9c 100644 --- a/php/plugins/AutoResize/plugin.php +++ b/php/plugins/AutoResize/plugin.php @@ -93,22 +93,18 @@ class elFinderPluginAutoResize { } if ($srcImgInfo[0] > $opts['maxWidth'] || $srcImgInfo[1] > $opts['maxHeight']) { - return $this->resize($src, $srcImgInfo, $opts['maxWidth'], $opts['maxHeight'], $opts['quality'], $opts['preserveExif']); + return $this->resize($volume, $src, $srcImgInfo, $opts['maxWidth'], $opts['maxHeight'], $opts['quality'], $opts['preserveExif']); } return false; } - private function resize($src, $srcImgInfo, $maxWidth, $maxHeight, $quality, $preserveExif) { + private function resize($volume, $src, $srcImgInfo, $maxWidth, $maxHeight, $jpgQuality, $preserveExif) { $zoom = min(($maxWidth/$srcImgInfo[0]),($maxHeight/$srcImgInfo[1])); $width = round($srcImgInfo[0] * $zoom); $height = round($srcImgInfo[1] * $zoom); - if (class_exists('Imagick', false)) { - return $this->resize_imagick($src, $width, $height, $quality, $preserveExif); - } else { - return $this->resize_gd($src, $width, $height, $quality, $srcImgInfo); - } + return $volume->imageUtil('resize', $src, compact('width', 'height', 'jpgQuality', 'preserveExif')); } private function resize_gd($src, $width, $height, $quality, $srcImgInfo) {