ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix jpegoptim with v7 emulation as well

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@568 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-04-03 07:09:49 +00:00
parent 59a58343ea
commit e7fde87ca5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.txt
View File

@@ -20,9 +20,10 @@ libjpeg-turbo with older versions of MinGW64, you will now have to add
build to fail when using the Visual Studio IDE. build to fail when using the Visual Studio IDE.
[5] Fixed a bug in jpeg_read_coefficients() whereby it would not initialize [5] Fixed a bug in jpeg_read_coefficients() whereby it would not initialize
cinfo->image_width and cinfo->image_height if libjpeg v8 emulation was enabled. cinfo->image_width and cinfo->image_height if libjpeg v7 or v8 emulation was
This specifically caused the jpegoptim program to fail if it was linked against enabled. This specifically caused the jpegoptim program to fail if it was
a version of libjpeg-turbo that was built with libjpeg v8 emulation. linked against a version of libjpeg-turbo that was built with libjpeg v7 or v8
emulation.
1.1.0 1.1.0

2
jcmaster.c
View File

@@ -75,7 +75,9 @@ initial_setup (j_compress_ptr cinfo, boolean transcode_only)
JDIMENSION jd_samplesperrow; JDIMENSION jd_samplesperrow;
#if JPEG_LIB_VERSION >= 70 #if JPEG_LIB_VERSION >= 70
#if JPEG_LIB_VERSION >= 80
if (!transcode_only) if (!transcode_only)
#endif
jpeg_calc_jpeg_dimensions(cinfo); jpeg_calc_jpeg_dimensions(cinfo);
#endif #endif