Changeset 16992 for branches/2.4

Timestamp:

Jul 24, 2012, 10:54:52 PM (12 years ago)

Author:

rvelices

Message:

bug 2682: Watermark sizing calculation is made on the requested size not on the final one - fix (merge from trunk)

File:

• branches/2.4/include/derivative_params.inc.php (modified) (1 diff)

branches/2.4/include/derivative_params.inc.php

@@ -289 +289 @@
       $min_size = ImageStdParams::get_watermark()->min_size;
       return $min_size[0]<=$out_size[0]
-        && $min_size[1]<=$$out_size[1];
+        || $min_size[1]<=$$out_size[1];
     }
     return false;