Changeset 12851 for trunk/include/derivative_std_params.inc.php

Timestamp:

Jan 5, 2012, 10:35:25 PM (12 years ago)

Author:

rvelices

Message:

feature 2548 multisize - sharpen + watermarks (partially implemented / no test with imagick extension)

File:

• trunk/include/derivative_std_params.inc.php (modified) (10 diffs)

trunk/include/derivative_std_params.inc.php

@@ -29 +29 @@
 define('IMG_CUSTOM', 'custom');
 
+final class WatermarkParams
+{
+  public $file = '';
+  public $min_size = array(500,500);
+  public $xpos = 50;
+  public $ypos = 50;
+  public $xrepeat = 0;
+  public $opacity = 100;
+}
+
+
 final class ImageStdParams
 {
@@ -35 +46 @@
   private static $type_map = array();
   private static $undefined_type_map = array();
+  private static $watermark;
 
   static function get_all_types()
@@ -61 +73 @@
   }
 
+  static function get_watermark()
+  {
+    return self::$watermark;
+  }
+
   static function load_from_db()
   {
@@ -68 +85 @@
     {
       self::$type_map = $arr['d'];
+      self::$watermark = @$arr['w'];
+      if (!self::$watermark) self::$watermark = new WatermarkParams();
     }
     else
@@ -83 +102 @@
     {
       self::$type_map = $arr['d'];
+      self::$watermark = @$arr['w'];
+      if (!self::$watermark) self::$watermark = new WatermarkParams();
     }
     else
@@ -91 +112 @@
   }
 
+  static function set_watermark($watermark)
+  {
+    self::$watermark = $watermark;
+  }
+  
   static function set_and_save($map)
   {
@@ -97 +123 @@
 
     $ser = serialize( array(
-      'd' => self::$type_map
+      'd' => self::$type_map,
+      'w' => self::$watermark,
       ) );
     conf_update_param('derivatives', addslashes($ser) );
@@ -104 +131 @@
   }
 
-  static function make_default()
+  private static function make_default()
   {
+    self::$watermark = new WatermarkParams();
     self::$type_map[IMG_SQUARE] = new DerivativeParams( SizingParams::square(100,100) );
     self::$type_map[IMG_THUMB] = new DerivativeParams( SizingParams::classic(144,144) );
@@ -115 +143 @@
   }
 
+  public static function apply_global($params)
+  {
+    if (!empty(self::$watermark->file) &&
+        (self::$watermark->min_size[0]<=$params->sizing->ideal_size[0]
+        && self::$watermark->min_size[1]<=$params->sizing->ideal_size[1] ) )
+    {
+      $params->use_watermark = true;
+    }
+  }
+  
   private static function build_maps()
   {
@@ -120 +158 @@
     {
       $params->type = $type;
+      self::apply_global($params);
     }
     self::$all_type_map = self::$type_map;