X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=a1edaf1d16e6fb61aa73325d0a2022e82d561653;hp=ae1d3d0ee3bc82307883bbf9e0bf69285eb9cdef;hb=690d93241d826e733ac20868208a0bee2134ee11;hpb=dec917eb3eb20cdda77ff630bc5ee1fc075beb1b

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index ae1d3d0..a1edaf1 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -35,7 +35,7 @@ BEGIN {
 		require Sesse::pr0n::Config_local;
 	};
 
-	$VERSION     = "v2.60";
+	$VERSION     = "v2.65";
 	@ISA         = qw(Exporter);
 	@EXPORT      = qw(&error &dberror);
 	%EXPORT_TAGS = qw();
@@ -384,7 +384,7 @@ sub make_mipmap {
 
 	# If we don't know the size, we'll need to read it in anyway
 	if (!defined($dbwidth) || !defined($dbheight)) {
-		$img = read_original_image($r, $id, $dbwidth, $dbheight);
+		$img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
 		$width = $img->Get('columns');
 		$height = $img->Get('rows');
 	} else {
@@ -408,7 +408,7 @@ sub make_mipmap {
 		my $large_enough = 1;
 		for my $i (0..($#res/2)) {
 			my ($xres, $yres) = ($res[$i*2], $res[$i*2+1]);
-			if ($xres > $new_mmwidth || $yres > $new_mmheight) {
+			if ($xres == -1 || $xres > $new_mmwidth || $yres > $new_mmheight) {
 				$large_enough = 0;
 				last;
 			}
@@ -435,7 +435,7 @@ sub make_mipmap {
 					$img = Image::Magick->new;
 					$img->Read($last_good_mmlocation);
 				} else {
-					$img = read_original_image($r, $id, $dbwidth, $dbheight);
+					$img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
 				}
 			}
 			my $cimg;
@@ -464,15 +464,15 @@ sub make_mipmap {
 	}
 
 	if (!defined($img)) {
-		$img = read_original_image($r, $id, $dbwidth, $dbheight);
+		$img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
 	}
 	return $img;
 }
 
 sub read_original_image {
-	my ($r, $id, $dbwidth, $dbheight) = @_;
+	my ($r, $filename, $id, $dbwidth, $dbheight) = @_;
 
-	my $fname = get_disk_location($r, $id);
+	my $physical_fname = get_disk_location($r, $id);
 
 	# Read in the original image
 	my $magick = new Image::Magick;
@@ -481,11 +481,11 @@ 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 ($fname =~ /\.nef$/i) {
+	if ($filename =~ /\.nef$/i) {
 		# this would suffice if ImageMagick gets to fix their handling
-		# $fname = "NEF:$fname";
+		# $physical_fname = "NEF:$physical_fname";
 		
-		open DCRAW, "-|", "dcraw", "-w", "-c", $fname
+		open DCRAW, "-|", "dcraw", "-w", "-c", $physical_fname
 			or error("dcraw: $!");
 		$err = $magick->Read(file => \*DCRAW);
 		close(DCRAW);
@@ -499,15 +499,15 @@ sub read_original_image {
 		#if (!$infobox) {
 		#	$magick->Set(colorspace=>'YCbCr');
 		#}
-		$err = $magick->Read($fname);
+		$err = $magick->Read($physical_fname);
 	}
 	
 	if ($err) {
-		$r->log->warn("$fname: $err");
+		$r->log->warn("$physical_fname: $err");
 		$err =~ /(\d+)/;
 		if ($1 >= 400) {
 			undef $magick;
-			error($r, "$fname: $err");
+			error($r, "$physical_fname: $err");
 		}
 	}
 
@@ -556,7 +556,7 @@ sub ensure_cached {
 			# This is slow, but should fortunately almost never happen, so don't bother
 			# special-casing it.
 			if (!defined($dbwidth) || !defined($dbheight)) {
-				$img = read_original_image($r, $id, $dbwidth, $dbheight);
+				$img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
 				$width = $img->Get('columns');
 				$height = $img->Get('rows');
 				@$img = ();
@@ -576,6 +576,11 @@ sub ensure_cached {
 			my $info = Image::ExifTool::ImageInfo($fname);
 			if (make_infobox($img, $info, $r)) {
 				$img->Quantize(colors=>16, dither=>'False');
+
+				# Since the image is grayscale, ImageMagick overrides us and writes this
+				# as grayscale anyway, but at least we get rid of the alpha channel this
+				# way.
+				$img->Set(type=>'Palette');
 			} else {
 				# Not enough room for the text, make a tiny dummy transparent infobox
 				@$img = ();
@@ -586,13 +591,13 @@ sub ensure_cached {
 				$height = 1;
 			}
 				
-			$err = $img->write(filename => $cachename, quality => 99);
+			$err = $img->write(filename => $cachename, quality => 90, depth => 8);
 			$r->log->info("New infobox cache: $width x $height for $id.jpg");
 			
 			return ($cachename, 'image/png');
 		}
 	
-		my $img = make_mipmap($r, $fname, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
+		my $img = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
 
 		while (defined($xres) && defined($yres)) {
 			my ($nxres, $nyres) = (shift @otherres, shift @otherres);