2004-05-13 Jan Patera <patera@users.sourceforge.net>

	* libexif/exif-data.c: Fill tag data with zeros on save even
	  if 0 components (buggy Kodak-210)

diff --git a/ChangeLog b/ChangeLog
index 91284e5..d5d1336 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-13  Jan Patera <patera@users.sourceforge.net>
+
+       * libexif/exif-data.c: Fill tag data with zeros on save even
+         if 0 components (buggy Kodak-210)
+
 2004-05-12  Jan Patera <patera@users.sourceforge.net>
 
        * libexif/exif-utils.h: definition of MIN

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index 49f827a..aa62d74 100644 (file)
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -180,8 +180,6 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e,
         * the entry but somewhere else.
         */
        s = exif_format_get_size (e->format) * e->components;
-       if (!s)
-               return;
        if (s > 4) {
                doff = *ds - 6;
                *ds += s;
@@ -192,7 +190,7 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e,
                doff = offset + 8;
 
        /* Write the data. Fill unneeded bytes with 0. */
-       memcpy (*d + 6 + doff, e->data, e->size);
+       memcpy (*d + 6 + doff, e->data, s);
        if (s < 4) memset (*d + 6 + doff + s, 0, (4 - s));
 }