Bug 22330: (QA follow-up) Remove duplicate use lines, combine and sort remaning lines

[koha.git] / C4 / Images.pm

diff --git a/C4/Images.pm b/C4/Images.pm
index 74b7068..856e894 100644 (file)
--- a/C4/Images.pm
+++ b/C4/Images.pm
@@ -25,12 +25,10 @@ use 5.010;
 use C4::Context;
 use GD;
 
-use vars qw($debug $noimage $VERSION @ISA @EXPORT);
+use vars qw($debug $noimage @ISA @EXPORT);
 
 BEGIN {
 
-    # set the version for version checking
-    $VERSION = 3.07.00.049;
     require Exporter;
     @ISA    = qw(Exporter);
     @EXPORT = qw(
@@ -102,7 +100,7 @@ sub RetrieveImage {
 
     my $dbh = C4::Context->dbh;
     my $query =
-'SELECT mimetype, imagefile, thumbnail FROM biblioimages WHERE imagenumber = ?';
+'SELECT imagenumber, mimetype, imagefile, thumbnail FROM biblioimages WHERE imagenumber = ?';
     my $sth = $dbh->prepare($query);
     $sth->execute($imagenumber);
     my $imagedata = $sth->fetchrow_hashref;
@@ -181,8 +179,8 @@ sub _scale_image {
           and warn "Reducing image by "
           . ( $percent_reduce * 100 )
           . "\% or to $width_reduce pix X $height_reduce pix";
-        my $newimage = GD::Image->new( $width_reduce, $height_reduce, 1 )
-          ;        #'1' creates true color image...
+        my $newimage = GD::Image->new( $width_reduce, $height_reduce, $image->trueColor )
+          ;        # if third is set, creates true color image
         $newimage->copyResampled( $image, 0, 0, 0, 0, $width_reduce,
             $height_reduce, $width, $height );
         return $newimage;