From 9a648cc90b77216060193466f86a3621c0bbb965 Mon Sep 17 00:00:00 2001
From: DRC <dcommander@users.sourceforge.net>
Date: Sun, 10 Oct 2010 02:48:21 +0000
Subject: [PATCH] Fix transpose feature with jpeg v6b code base

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@244 632fc199-4ca6-4c93-a231-07263d6284db
---
 Makefile.am     |   4 ++--
 testimgcrop.jpg | Bin 2330 -> 2662 bytes
 transupp.c      |  11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ac8e65c..a32bd99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,7 +118,7 @@ test: testclean all
 	cmp $(srcdir)/testimgp.jpg testoutp.jpg
 	./jpegtran -outfile testoutt.jpg testoutp.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
 
 else
@@ -143,7 +143,7 @@ test: testclean all
 	cmp $(srcdir)/testimgp.jpg testoutp.jpg
 	./jpegtran -outfile testoutt.jpg testoutp.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
 
 endif
diff --git a/testimgcrop.jpg b/testimgcrop.jpg
index 1e69c3ae96f1d6bb599644f1e45afac624638658..18fa0b1e5b5916ed67b363335908c5ad53e7ce3a 100644
GIT binary patch
delta 1815
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
F|Jmo{kcI#N

delta 1480
zcmV;(1vmQU6q*u{qyugMZn3Ax0e|x5T0u{Gj2>wwHi_dED<Q^dv0&AZxfrPn6tGdU
zD)qdz6U9tLWHg?mMzCy(Ls3FW6)r0#YKJWk7-7<ZQy?UOIW&;jk9BR-;-IxsuY+AA
zx^orF99D6&^4_;`l8xFhcD{w{Z@MbYK?2}afms?HYv!WP4NCngBU_>wW`7puuctMe
z3k=qTZO~N9L9I&x0qad@fITax&@?N3Mj-5RO<$kE;2bLuD`?>A$~?%QX%(Y5)Icg+
zR_*79n%N5iNfnAzsln}7Riiq85u_xZ!YYzL1De{gvJo$xDEYC*dsG@sQM85JXB{hC
zK{e!?5MnX<*KP|8rSG#kvwv$tHP(B%g2%#UtXycWv4<UTTM1^C-MJK8UG0s74lC2E
zLYt=4jFWdcP^Ae6sHci0b$J}GOwcRm9*v}QoKZB!;-u|OBQ>%iiyvCPhZr?U1z1+8
zmZMDVJQ=7M?hFOECnCKvMOHw4MR;zPc_pRXQYr6Vv8C#Q_9PkS6@TmCYF-?@jA|`z
zH&cfybKbcdttpG-5Hf41*Dg#d7d=iYoEH{_0F{-AJbO`$oFf-0Bclh0sa|}L+^47M
zO#m6>lU=o*h?e%AYYs@wVnFew&8o=2M<eYA->|N?Q`9ZswDR`=cGnECu}&1|Z1)Pd
zY15NcH#qCV`@#pUW?JeE8p1*Aim`Qj0A_8~&)(h}hT5m)uFOUzFol-pQH9x%)3kCN
z^d_yvDmdWPOUV9R)k-PaGuFIa^)B{yG62A)HU&;rqAGJ+ArFXT;-?5{u%%iG1w^D$
zvws2t0e^v&0H|;UTaigMS=5T{i#~3{<6tUM^;t8Tm;yx&1?)+0hn_S&8NfB$TuW~h
zFhZE&bH#Etwr*J^kd#nC9;Uh&u6J@Uy#{;YvaMMvZkp<QIYt^vx3!j<Y4aRR;ABSF
zJ<kL6s*INfut6C$ZbmXIjN{&&5<Iani0>eLz<+fBdsho*(Mp<>tmHujr<_WpfI9L)
z9Y?iI1dR-(2@1*1Nyi_JLxKopBrrJyRFcfsDyu4j>6|d?N2O0PXiA*v%JJCUlU}oH
zU_)-XQM3RK5Av)TBzYLSoU!U^0Hhomekx@q%_%Nhw1qe{_zN!l91H+zI-UWQlj<mr
z<A0u~JuDtxMNyOr=q{~G7GYVFTI3q<r&qc1c#ID#e5P!8Cl%3ITH0IMCCrK*X);k;
zpaA+;J|bw_2D$}+q!#iLKH}t6R-L1vS#%e*Zc)9L^u<<ZW@jX^IV9B4F3|7TWBJok
zHDCx8IZ&t&cjVUtXVB52-mGMdtU*>JdVe0&=wy}$St4SrJt$bPxg)JSMyrhS=eMOx
zdYv$#C%GXpNtWBN=bul)m1T>{c>JNiBWw2*=7Ls_%>Wc$2^iz@s`)D4RXF@8)ia_{
z<&V6^F&u;Vk4lY{pSakmmDhGzcMgP8mgXqVJf+xpBN_dA(2hyj?(`_L+$T|y?SEJF
z_cB8vBLjFJkf`K@f;Rlhz!CH{ZZr_aso$yknzYR6(vqF;py?1d<5_nwlqb@(9(dGp
zYNf@*atvasE!<euNv$5HTR@UJk5(0UA(2iv0lU>>l_8g?ITdefyPO;;`MK;3Yd4}i
zygXMkvIw%LZg{Iq0ub5csQfAv+J6WM__6+#Ey^-V>P~QQ52)-%*14q5YJ%m4qNWRE
zocH?Tg*e{F)A`g;gSei+9G^}qSd-1(5EkPU;Rf1096RQRHMV5db3AXf9HWuBKfUze
z(SK_lyQ`Ec_yn)_TmJy9O+}8?pq5fk?*Uaq*J<aG{Xae{V(aWoS=vBcu~}jdP)%H8
zrJ2i!YEox9cJ*G3$e}@ITy@B)<?=(7LN?^%>p~$?SnzoOR&R3{LzxcF)@Ngp$^5FL
i-O6%vfPE@y-4#e~<AGUj<nda;T;|8tbopZzfB)G;sly2X

diff --git a/transupp.c b/transupp.c
index 0954715..5c31416 100644
--- a/transupp.c
+++ b/transupp.c
@@ -1369,9 +1369,6 @@ jtransform_adjust_parameters (j_decompress_ptr srcinfo,
 #if JPEG_LIB_VERSION >= 70
   dstinfo->jpeg_width = info->output_width;
   dstinfo->jpeg_height = info->output_height;
-#else
-  dstinfo->image_width = info->output_width;
-  dstinfo->image_height = info->output_height;
 #endif
 
   /* Transpose destination image parameters */
@@ -1380,9 +1377,17 @@ jtransform_adjust_parameters (j_decompress_ptr srcinfo,
   case JXFORM_TRANSVERSE:
   case JXFORM_ROT_90:
   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);
     break;
   default:
+#if JPEG_LIB_VERSION < 70
+    dstinfo->image_width = info->output_width;
+    dstinfo->image_height = info->output_height;
+#endif
     break;
   }
 
-- 
2.40.0