From 0f60a843a5c615cd66e3a8feef10d8f5c6fa6e44 Mon Sep 17 00:00:00 2001 From: Alexander Demidov Date: Mon, 2 Jun 2014 16:35:03 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BE=D0=BF=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=83=D1=82?= =?UTF-8?q?=D0=B8=20=D0=BA=20=D1=84=D0=B0=D0=B9=D0=BB=D1=83.=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=B5=20serializeOperat?= =?UTF-8?q?ions=20=D0=BE=D1=82=20GreagwarImage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Upload.class.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Upload.class.php b/Upload.class.php index de3d3d5..fd0a8d6 100644 --- a/Upload.class.php +++ b/Upload.class.php @@ -109,6 +109,13 @@ abstract class Upload $greagwar_image = self::getGreagwarImage($tmp_file_path); } $image->type = $greagwar_image->guessType(); + if (!Image::getIsSubClass($image)) { + if ( !( ImageVariant::getIsClass( $image ) ) && Image::getIsSubClass( $image ) ) { + $greagwar_image->resize( $width, $height, 0xffffff, $force = false, $rescale = false, $crop = true ); + } else { + $greagwar_image->resize( $width, $height, 0xffffff, $force = false, $rescale = false, $crop = false ); + } + } $hash = $greagwar_image->getHash($image->type, $quality = 100); $file_path = $greagwar_image->generateFileFromhash($hash) . '.' . $image->type; if (Image::getIsSubClass($image)) { @@ -137,11 +144,6 @@ abstract class Upload ob_end_clean(); } else { if ($width || $height) { - if (!(ImageVariant::getIsClass($image)) && Image::getIsSubClass($image)) { - $greagwar_image->resize($width, $height, 0xffffff, $force = false, $rescale = false, $crop = true); - } else { - $greagwar_image->resize($width, $height, 0xffffff, $force = false, $rescale = false, $crop = false); - } $file_path = $greagwar_image->cacheFile($image->type, $quality = 100, true); } }