Fri Jun 3 20:02:23 2005 John Ellis <johne@verizon.net>

        * format_canon.c (canon_mknote_parse_convert): For serial number
        conversion, use the value of the data - not the value of the pointer.

##### Note: GQview CVS on sourceforge is not always up to date, please use #####
##### an offical release when making enhancements and translation updates. #####

diff --git a/ChangeLog b/ChangeLog
index f747fe9..8a84562 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun  3 20:02:23 2005  John Ellis  <johne@verizon.net>
+
+       * format_canon.c (canon_mknote_parse_convert): For serial number
+       conversion, use the value of the data - not the value of the pointer.
+
 Fri Jun  3 18:43:46 2005  John Ellis  <johne@verizon.net>
 
        * bar_exif.c: Set a default size for the EXIF data column in the

diff --git a/TODO b/TODO
index 0655a48..d995598 100644 (file)
--- a/TODO
+++ b/TODO
@@ -88,6 +88,8 @@ Minor (non blockers):
    > collection window
    > search window
 
+ > clean up exif.c to be portable (don't assume sizeof(short)==2 and sizeof(long)==4)
+
 
 Wishlist?:
 ----------------------------------------------

diff --git a/src/format_canon.c b/src/format_canon.c
index 1a8f1a4..287b511 100644 (file)
--- a/src/format_canon.c
+++ b/src/format_canon.c
@@ -813,7 +813,7 @@ static void canon_mknote_parse_convert(ExifData *exif)
                gint l;
                guint32 n;
 
-               n = (guint32)result->data;
+               n = (guint32)((guint32 *)(result->data))[0];
                text = g_strdup_printf("%04X%05d", n & 0xffff0000 >> 8, n & 0x0000ffff);
                l = strlen(text);
                item = exif_item_new(marker.format, marker.tag, l, &marker);