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 8afc8fa..856e894 100644 (file)
--- a/C4/Images.pm
+++ b/C4/Images.pm
@@ -5,18 +5,18 @@ package C4::Images;
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
@@ -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.03;
     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;
@@ -131,16 +129,10 @@ sub ListImagesForBiblio {
     my $query = 'SELECT imagenumber FROM biblioimages WHERE biblionumber = ?';
     my $sth   = $dbh->prepare($query);
     $sth->execute($biblionumber);
-    warn "Database error!" if $sth->errstr;
-    if ( !$sth->errstr && $sth->rows > 0 ) {
-        while ( my $row = $sth->fetchrow_hashref ) {
-            push @imagenumbers, $row->{'imagenumber'};
-        }
-        return @imagenumbers;
-    }
-    else {
-        return undef;
+    while ( my $row = $sth->fetchrow_hashref ) {
+        push @imagenumbers, $row->{'imagenumber'};
     }
+    return @imagenumbers;
 }
 
 =head2 DelImage
@@ -187,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;