# HG changeset patch
# User gqview
# Date 1117872407 0
# Node ID 3b83fb81afc435dc0e5426d1ebcb577af37bbaf4
# Parent  ae627d150a6b08f8ab1d0fe8abcc767dc17f3a42
Sat Jun  4 04:02:04 2005  John Ellis  <johne@verizon.net>

        * README: Update credits.

        Apply fix from Daniel M. German:

        * format_canon.c (canon_read_int): Fixed error which caused a
        segfault under OS X. It was a casting a number as a 32
        bit, when it was 16. it works in little endian, but not in big
        endian machines.

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

diff -r ae627d150a6b -r 3b83fb81afc4 ChangeLog
--- a/ChangeLog	Sat Jun 04 00:06:48 2005 +0000
+++ b/ChangeLog	Sat Jun 04 08:06:47 2005 +0000
@@ -1,3 +1,14 @@
+Sat Jun  4 04:02:04 2005  John Ellis  <johne@verizon.net>
+
+	* README: Update credits.
+
+	Apply fix from Daniel M. German:
+
+	* format_canon.c (canon_read_int): Fixed error which caused a
+	segfault under OS X. It was a casting a number as a 32
+	bit, when it was 16. it works in little endian, but not in big
+	endian machines.
+	
 Fri Jun  3 20:02:23 2005  John Ellis  <johne@verizon.net>
 
 	* format_canon.c (canon_mknote_parse_convert): For serial number
diff -r ae627d150a6b -r 3b83fb81afc4 README
--- a/README	Sat Jun 04 00:06:48 2005 +0000
+++ b/README	Sat Jun 04 08:06:47 2005 +0000
@@ -60,6 +60,9 @@
 
     Version in perenthesis indicates first appearance of feature or change.
 
+    (2.1.1) Add support for viewing jpeg images and EXIF embedded within
+    raw files for Canon (.crw, .cr2) and Fujifilm (.raf).
+
     (1.5.6) The "shared thumbnail cache" is a proposal to unify the method
     of storing thumbnails, so that they are compatible between different
     applications. Using this option will allow GQview to share it's
@@ -529,7 +532,13 @@
 
      Eric Swalens
      Quy Tonthat
-         for Exif support.
+         for initial Exif support.
+
+     Daniel M. German <dmgerman at uvic.ca>
+         for Canon raw image support.
+
+     Lars Ellenberg
+         for Fujifilm raw image support.
 
      Diederen Damien <D.Diederen@student.ulg.ac.be>
          for .xvpics thumbnail reading support.
diff -r ae627d150a6b -r 3b83fb81afc4 src/format_canon.c
--- a/src/format_canon.c	Sat Jun 04 00:06:48 2005 +0000
+++ b/src/format_canon.c	Sat Jun 04 08:06:47 2005 +0000
@@ -106,7 +106,7 @@
     *offset +=4;
     DEBUG_3("Read 4 bytes %d %x", *value, *value);
   } else {
-    *value = GUINT16_FROM_LE(*(guint32*)(data + *offset));
+    *value = GUINT16_FROM_LE(*(guint16*)(data + *offset));
     *offset +=2;
     DEBUG_3("Read 2 bytes %d %x", *value, *value);
   }