fix jpeg autorotate for orientation 3

jcupitt · jcupitt · commit dc78c2c6e483 · 2023-01-09T10:11:45.000Z
we were not clearing the orientation tag if width and height were unaltered by the orientation change see libvips#3268 thanks zhifengzhuang
diff --git a/ChangeLog b/ChangeLog
@@ -1,10 +1,11 @@
-xx/1/23 8.14.1
+9/1/23 8.14.1
 
 - add vips_thread_isworker() compatibility function [remicollet]
 - add vips_semaphore_down_timeout() [kleisauke]
 - idle threads are removed after 15s [kleisauke]
 - fix version number in gtk-doc index [kleisauke]
 - save mono fits images as NAXIS=2 [ewelot]
+- fix jpeg `autorotate` for orientation 3 [zhifengzhuang]
 
 22/12/22 8.14.0
 
diff --git a/libvips/foreign/jpeg2vips.c b/libvips/foreign/jpeg2vips.c
@@ -979,9 +979,10 @@ vips__jpeg_read( ReadJpeg *jpeg, VipsImage *out, gboolean header_only )
 
 		/* Swap width and height if we're going to rotate this image.
 		 */
-		if( jpeg->autorotate &&
-			vips_image_get_orientation_swap( out ) ) {
-			VIPS_SWAP( int, out->Xsize, out->Ysize );
+		if( jpeg->autorotate ) {
+			if( vips_image_get_orientation_swap( out ) ) 
+				VIPS_SWAP( int, out->Xsize, out->Ysize );
+
 			vips_autorot_remove_angle( out ); 
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -979,9 +979,10 @@ vips__jpeg_read( ReadJpeg jpeg, VipsImage out, gboolean header_only )`
`979`	`979`
`980`	`980`	`/* Swap width and height if we're going to rotate this image.`
`981`	`981`	`*/`
`982`		`- if( jpeg->autorotate &&`
`983`		`- vips_image_get_orientation_swap( out ) ) {`
`984`		`- VIPS_SWAP( int, out->Xsize, out->Ysize );`
	`982`	`+ if( jpeg->autorotate ) {`
	`983`	`+ if( vips_image_get_orientation_swap( out ) )`
	`984`	`+ VIPS_SWAP( int, out->Xsize, out->Ysize );`
	`985`	`+`
`985`	`986`	`vips_autorot_remove_angle( out );`
`986`	`987`	`}`
`987`	`988`	`}`