summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2009-11-25 23:39:31 -0500
committerMatthias Clasen <mclasen@redhat.com>2009-11-25 23:39:31 -0500
commit044f168507ca5e7b0f1fa19b322b17cdab708413 (patch)
tree4f59aefe1382e01e3d880e3fd5a5ec5fa038745e
parentb72c2143b0608f0f5fb32abb9053e7bcd0541de7 (diff)
downloadgtk+-044f168507ca5e7b0f1fa19b322b17cdab708413.tar.gz
Set scale_num only once
This modifies the previous commit to be according the upstream libjpeg maintainers recommendations. See bug 588740.
-rw-r--r--gdk-pixbuf/io-jpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 07308e3706..c2c5ab9f3d 100644
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -921,8 +921,8 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data,
}
}
+ cinfo->scale_num = 1;
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;