Update UploadHandler.php

jbostoen · web-flow · commit 454265fefc1b · 2017-07-22T19:29:29.000+02:00
imagick_create_scaled_image:
- jpeg_quality was ignored if it was the only parameter set (similar to previous patch for 'strip' exif information)
- instead of a negative condition, turned it around: if dimensions are within limits and no changes required (strip exif, jpeg quality, orientation), then return original image
- added comment warning about the implications of setting options on the 'original' image ( version '' ). All other versions inherit those settings.
diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php
@@ -132,6 +132,7 @@ public function __construct($options = null, $initialize = true, $error_messages
             'identify_bin' => 'identify',
             'image_versions' => array(
                 // The empty image version key defines options for the original image:
+                // Keep in mind that these options are inherited by all other image versions!
                 '' => array(
                     // Automatically rotate images based on EXIF meta data:
                     'auto_orient' => true
@@ -871,7 +872,13 @@ protected function imagick_create_scaled_image($file_name, $version, $options) {
         if (!empty($options['max_height'])) {
             $new_height = $max_height = $options['max_height'];
         }
-        if (!($image_oriented || $max_width < $img_width || $max_height < $img_height || !empty($options['strip']) )) {
+	    
+        $image_strip = false;
+        if( !empty($options["strip"]) ) {
+            $image_strip = $options["strip"];
+        } 
+		
+        if ( !$image_oriented && ($max_width >= $img_width) && ($max_height >= $img_height) && !image_strip && empty($options["jpeg_quality"]) ) {        
             if ($file_path !== $new_file_path) {
                 return copy($file_path, $new_file_path);
             }
@@ -917,7 +924,7 @@ protected function imagick_create_scaled_image($file_name, $version, $options) {
                 }
                 break;
         }
-        if (!empty($options['strip'])) {
+        if ( $image_strip ) {
             $image->stripImage();
         }
         return $success && $image->writeImage($new_file_path);
