Changeset 16990

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

Files:

• i.php (modified) (5 diffs)
• include/derivative.inc.php (modified) (1 diff)
• include/derivative_params.inc.php (modified) (1 diff)

branches/2.4/i.php

@@ -105 +105 @@
     header('Content-Location: '.$url);
     header('Location: '.$url);
+    ilog('WARN', $code, $url, $_SERVER['REQUEST_URI']);
     exit;
   }
@@ -204 +205 @@
     preg_match($conf['sync_chars_regex'], $token) or ierror('Invalid chars in request', 400);
   }
-  
+
   $page['derivative_path'] = PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$req;
 
@@ -453 +454 @@
   WHERE path=\''.$page['src_location'].'\'
 ;';
-    
+
     if ( ($row=pwg_db_fetch_assoc(pwg_query($query))) )
     {
@@ -465 +466 @@
       {
         $page['rotation_angle'] = pwg_image::get_rotation_angle($page['src_path']);
-        
+
         single_update(
           $prefixeTable.'images',
@@ -541 +542 @@
 }
 
-if ($params->use_watermark)
+if ($params->will_watermark($d_size))
 {
   $wm = ImageStdParams::get_watermark();

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;
+  }
 }
 ?>