2002-08-29 Lutz Müller <lutz@users.sourceforge.net>

	Jason Sodergren <jason@taiga.com> found a lot of bugs in

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

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index b4f434e..0b51347 100644 (file)
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -346,16 +346,6 @@ exif_data_save_data_content (ExifData *data, ExifContent *ifd,
 
        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);
@@ -368,6 +358,16 @@ exif_data_save_data_content (ExifData *data, ExifContent *ifd,
                *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;
        }
 
        if (ifd == data->ifd[EXIF_IFD_0] && data->ifd[EXIF_IFD_1]->count) {