Changeset 4748

Timestamp:

Jan 26, 2010, 8:20:25 AM (14 years ago)

Author:

ronosman

Message:

Remove useless code.

File:

• extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm (modified) (7 diffs)

extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm

@@ -562 +562 @@
     $self->imagelist->SetCurrentImage(-1);
 
-    $self->imagelist->RescaleCallback(
-        sub { $self->RescaleImage(@_) }
-    );
-
     $self->imagelist->ResizeCallback(
         sub { $self->ResizeImage(@_) }
@@ -616 +612 @@
         version          => $self->version,
         imagelist_version => $self->imagelist_version,
-        RescaleCallback  => sub { $self->RescaleImage(@_) },
         ResizeCallback   => sub { $self->ResizeImage(@_) },
         watermark_text => $self->user_defined_properties->{watermark_text}||gettext("my watermark"),
@@ -801 +796 @@
 
 
-sub RescaleImage {
-    my ( $self, $image_file, $image_file_out, $type, $ratio, $width, $height, $quality ) = @_;
+
+sub ResizeImage {
+    my ( $self, $image_file, $image_file_out, $type, $width, $height, $quality ) = @_;
    
 
@@ -810 +806 @@
             0
     );
-    
+
     my $w;
     my $h;
@@ -817 +813 @@
     my $img_h = $image->GetHeight;
     
-    # use a ratio ( 25% default ) if defined
-    # default ratio is used for preview.
-    if($ratio){
-        $w = $ratio*$img_w/100 ;
-        $h = $ratio*$img_h/100 ;
-    }
-    # use specified width and height
-    else{
         # portrait
         if( $img_w < $img_h ){
@@ -837 +825 @@
             ($w*$img_h)/$img_w
         );
-    }
+
+    
 
     $image->Rescale(
@@ -844 +833 @@
         wxIMAGE_QUALITY_HIGH
     );
-    
-    $quality ||= 90;
-    
-    $image->SetOption( 
-        "quality", 
-        $quality 
-    );
-    
-    if(!$image->SaveFile(
-        $image_file_out,
-        $self->GetWxBitmapType($type),
-    )){
-        Wx::LogMessage(
-            gettext("An error has occured. Can not save file %s"),
-            $image_file_out,
-        )
-    };
-}
-
-sub ResizeImage {
-    my ( $self, $image_file, $image_file_out, $type, $width, $height, $quality ) = @_;
-   
-
-    my $image = Wx::Image->new(
-            $image_file, 
-            $self->GetWxBitmapType($type),
-            0
-    );
-
-    my $w;
-    my $h;
-
-    my $img_w = $image->GetWidth;
-    my $img_h = $image->GetHeight;
-    
-        # portrait
-        if( $img_w < $img_h ){
-            $w = $height;
-        }
-        else{
-            $w = $width;
-        }
-        # to respect aspect ratio
-        $h = sprintf(
-            "%.0f",
-            ($w*$img_h)/$img_w
-        );
-
-    
-
-    $image->Rescale(
-        $w,
-        $h,
-        wxIMAGE_QUALITY_HIGH
-    );
-
-    $image->Resize(
-        [ $width, $height ], [ 0, 20],
-    );
+
+    #$image->Resize(
+    #    [ $width, $height ], [ 0, 20],
+    #);
     
     $quality ||= 90;