[libexif-cvs] libexif/libexif exif-data.c,1.17,1.18

[<lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv3351/libexif

Modified Files:
	exif-data.c 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Jason Sodergren <ja...@ta...> found a lot of bugs in

	* libexif/exif-data.c: Correctly save the data.
	* configure.in: Version 0.5.5.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- exif-data.c	29 Aug 2002 20:59:47 -0000	1.17
+++ exif-data.c	29 Aug 2002 21:04:58 -0000	1.18
@@ -346,16 +346,6 @@
 
 	if (n_thumb) {
 
-		/* EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH */
-		exif_set_short (*d + 6 + offset + 0, data->priv->order,
-				EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
-		exif_set_short (*d + 6 + offset + 2, data->priv->order,
-				EXIF_FORMAT_LONG);
-		exif_set_long  (*d + 6 + offset + 4, data->priv->order, 1);
-		exif_set_long  (*d + 6 + offset + 8, data->priv->order,
-				data->size);
-		offset += 12;
-		
 		/* EXIF_TAG_JPEG_INTERCHANGE_FORMAT */
 		exif_set_short (*d + 6 + offset + 0, data->priv->order,
 				EXIF_TAG_JPEG_INTERCHANGE_FORMAT);
@@ -367,6 +357,16 @@
 		*ds += data->size;
 		*d = realloc (*d, sizeof (char) * *ds);
 		memcpy (*d + *ds - data->size, data->data, data->size);
+		offset += 12;
+
+		/* EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH */
+		exif_set_short (*d + 6 + offset + 0, data->priv->order,
+				EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
+		exif_set_short (*d + 6 + offset + 2, data->priv->order,
+				EXIF_FORMAT_LONG);
+		exif_set_long  (*d + 6 + offset + 4, data->priv->order, 1);
+		exif_set_long  (*d + 6 + offset + 8, data->priv->order,
+				data->size);
 		offset += 12;
 	}