Mercurial > geeqie
changeset 49:ae627d150a6b
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. #####
| author | gqview |
|---|---|
| date | Sat, 04 Jun 2005 00:06:48 +0000 |
| parents | 6948407f52a5 |
| children | 3b83fb81afc4 |
| files | ChangeLog TODO src/format_canon.c |
| diffstat | 3 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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?: ----------------------------------------------
--- 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);