Changeset 31958 for main/trunk/greenstone2

Timestamp:

2017-09-11T09:53:59+12:00 (7 years ago)

Author:

kjdon

Message:

use identify to work out the filetype of the original file, rather than jsut using the file extension. it may not match eg .tif files should be tiff filetype.

File:

• main/trunk/greenstone2/perllib/plugins/ImageConverter.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

@@ -152 +152 @@
 
     my $self = new BaseMediaConverter($pluginlist, $inputargs, $hashArgOptLists, 1);
-
-
+  
     return bless $self, $class;
 
@@ -352 +351 @@
 
     if ($self->{'store_original_image'} && $original_file_was_converted) {
-    # hack to guess the filetype
-    my ($orig_type) = ($original_filename_full_path =~ m/\.(.*?)$/);
+
+    # work out the file type
+    # use identify to get info about the original image
+    my ($orig_type, $orig_width, $orig_height, $orig_size, $origsize_str) 
+    = &identify($original_filename_full_path, $outhandle, $verbosity);
+
+    if ($orig_type ne " ") {
+        $orig_type = $self->correct_mime_type($orig_type);
+    }
+
     # add the original image as an associated file
     $doc_obj->associate_file($original_filename_full_path, $original_filename_no_path, "image/$orig_type", $section);