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

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index ae1d3d0..6f45d55 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();
@@ -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;
 			}
@@ -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,7 +591,7 @@ 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');