X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=00fa9e9b0c42213676fc70707955ba8a9a696988;hp=73980c0b05738eb2cf97cc5781dd80d8b1737afe;hb=4c67de43660ea5ee7077ab8c2c6b787471901a71;hpb=d7941742255f12b60f5cbfca83f32a5043add9b3

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 73980c0..00fa9e9 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -497,7 +497,7 @@ sub read_original_image {
 	# 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$/i) {
+	if ($filename =~ /\.(nef|cr2)$/i) {
 		# this would suffice if ImageMagick gets to fix their handling
 		# $physical_fname = "NEF:$physical_fname";
 		
@@ -732,7 +732,7 @@ sub make_infobox {
 		my ($a, $b) = ($1, $2);
 		my $gcd = gcd($a, $b);
 		push @classic_fields, [ $a/$gcd . "/" . $b/$gcd . "s", $shutter_priority ];
-	} elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+)$/) {
+	} elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+(?:\.\d+))$/) {
 		push @classic_fields, [ $1 . "s", $shutter_priority ];
 	}