Changeset 18466 for gsdl/trunk

Timestamp:

2009-02-05T16:32:27+13:00 (15 years ago)

Author:

mdewsnip

Message:

Implemented -noscaleup option to prevent scaling screenview images bigger than the originals. By Jeffrey Ke at DL Consulting Ltd.

File:

• gsdl/trunk/perllib/plugins/ImageConverter.pm (modified) (5 diffs)

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -156 +156 @@
 sub generate_images {
     my $self = shift(@_);
-
     my ($filename_full_path, $filename_no_path, $doc_obj, $section) = @_;
 
     # check image magick status
     return 0 if $self->{'image_conversion_available'} == 0;
+
     # check the filenames
     return 0 if ($filename_no_path eq "" || !-f $filename_full_path);
@@ -241 +241 @@
     }
     if ($self->{'create_screenview'} eq "true") {
-    $self->create_screenview($filename_full_path, $filehead, $doc_obj, $section, $assocfilemeta, $url_to_filehead);
+    $self->create_screenview($filename_full_path, $filehead, $doc_obj, $section, $assocfilemeta, $url_to_filehead, $image_width, $image_height);
     }
 }
@@ -252 +252 @@
     my $thumbnailsize = $self->{'thumbnailsize'};
     my $thumbnailtype = $self->correct_mime_type($self->{'thumbnailtype'});
-    
+
     # Generate the thumbnail with convert
     my ($result,$thumbnailfile) 
@@ -282 +282 @@
     
     my $self = shift(@_);
-    my ($original_file, $filehead, $doc_obj, $section, $assocfilemeta, $url_to_filehead) = @_;
+    my ($original_file, $filehead, $doc_obj, $section, $assocfilemeta, $url_to_filehead, $image_width, $image_height) = @_;
     $url_to_filehead = $filehead unless defined $url_to_filehead; 
 
-    # To do: if the actual image smaller than the screenview size,
-    # we should use the original !
-    
     my $screenviewsize = $self->{'screenviewsize'};
     my $screenviewtype = $self->correct_mime_type($self->{'screenviewtype'});
+
+    # Scale the image, unless the original image is smaller than the screenview size and -noscaleup is set
+    my $scale_option = "-geometry $screenviewsize" . "x$screenviewsize";
+    if ($self->{'noscaleup'} && $image_width < $screenviewsize && $image_height < $screenviewsize)
+    {
+    $scale_option = "";
+    }
     
     # make the screenview image
     my ($result,$screenviewfilename) 
-    = $self->convert($original_file, $screenviewtype, "-geometry $screenviewsize" . "x$screenviewsize", "SCREEN");    
+    = $self->convert($original_file, $screenviewtype, $scale_option, "SCREEN");    
     
     #add the screenview as an associated file ...
@@ -352 +356 @@
     # but this is no longer needed, as output filename is now
     # explicitly passed back
-
     }