Changeset 17230

Timestamp:

Jul 30, 2012, 10:01:17 PM (12 years ago)

Author:

rvelices

Message:

bug 2712: Custom sized derivatives are never sharpened

File:

• trunk/i.php (modified) (3 diffs)

trunk/i.php

@@ -300 +300 @@
   {
     if (!isset($original_size))
-      return; // cannot really know if a watermark is required
+      return false; // cannot really know if a watermark is required
     $dsize = $params->compute_final_size($original_size);
     $use_watermark = $params->will_watermark($dsize);
@@ -347 +347 @@
     $page['src_url'] = $page['root_path'] . substr($candidate_path, strlen(PHPWG_ROOT_PATH));
     $page['rotation_angle'] = 0;
-  }
+                return true;
+  }
+        return false;
 }
 
@@ -516 +518 @@
 mysql_close($pwg_db_link);
 
-try_switch_source($params, $src_mtime);
+if (!try_switch_source($params, $src_mtime) && $params->type==IMG_CUSTOM)
+{
+        $sharpen = 0;
+        foreach (ImageStdParams::get_defined_type_map() as $std_params)
+        {
+                $sharpen += $std_params->sharpen;
+        }
+        $params->sharpen = round($sharpen / count(ImageStdParams::get_defined_type_map()) );
+}
 
 if (!mkgetdir(dirname($page['derivative_path'])))