Changeset 4760 for extensions/pLoader

Timestamp:

Jan 27, 2010, 2:12:41 PM (14 years ago)

Author:

ronosman

Message:

Bug 1066 fixed: unexpected behaviour on resizing. Now rotate before resize.

Location:

extensions/pLoader/trunk

Files:

• locale/fr_FR/pLoader.mo (modified) (previous)
• locale/fr_FR/pLoader.po (modified) (1 diff)
• src/Uploader/ImageList.pm (modified) (4 diffs)

extensions/pLoader/trunk/locale/fr_FR/pLoader.po

@@ -634 +634 @@
 msgid "Photo size"
 msgstr "Dimension des photos"
+
+msgid "Maximum width"
+msgstr "Largeur maximale"
+
+msgid "Maximum height"
+msgstr "Hauteur maximale"

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

@@ -536 +536 @@
     my $w = $image->Get('width');
     my $h = $image->Get('height');
-        
-    # should calculate the aspect ratio
-    my $resize_w = $self->resize_w;
-    my $resize_h = $self->resize_h;
-        
-    if( $w < $h ){
-        my $resize_w_ = $resize_w;
-        $resize_w = $resize_h;
-        $resize_h = $resize_w_;
-    }
-    #printf("resize with blur value %s\n", $self->blur);
-    $status = $image->Resize(
-        geometry => sprintf("%sx%s>", $resize_w, $resize_h), 
-        filter => sprintf("%s", $self->filter), 
-        blur => $self->blur
-    );
-    warn "$status" if $status ;
-    return 0 if $status;
 
     $status = $image->Set(Gravity=>"Center");
@@ -570 +552 @@
         $image->Rotate( degrees=>$1 ) if $self->auto_rotate;    
     }
+
+
+    #printf("resize with blur value %s\n", $self->blur);
+    $status = $image->Resize(
+        geometry => sprintf("%sx%s>", $self->resize_w, $self->resize_h), 
+        filter => sprintf("%s", $self->filter), 
+        blur => $self->blur
+    );
+    warn "$status" if $status ;
+    return 0 if $status;
 
     #printf("resize with quality value %s\n", $self->quality);
@@ -1120 +1112 @@
         warn "$status ", $self->current_image->file, "\n" if $status ;
         return 0 if $status;
+
+        if($bRotate){
+            $image->Rotate( degrees=>$degrees );    
+        }        
+        $image->Write(
+            $self->current_image->site_high_file
+        );
+        warn "$status ", $self->current_image->site_high_file, "\n" if $status ;
+        return 0 if $status;
+
         if($bResize){
             $status = $image->Resize(
@@ -1137 +1139 @@
         warn "$status" if $status ;
         
-        if($bRotate){
-            $image->Rotate( degrees=>$degrees );    
-        }        
-        $image->Write(
-            $self->current_image->site_high_file
-        );
-        warn "$status ", $self->current_image->site_high_file, "\n" if $status ;
-        return 0 if $status;
         
         undef $image;