summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2009-11-05 10:29:34 -0500
committerMatthias Clasen <mclasen@redhat.com>2009-11-05 10:29:34 -0500
commitf4990f6c9d20776af0ff87a9cdb0c19b3b0686d4 (patch)
treece49476729d0dfb9b7be5368784f1bcd08b3dd71 /gdk-pixbuf
parent9e51c10edc50333997a28c221b200cc6f83bdcef (diff)
downloadgdk-pixbuf-f4990f6c9d20776af0ff87a9cdb0c19b3b0686d4.tar.gz
Fix loading scaled-down jpegs
The assumption that scale_num will be automatically be 1 is no longer with libjpeg7. So set it explicitly. Bug #588740.
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/io-jpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 5435f5b25..07308e370 100644
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -922,6 +922,7 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data,
}
for (cinfo->scale_denom = 2; cinfo->scale_denom <= 8; cinfo->scale_denom *= 2) {
+ cinfo->scale_num = 1;
jpeg_calc_output_dimensions (cinfo);
if (cinfo->output_width < width || cinfo->output_height < height) {
cinfo->scale_denom /= 2;