Changeset 16989 for trunk/include/derivative.inc.php

Timestamp:

Jul 24, 2012, 10:49:31 PM (12 years ago)

Author:

rvelices

Message:

bug 2682: Watermark sizing calculation is made on the requested size not on the final one

File:

• trunk/include/derivative.inc.php (modified) (1 diff)

trunk/include/derivative.inc.php

@@ -198 +198 @@
     if ( $src->has_size() && $params->is_identity( $src->get_size() ) )
     {
-      if (!$params->use_watermark && !$src->rotation)
+      if (!$params->will_watermark($src->get_size()) && !$src->rotation)
       {
         $params = null;