2005-03-09 Lutz Mueller <lutz@users.sourceforge.net>

	* libexif/exif-data.c (exif_data_save_data_content): Save entries in
		the correct order.

diff --git a/ChangeLog b/ChangeLog
index 899f95f..5988623 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-03-09  Lutz Mueller <lutz@users.sourceforge.net>
 
+       * libexif/exif-data.c (exif_data_save_data_content): Save entries in
+               the correct order.
+
+2005-03-09  Lutz Mueller <lutz@users.sourceforge.net>
+
        * test/test-mem.c: Write size to loader to make the test work again.
 
 2005-03-09  Lutz Mueller <lutz@users.sourceforge.net>

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index 57cd521..69f259b 100644 (file)
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -379,6 +379,7 @@ exif_data_save_data_content (ExifData *data, ExifContent *ifd,
 {
        unsigned int j, n_ptr = 0, n_thumb = 0;
        ExifIfd i;
+       ExifEntry *le = NULL;
 
        if (!data || !data->priv || !ifd || !d || !ds) return;
 
@@ -434,13 +435,31 @@ exif_data_save_data_content (ExifData *data, ExifContent *ifd,
                        (ExifShort) (ifd->count + n_ptr + n_thumb));
        offset += 2;
 
-       /* Save each entry */
+       /*
+        * Save each entry. TIFF specification requires entries to be sorted
+        * by tags. Yes, the sorting routine can be improved. Please submit a
+        * patch.
+        */
        exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
                  "Saving %i entries (IFD '%s', offset: %i)...",
                  ifd->count, exif_ifd_get_name (i), offset);
-       for (j = 0; j < ifd->count; j++)
-               exif_data_save_data_entry (data, ifd->entries[j],
-                               d, ds, offset + 12 * j);
+       for (j = 0; j < ifd->count; j++) {
+               ExifEntry *me = NULL;
+               unsigned int k;
+
+               for (k = 0; k < ifd->count; k++) {
+                       if (le && ((ifd->entries[k]->tag < le->tag) ||
+                                               ((ifd->entries[k]->tag == le->tag) && (le <= ifd->entries[k]))))
+                               continue;
+                       if (!me || (me && ((me->tag > ifd->entries[k]->tag) ||
+                                                       ((me->tag == ifd->entries[k]->tag) && (me <= ifd->entries[k])))))
+                               me = ifd->entries[k];
+               }
+               if (!me) break;
+               exif_data_save_data_entry (data, me, d, ds, offset + 12 * j);
+               le = me;
+       }
+
        offset += 12 * ifd->count;
 
        /* Now save special entries. */