2003-10-30 Lutz Mueller <lutz@users.sourceforge.net>

	* libexif/exif-data.c: Add explicit typecasts to ExifShort.
	  Suggested by Jan Patera <patera@pictview.com>.

diff --git a/ChangeLog b/ChangeLog
index ca1fa50662358a7ca5cbf31e094f08bc4eb1d8c6..3bed507764c732152efa1eac5128f02e0bfbd6b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-30  Lutz Mueller <lutz@users.sourceforge.net>
+
+       * libexif/exif-data.c: Add explicit typecasts to ExifShort.
+         Suggested by Jan Patera <patera@pictview.com>.
+
 2003-10-28  Lutz Mueller <lutz@users.sourceforge.net>
 
        * libexif/olympus: Fix. I've got one Olympus file and this gets

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index 9e2a9c2beb4e6bb5f09c10e13efe387cc578fa20..83573d6127b0cbee39d7f0ad5cb1128fd39d3742 100644 (file)
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -158,9 +158,9 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e,
         * already been allocated.
         */
        exif_set_short (*d + 6 + offset + 0,
-                       data->priv->order, e->tag);
+                       data->priv->order, (ExifShort) e->tag);
        exif_set_short (*d + 6 + offset + 2,
-                       data->priv->order, e->format);
+                       data->priv->order, (ExifShort) e->format);
        exif_set_long  (*d + 6 + offset + 4,
                        data->priv->order, e->components);
 
@@ -353,7 +353,7 @@ exif_data_save_data_content (ExifData *data, ExifContent *ifd,
 
        /* Save the number of entries */
        exif_set_short (*d + 6 + offset, data->priv->order,
-                       ifd->count + n_ptr + n_thumb);
+                       (ExifShort) (ifd->count + n_ptr + n_thumb));
        offset += 2;
 
 #ifdef DEBUG