[libexif-cvs] libexif/libexif exif-loader.c,1.20,1.21

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27961/libexif

Modified Files:
	exif-loader.c 
Log Message:
exif_loader_write() correctly skips APP2 marker with ICC profile
because ImageMagick flips order of APP1 EXIF and APP2 ICC markers.


Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -d -r1.20 -r1.21
--- exif-loader.c	24 Jul 2005 23:34:41 -0000	1.20
+++ exif-loader.c	15 Apr 2006 19:15:30 -0000	1.21
@@ -33,6 +33,8 @@
 #define JPEG_MARKER_APP0 0xe0
 #undef JPEG_MARKER_APP1
 #define JPEG_MARKER_APP1 0xe1
+#undef JPEG_MARKER_APP2
+#define JPEG_MARKER_APP2 0xe2
 #undef JPEG_MARKER_APP13
 #define JPEG_MARKER_APP13 0xed
 #undef JPEG_MARKER_COM
@@ -265,6 +267,7 @@ exif_loader_write (ExifLoader *eld, unsi
 				eld->state = EL_READ_SIZE_BYTE_08;
 				break;
 			case JPEG_MARKER_APP0:
+			case JPEG_MARKER_APP2:
 			case JPEG_MARKER_APP13:
 			case JPEG_MARKER_COM:
 				eld->data_format = EL_DATA_FORMAT_JPEG;