summaryrefslogtreecommitdiff
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:35:17 -0500
commit547ce2036086af11c4b99b991f975ef23dac56da (patch)
treeec4c011e64696f15b3b3de0f3a8ea88ecf0ac693
parent76cadc9d3acf2953209996c57e04e0410103add3 (diff)
downloadgdk-pixbuf-547ce2036086af11c4b99b991f975ef23dac56da.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.
-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 680a20904..5d63af3a9 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;