Changeset 6709

Timestamp:

Jul 27, 2010, 11:33:22 AM (14 years ago)

Author:

ronosman

Message:

Fix watermark creation issue + high resized ignored.

File:

• extensions/pLoader/trunk/src/Uploader/ResizeWorker.pm (modified) (5 diffs)

extensions/pLoader/trunk/src/Uploader/ResizeWorker.pm

@@ -19 +19 @@
     event_handler
     cancel_event
+    gravity
+    rgbcolor
 /);
 
@@ -25 +27 @@
     my ( $self ) =@_;
 
+    $self->gravity(
+        { 
+            'Top'          => 'North',
+            'Left'         => 'West',
+            'Right'        => 'East',
+            'Bottom'       => 'South',
+            'Top left'     => 'NorthWest',
+            'Top right'    => 'NorthEast',
+            'Bottom left'  => 'SouthWest',
+            'Bottom right' => 'SouthEast',
+            'Center'       => 'Center',
+       }   
+    );    
+
+    $self->rgbcolor(
+        {
+            "White" => '#FFFFFF',
+            "Black" => '#000000',
+        }    
+    );
 }
 
@@ -256 +278 @@
     
     undef $imgk;
+
+    if($preferences->{watermark_activate}){
+        $self->create_watermark(
+            $preferences,
+            $image->{site_resized_file}
+        );
+    }
 
    
@@ -416 +445 @@
         warn "$status" if $status ;
         
+        $imgk->Write(
+            sprintf(
+                "%s:%s",
+                $self->write_type,
+                $image->{site_high_file},
+            )
+        );
+        warn "$status" if $status ;
         
         undef $imgk;
 
         if($bAddWatermark){
-            my $file_out = $image->{site_high_file};
             $self->create_watermark(
-                $preferences->{watermark_text},
-                $preferences->{watermark_text_size},
-                $preferences->{watermark_position},
-                $preferences->{watermark_x},
-                $preferences->{watermark_y},
-                $preferences->{watermark_color},
-                $file_out
+                $image->{preferences},
+                $image->{site_high_file}
             );
         }
@@ -477 +508 @@
             $self->write_type,
         ),
+    );
+}
+
+
+sub create_watermark {
+    my ( $self, $preferences, $file_out ) = @_;
+    
+    my $rval = 1 ;
+
+    my $text = $preferences->{watermark_text};
+    my $text_size = $preferences->{watermark_text_size};
+    my $w_position = $preferences->{watermark_position};
+    my $x = $preferences->{watermark_x};
+    my $y = $preferences->{watermark_y};
+    my $color = $preferences->{watermark_color};
+
+    my $gravity = $self->gravity->{$w_position};
+    my $fill = $self->rgbcolor->{$color};
+
+    # debug
+    #printf("Create watermark %s\n", $file_out);
+
+    
+
+    my $imgk = new Image::Magick;
+    
+    my $status = $imgk->ReadImage(
+        $file_out
+    );      
+
+    my $ratio = $imgk->Get('height')/($preferences->{resize_h}||$imgk->Get('height'));
+    $ratio||=1;
+    $text ||="Your watermark";
+    $imgk->Annotate(
+        pointsize => $text_size*$ratio,
+        fill => $fill,
+        x => $x*$ratio,
+        y => $y*$ratio,
+        text => $text,
+        gravity => $gravity,
+    );
+                      
+    $imgk->Write(
+        sprintf(
+            "%s:%s",
+            $self->write_type,
+            $file_out,
+        )
     );
 }