Include a Other Software section in Help file

[geeqie.git] / src / format_canon.h

diff --git a/src/format_canon.h b/src/format_canon.h
index ffbdd26..f76c39b 100644 (file)
--- a/src/format_canon.h
+++ b/src/format_canon.h
@@ -1,31 +1,52 @@
 /*
- *  GQView
- *  (C) 2005 John Ellis
+ * Copyright (C) 2005 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * Author: Daniel M. German <dmgerman@uvic.ca>
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * Code to add support for Canon CR2 and CRW files, version 0.2
- *
- * Developed by Daniel M. German, dmgerman at uvic.ca 
- *
- * you can find the sources for this patch at http://turingmachine.org/~dmg/libdcraw/gqview/
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#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);
+
+#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 }
 
-#endif
 
+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: */