Changeset 12956 for trunk/admin/include/image.class.php

Timestamp:

Jan 24, 2012, 10:50:47 PM (13 years ago)

Author:

rvelices

Message:

feature 2548 multisize - watermark for imagick extension

File:

• trunk/admin/include/image.class.php (modified) (14 diffs)

trunk/admin/include/image.class.php

@@ -42 +42 @@
 
   function resize($width, $height);
-  
+
   function sharpen($amount);
-  
+
   function compose($overlay, $x, $y, $opacity);
 
@@ -97 +97 @@
   {
     $starttime = get_moment();
-    
+
     // width/height
     $source_width  = $this->image->get_width();
@@ -119 +119 @@
 
     $this->image->set_compression_quality($quality);
-    
+
     if ($strip_metadata)
     {
@@ -130 +130 @@
       $this->image->crop($resize_dimensions['crop']['width'], $resize_dimensions['crop']['height'], $resize_dimensions['crop']['x'], $resize_dimensions['crop']['y']);
     }
-    
+
     $this->image->resize($resize_dimensions['width'], $resize_dimensions['height']);
 
@@ -183 +183 @@
       }
     }
-    
+
     $ratio_width  = $width / $max_width;
     $ratio_height = $height / $max_height;
-    $destination_width = $width; 
+    $destination_width = $width;
     $destination_height = $height;
-    
+
     // maximal size exceeded ?
     if ($ratio_width > 1 or $ratio_height > 1)
     {
       if ($ratio_width < $ratio_height)
-      { 
+      {
         $destination_width = round($width / $ratio_height);
         $destination_height = $max_height;
       }
       else
-      { 
-        $destination_width = $max_width; 
+      {
+        $destination_width = $max_width;
         $destination_height = round($height / $ratio_width);
       }
@@ -233 +233 @@
       return null;
     }
-    
+
     if (!function_exists('exif_read_data'))
     {
@@ -240 +240 @@
 
     $rotation = null;
-    
+
     $exif = exif_read_data($source_filepath);
-    
+
     if (isset($exif['Orientation']) and preg_match('/^\s*(\d)/', $exif['Orientation'], $matches))
     {
@@ -275 +275 @@
                         array(-1,   -1,    -1),
                 );
-    
+
     $norm = array_sum(array_map('array_sum', $matrix));
 
@@ -432 +432 @@
                 return  $this->image->convolveImage($m);
   }
-  
+
   function compose($overlay, $x, $y, $opacity)
   {
-    // todo
-    return false;
+    $ioverlay = $overlay->image->image;
+    /*if ($ioverlay->getImageAlphaChannel() !== Imagick::ALPHACHANNEL_OPAQUE)
+    {
+      // Force the image to have an alpha channel
+      $ioverlay->setImageAlphaChannel(Imagick::ALPHACHANNEL_OPAQUE);
+    }*/
+
+    global $dirty_trick_xrepeat;
+    if ( !isset($dirty_trick_xrepeat) && $opacity < 100)
+    {// NOTE: Using setImageOpacity will destroy current alpha channels!
+      $ioverlay->evaluateImage(Imagick::EVALUATE_MULTIPLY, $opacity / 100, Imagick::CHANNEL_ALPHA);
+      $dirty_trick_xrepeat = true;
+    }
+
+    return $this->image->compositeImage($ioverlay, Imagick::COMPOSITE_DISSOLVE, $x, $y);
   }
 
@@ -525 +538 @@
   {
     $m = pwg_image::get_sharpen_matrix($amount);
-    
+
     $param ='convolve "'.count($m).':';
     foreach ($m as $line)
@@ -536 +549 @@
     return true;
   }
-  
+
   function compose($overlay, $x, $y, $opacity)
   {
@@ -564 +577 @@
     $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
     @exec($exec, $returnarray);
-    
+
     //echo($exec);
     return is_array($returnarray);
@@ -686 +699 @@
                 return imageconvolution($this->image, $m, 1, 0);
   }
-  
+
   function compose($overlay, $x, $y, $opacity)
   {
@@ -695 +708 @@
     $ow = imagesx($ioverlay);
     $oh = imagesy($ioverlay);
-      
+
                 // Create a new blank image the site of our source image
                 $cut = imagecreatetruecolor($ow, $oh);