X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=ad905d1e5d6f03e6563d6512ecee8213e4d951f2;hp=d85ce6aa896508923424d1c699551badfee9b138;hb=e96ef46cf8ad5cb95c12abf6ee20ed95ae2f111c;hpb=d0e9a452e8354fe827162ad367b4bf5bf2f76ff2

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index d85ce6a..ad905d1 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -39,7 +39,7 @@ BEGIN {
 		require Sesse::pr0n::Config_local;
 	};
 
-	$VERSION     = "v2.70";
+	$VERSION     = "v2.71";
 	@ISA         = qw(Exporter);
 	@EXPORT      = qw(&error &dberror);
 	%EXPORT_TAGS = qw();
@@ -338,7 +338,8 @@ sub output_401 {
 	$r->status(401);
 	$r->headers_out->{'www-authenticate'} = 'Basic realm="pr0n.sesse.net"';
 
-	if ($options{'DigestAuth'} // 1) {
+	# Digest auth is disabled for now, due to various client problems.
+	if (0 && ($options{'DigestAuth'} // 1)) {
 		# We make our nonce similar to the scheme of RFC2069 section 2.1.1,
 		# with some changes: We don't care about client IP (these have a nasty
 		# tendency to change from request to request when load-balancing
@@ -682,7 +683,7 @@ sub read_original_image {
 
 	# If we use ->[0] unconditionally, text rendering (!) seems to crash
 	my $img;
-	if (ref($magick)) {
+	if (ref($magick) !~ /Image::Magick/) {
 		$img = $magick;
 	} else {
 		$img = (scalar @$magick > 1) ? $magick->[0] : $magick;
@@ -705,7 +706,7 @@ sub ensure_cached {
 
 	my $fname = get_disk_location($r, $id);
 	if ($infobox ne 'box') {
-		unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
+		unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbwidth || $yres < $dbheight || $xres == -1)) {
 			return ($fname, undef);
 		}
 	}
@@ -795,16 +796,9 @@ sub ensure_cached {
 			my $height = $img->Get('rows');
 			my ($nwidth, $nheight) = scale_aspect($width, $height, $xres, $yres);
 
-			# Use lanczos (sharper) for heavy scaling, mitchell (faster) otherwise
-			my $filter = 'Mitchell';
-			my $quality = 90;
-			my $sf = undef;
-
-			if ($width / $nwidth > 8.0 || $height / $nheight > 8.0) {
-				$filter = 'Lanczos';
-				$quality = 85;
-				$sf = "1x1";
-			}
+			my $filter = 'Lanczos';
+			my $quality = 87;
+			my $sf = "1x1";
 
 			if ($xres != -1) {
 				$cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter, 'sampling-factor'=>$sf);
@@ -869,10 +863,14 @@ sub make_infobox {
 	# fields"; note the comma separation. Every field has an associated "bold flag"
 	# in the second part.
 	
-	my $shutter_priority = (defined($info->{'ExposureProgram'}) &&
+	my $manual_shutter = (defined($info->{'ExposureProgram'}) &&
 		$info->{'ExposureProgram'} =~ /shutter\b.*\bpriority/i);
-	my $aperture_priority = (defined($info->{'ExposureProgram'}) &&
+	my $manual_aperture = (defined($info->{'ExposureProgram'}) &&
 		$info->{'ExposureProgram'} =~ /aperture\b.*\bpriority/i);
+	if ($info->{'ExposureProgram'} =~ /manual/i) {
+		$manual_shutter = 1;
+		$manual_aperture = 1;
+	}
 
 	my @classic_fields = ();
 	if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?\s*(?:mm)?$/) {
@@ -884,24 +882,24 @@ sub make_infobox {
 	if (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+)\/(\d+)$/) {
 		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+(?:\.\d+))$/) {
-		push @classic_fields, [ $1 . "s", $shutter_priority ];
+		push @classic_fields, [ $a/$gcd . "/" . $b/$gcd . "s", $manual_shutter ];
+	} elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+(?:\.\d+)?)$/) {
+		push @classic_fields, [ $1 . "s", $manual_shutter ];
 	}
 
 	if (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\/(\d+)$/) {
 		my $f = $1/$2;
 		if ($f >= 10) {
-			push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ];
+			push @classic_fields, [ (sprintf "f/%.0f", $f), $manual_aperture ];
 		} else {
-			push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_priority ];
+			push @classic_fields, [ (sprintf "f/%.1f", $f), $manual_aperture ];
 		}
 	} elsif (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\.(\d+)$/) {
 		my $f = $info->{'FNumber'};
 		if ($f >= 10) {
-			push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ];
+			push @classic_fields, [ (sprintf "f/%.0f", $f), $manual_aperture ];
 		} else {
-			push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_priority ];
+			push @classic_fields, [ (sprintf "f/%.1f", $f), $manual_aperture ];
 		}
 	}
 
@@ -921,7 +919,7 @@ sub make_infobox {
 
 	if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") {
 		push @classic_fields, [ $info->{'ExposureBiasValue'} . " EV", 0 ];
-	} elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) {
+	} elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} ne "0") {
 		push @classic_fields, [ $info->{'ExposureCompensation'} . " EV", 0 ];
 	}
 
@@ -1128,6 +1126,8 @@ sub get_all_cache_urls {
 			push @ret, "/$event/$1x$2/$filename";
 		} elsif ($fname =~ /^$id-(\d+)-(\d+)-nobox\.jpg$/) {
 			push @ret, "/$event/$1x$2/nobox/$filename";
+		} elsif ($fname =~ /^$id--1--1-box\.png$/) {
+			push @ret, "/$event/box/$filename";
 		} elsif ($fname =~ /^$id-(\d+)-(\d+)-box\.png$/) {
 			push @ret, "/$event/$1x$2/box/$filename";
 		} else {