Changeset 3231

Timestamp:

Mar 29, 2009, 4:55:27 PM (15 years ago)

Author:

ronosman

Message:

Bug 962 fixed. Typo in filename encoding causes application crash when auto rotating images.

File:

• extras/pLoader/trunk/src/Uploader/ImageList.pm (modified) (9 diffs)

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

@@ -841 +841 @@
         ); 
 
-#       eval {
+        eval {
             # set current image thumbnail
             $self->progress_thumbnail_refresh->();
@@ -849 +849 @@
             # update upload progress dialog
             $self->progressbar_refresh->(0.25);
-#        };
+        };
         # user cancelled : dialog box is destroyed
         croak "Upload cancelled. ", $@ if $@ ;
-print "1\n";
+
         if( $self->create_resized ){
-#            eval {
+            eval {
                 if(!$self->CreateResized()){
                     printf("CreateResized failed %s. Use ResizeCallback\n", $@);
@@ -873 +873 @@
                     ) if $self->auto_rotate;
                 }
-#            };
+            };
             $self->_set_exif_tag(
                 $self->current_image->site_resized_file,
@@ -886 +886 @@
             );
         }
-print "2\n";
 
 
@@ -901 +900 @@
         );
 
-#       eval {
+        eval {
             $self->progress_msg_refresh->($msg);
-#        };
+        };
         croak "Upload cancelled. ", $@ if $@ ;
-print "3\n";
-
-#       eval {
+
+        eval {
             $self->CreateThumbnail();
-#        };
+        };
 
         if($@){
@@ -925 +923 @@
             );
         }
-#       eval {
+        eval {
             $self->progress_msg_refresh->($msg);
             $self->progressbar_refresh->(0.50);
-#        };
+        };
         croak "Upload cancelled. ", $@ if $@ ;
-print "4\n";
 
         # photo metadata
         $self->_prepare_upload_properties();            
-print "5\n";
         my ( $status, $status_msg ) = $self->pwg->UploadImage();
-print "6\n";
 
         if ( $status ){
@@ -960 +955 @@
         );
         # update upload progress dialog
-#       eval {
+        eval {
             $self->progress_msg_refresh->($msg);
             $self->progressbar_refresh->(1);
-#        };
+        };
         croak "Upload cancelled. ", $@ if $@ ;
-print "7\n";
         
     }
@@ -1021 +1015 @@
         
         $image->Write(
-            encode('iso-8859-1', filename=>$self->current_image->site_high_file)
+            filename=>encode('iso-8859-1', $self->current_image->site_high_file)
         );
         warn "$status ", $self->current_image->site_high_file, "\n" if $status ;
@@ -1127 +1121 @@
         # write resizd file
         $image->Write(
-            encode('iso-8859-1', filename=>$file)
+            filename=>encode('iso-8859-1', $file)
         );
         warn "$status ", $file, "\n" if $status ;