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

Fix transpose feature with jpeg v6b code base

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@244 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2010-10-10 02:48:21 +00:00
parent c04bd3cc97
commit 9a648cc90b
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@@ -118,7 +118,7 @@ test: testclean all
cmp $(srcdir)/testimgp.jpg testoutp.jpg cmp $(srcdir)/testimgp.jpg testoutp.jpg
./jpegtran -outfile testoutt.jpg testoutp.jpg ./jpegtran -outfile testoutt.jpg testoutp.jpg
cmp $(srcdir)/testimgint.jpg testoutt.jpg cmp $(srcdir)/testimgint.jpg testoutt.jpg
./jpegtran -crop 100x100+10+10 -transpose -perfect -outfile testoutcrop.jpg $(srcdir)/testorig.jpg ./jpegtran -crop 120x90+20+50 -transpose -perfect -outfile testoutcrop.jpg $(srcdir)/testorig.jpg
cmp $(srcdir)/testimgcrop.jpg testoutcrop.jpg cmp $(srcdir)/testimgcrop.jpg testoutcrop.jpg
else else
@@ -143,7 +143,7 @@ test: testclean all
cmp $(srcdir)/testimgp.jpg testoutp.jpg cmp $(srcdir)/testimgp.jpg testoutp.jpg
./jpegtran -outfile testoutt.jpg testoutp.jpg ./jpegtran -outfile testoutt.jpg testoutp.jpg
cmp $(srcdir)/testimgint.jpg testoutt.jpg cmp $(srcdir)/testimgint.jpg testoutt.jpg
./jpegtran -crop 100x100+10+10 -transpose -perfect -outfile testoutcrop.jpg $(srcdir)/testorig.jpg ./jpegtran -crop 120x90+20+50 -transpose -perfect -outfile testoutcrop.jpg $(srcdir)/testorig.jpg
cmp $(srcdir)/testimgcrop.jpg testoutcrop.jpg cmp $(srcdir)/testimgcrop.jpg testoutcrop.jpg
endif endif

BIN
testimgcrop.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

11
transupp.c
View File

@@ -1369,9 +1369,6 @@ jtransform_adjust_parameters (j_decompress_ptr srcinfo,
#if JPEG_LIB_VERSION >= 70 #if JPEG_LIB_VERSION >= 70
dstinfo->jpeg_width = info->output_width; dstinfo->jpeg_width = info->output_width;
dstinfo->jpeg_height = info->output_height; dstinfo->jpeg_height = info->output_height;
#else
dstinfo->image_width = info->output_width;
dstinfo->image_height = info->output_height;
#endif #endif
/* Transpose destination image parameters */ /* Transpose destination image parameters */
@@ -1380,9 +1377,17 @@ jtransform_adjust_parameters (j_decompress_ptr srcinfo,
case JXFORM_TRANSVERSE: case JXFORM_TRANSVERSE:
case JXFORM_ROT_90: case JXFORM_ROT_90:
case JXFORM_ROT_270: case JXFORM_ROT_270:
#if JPEG_LIB_VERSION < 70
dstinfo->image_width = info->output_height;
dstinfo->image_height = info->output_width;
#endif
transpose_critical_parameters(dstinfo); transpose_critical_parameters(dstinfo);
break; break;
default: default:
#if JPEG_LIB_VERSION < 70
dstinfo->image_width = info->output_width;
dstinfo->image_height = info->output_height;
#endif
break; break;
} }