Changeset 3163

Timestamp:

Feb 22, 2009, 11:08:42 PM (15 years ago)

Author:

ronosman

Message:

Test exif preview image before using it for wxthumbnail creation.

Location:

extras/pLoader/trunk/src/Uploader

Files:

• GUI/wxApp.pm (modified) (1 diff)
• ImageList.pm (modified) (1 diff)

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

@@ -722 +722 @@
             width     => $w,
             height    => $h,
-            title     => "pLoader - Piwigo uploader 2.0.0a - [$url]" ,
+            title     => "pLoader - Piwigo uploader 2.0.0b - [$url]" ,
             pwg       => $self->pwg,
             imagelist => $self->imagelist,

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

@@ -205 +205 @@
         $self->_set_current_image_filepaths();
 
-        
-        # an exif preview is available. we use it
-        if(defined $info->{PreviewImage}){
+        my $create_gui_preview;        
+        # an exif preview is available. we try to use it
+        if(defined $info->{PreviewImage} ){
             printf("use preview\n");
             $self->_write_preview_image( $info->{PreviewImage} );
+            my $image = new Image::Magick;
+            eval {
+                $create_gui_preview = $image->ReadImage(
+                    $self->current_image->preview_file
+                );
+            };
+            unlink $self->current_image->preview_file if $create_gui_preview;
+        }else {
+            $create_gui_preview = 1;
         }
+        print $create_gui_preview, "\n";
         # have to create a preview file
-        else {
-            printf("have to create a preview\n");
+        if($create_gui_preview) {
             eval {
                 if(!$self->CreateGUIPreview()){
-            printf("use preview callback\n");
                     # use method provided by the caller
                     # source, target, type, ratio