Changeset 16990 for branches/2.4/include

Timestamp:

Jul 24, 2012, 10:50:20 PM (12 years ago)

Author:

rvelices

Message:

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

Location:

branches/2.4/include

Files:

• derivative.inc.php (modified) (1 diff)
• derivative_params.inc.php (modified) (1 diff)

branches/2.4/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;

branches/2.4/include/derivative_params.inc.php

@@ -282 +282 @@
     return true;
   }
+  
+  function will_watermark($out_size)
+  {
+    if ($this->use_watermark)
+    {
+      $min_size = ImageStdParams::get_watermark()->min_size;
+      return $min_size[0]<=$out_size[0]
+        && $min_size[1]<=$$out_size[1];
+    }
+    return false;
+  }
 }
 ?>