# HG changeset patch
# User gqview
# Date 1117843608 0
# Node ID ae627d150a6b08f8ab1d0fe8abcc767dc17f3a42
# Parent  6948407f52a52b8ae3c83fd4c461c16e6f03b304
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 -r 6948407f52a5 -r ae627d150a6b ChangeLog
--- a/ChangeLog	Fri Jun 03 22:48:37 2005 +0000
+++ b/ChangeLog	Sat Jun 04 00:06:48 2005 +0000
@@ -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 -r 6948407f52a5 -r ae627d150a6b TODO
--- a/TODO	Fri Jun 03 22:48:37 2005 +0000
+++ b/TODO	Sat Jun 04 00:06:48 2005 +0000
@@ -88,6 +88,8 @@
    > collection window
    > search window
 
+ > clean up exif.c to be portable (don't assume sizeof(short)==2 and sizeof(long)==4)
+
 
 Wishlist?:
 ----------------------------------------------
diff -r 6948407f52a5 -r ae627d150a6b src/format_canon.c
--- a/src/format_canon.c	Fri Jun 03 22:48:37 2005 +0000
+++ b/src/format_canon.c	Sat Jun 04 00:06:48 2005 +0000
@@ -813,7 +813,7 @@
 		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);