Fixed warning.

[pr0n] / perl / Sesse / pr0n / Common.pm

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 93e6c699b8f3231ab132ae10e6cc326a1efecad2..987463548ed3c19d79104891111b67e9874f1eef 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -35,7 +35,7 @@ BEGIN {
                require Sesse::pr0n::Config_local;
        };
 
-       $VERSION     = "v2.51";
+       $VERSION     = "v2.53";
        @ISA         = qw(Exporter);
        @EXPORT      = qw(&error &dberror);
        %EXPORT_TAGS = qw();
@@ -371,7 +371,7 @@ sub ensure_cached {
        my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
 
        my $fname = get_disk_location($r, $id);
-       unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || !defined($dbwidth) || !defined($dbheight) || $xres == -1)) {
+       unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
                return ($fname, 0);
        }
 
@@ -392,7 +392,7 @@ sub ensure_cached {
                # ImageMagick can handle NEF files, but it does it by calling dcraw as a delegate.
                # The delegate support is rather broken and causes very odd stuff to happen when
                # more than one thread does this at the same time. Thus, we simply do it ourselves.
-               if ($filename =~ /\.nef$/) {
+               if ($filename =~ /\.nef$/i) {
                        # this would suffice if ImageMagick gets to fix their handling
                        # $fname = "NEF:$fname";
                        
@@ -561,6 +561,8 @@ sub make_infobox {
                push @classic_fields, [ $info->{'NikonD1-ISOSetting'}->[1] . " ISO", 0 ];
        } elsif (defined($info->{'ISOSetting'})) {
                push @classic_fields, [ $info->{'ISOSetting'} . " ISO" ];
+       } elsif (defined($info->{'ISO'})) {
+               push @classic_fields, [ $info->{'ISO'} . " ISO" ];
        }
 
        if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") {