Remove commented out code.

[geeqie.git] / src / format_canon.h

diff --git a/src/format_canon.h b/src/format_canon.h
index ffbdd26..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,23 +10,40 @@
  *
  * 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/
  *
  */
 
-#ifndef __FORMAT_RAW_CANON_H
-#define __FORMAT_RAW_CANON_H
+#ifndef __FORMAT_CANON_H
+#define __FORMAT_CANON_H
 
 
-gint format_raw_test_canon(const void *data, const guint len,
-                          guint *image_offset, guint *exif_offset);
+#include "exif-int.h"
 
 
-#define FORMAT_RAW_CANON { "II", 2, "Canon crw format", format_raw_test_canon }, \
-                        { "\x49\x49\x2a\00", 4, "Canon cr2 format", format_raw_test_canon }
+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);
 
-#endif
+#define FORMAT_RAW_CANON { "crw", \
+                          FORMAT_RAW_MATCH_MAGIC,     6, "HEAPCCDR", 8, \
+                          FORMAT_RAW_EXIF_NONE, NULL, \
+                          "Canon crw", format_canon_raw_crw }, \
+                        { "cr2", \
+                          FORMAT_RAW_MATCH_TIFF_MAKE, 0, "Canon", 5, \
+                          FORMAT_RAW_EXIF_TIFF, NULL, \
+                          "Canon cr2", format_canon_raw_cr2 }
+
+
+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: */