diff -r b72c6db6890b -r 5dc02b23752f src/3rdparty/libjpeg/jdapimin.c --- a/src/3rdparty/libjpeg/jdapimin.c Wed Jun 23 19:07:03 2010 +0300 +++ b/src/3rdparty/libjpeg/jdapimin.c Tue Jul 06 15:10:48 2010 +0300 @@ -2,6 +2,7 @@ * jdapimin.c * * Copyright (C) 1994-1998, Thomas G. Lane. + * Modified 2009 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -185,8 +186,8 @@ } /* Set defaults for other decompression parameters. */ - cinfo->scale_num = 1; /* 1:1 scaling */ - cinfo->scale_denom = 1; + cinfo->scale_num = cinfo->block_size; /* 1:1 scaling */ + cinfo->scale_denom = cinfo->block_size; cinfo->output_gamma = 1.0; cinfo->buffered_image = FALSE; cinfo->raw_data_out = FALSE;