require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.51";
+ $VERSION = "v2.53";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
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);
}
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") {