Remove commented out code.

[geeqie.git] / src / format_canon.h

diff --git a/src/format_canon.h b/src/format_canon.h
index d9da01c..cd39a5b 100644 (file)
--- a/src/format_canon.h
+++ b/src/format_canon.h
@@ -1,6 +1,7 @@
 /*
- *  GQView
- *  (C) 2005 John Ellis
+ * Geeqie
+ * (C) 2005 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * This software is released under the GNU General Public License (GNU GPL).
  * Please read the included file COPYING for more information.
@@ -9,7 +10,7 @@
  *
  * Code to add support for Canon CR2 and CRW files, version 0.2
  *
- * Developed by Daniel M. German, dmgerman at uvic.ca 
+ * Developed by Daniel M. German, dmgerman at uvic.ca
  *
  * you can find the sources for this patch at http://turingmachine.org/~dmg/libdcraw/gqview/
  *
@@ -19,27 +20,30 @@
 #define __FORMAT_CANON_H
 
 
-#include "exif.h"
+#include "exif-int.h"
 
 
-gint format_canon_raw(unsigned char *data, const guint len,
-                     guint *image_offset, guint *exif_offset);
+gboolean format_canon_raw_crw(guchar *data, const guint len,
+                             guint *image_offset, guint *exif_offset);
 
+gboolean format_canon_raw_cr2(guchar *data, const guint len,
+                             guint *image_offset, guint *exif_offset);
 
 #define FORMAT_RAW_CANON { "crw", \
                           FORMAT_RAW_MATCH_MAGIC,     6, "HEAPCCDR", 8, \
-                          "Canon crw", format_canon_raw }, \
+                          FORMAT_RAW_EXIF_NONE, NULL, \
+                          "Canon crw", format_canon_raw_crw }, \
                         { "cr2", \
                           FORMAT_RAW_MATCH_TIFF_MAKE, 0, "Canon", 5, \
-                          "Canon cr2", format_canon_raw }
+                          FORMAT_RAW_EXIF_TIFF, NULL, \
+                          "Canon cr2", format_canon_raw_cr2 }
 
 
-gint format_canon_makernote(ExifData *exif, unsigned char *tiff, guint offset,
-                           guint size, ExifByteOrder bo);
+gboolean format_canon_makernote(ExifData *exif, guchar *tiff, guint offset,
+                               guint size, ExifByteOrder bo);
 
 #define FORMAT_EXIF_CANON { FORMAT_EXIF_MATCH_MAKE, "Canon", 5, "Canon", format_canon_makernote }
 
 
 #endif
-
-
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */