X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FImage.pm;h=f12a15891792ed1ba0e195e815c4c157df2d1b29;hp=4e272fac5856d29d6af1e485e43d3ee4a656dd28;hb=3302d279442feb859579d6be6b8feb9adee34418;hpb=45ee05e19e1039e74e2b7ca4955b007d2cd3ed69

diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm
index 4e272fa..f12a158 100644
--- a/perl/Sesse/pr0n/Image.pm
+++ b/perl/Sesse/pr0n/Image.pm
@@ -42,10 +42,18 @@ sub handler {
 	#} else {
 	
 	# Look it up in the database
-	my $ref = $dbh->selectrow_hashref('SELECT id,width,height FROM images WHERE event=? AND vhost=? AND filename=?',
+	my $ref = $dbh->selectrow_hashref('SELECT id,render_id,width,height FROM images WHERE event=? AND vhost=? AND filename=?',
 		undef, $event, Sesse::pr0n::Common::get_server_name($r), $filename);
 	return error($r, "Could not find $event/$filename", 404, "File not found") unless (defined($ref));
 
+	if (defined($xres) && defined($yres) && defined($ref->{'render_id'}) && !$infobox) {
+		# We have a render, we're not asked for the original, and we do not have infobox.
+		$ref = $dbh->selectrow_hashref('SELECT id,filename,width,height FROM images WHERE id=?', 
+			undef, $ref->{'render_id'});
+		return error($r, "Could not find render of $event/$filename", 404, "File not found") unless (defined($ref));
+		$filename = $ref->{'filename'};
+	}
+
 	$id = $ref->{'id'};
 	$dbwidth = $ref->{'width'};
 	$dbheight = $ref->{'height'};
@@ -55,7 +63,7 @@ sub handler {
 	if ($infobox) {
 		($fname, $mime_type) = Sesse::pr0n::Common::ensure_infobox_cached($r, $filename, $id, $dbwidth, $dbheight, $dpr, $xres, $yres);
 	} else {
-		($fname, $mime_type) = Sesse::pr0n::Common::ensure_cached($r, $filename, $id, $dbwidth, $dbheight, $dpr, $xres, $yres);
+		($fname, $mime_type) = Sesse::pr0n::Common::ensure_cached($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres);
 	}
 
 	# Output the image to the user