Remove commented out code.

[geeqie.git] / src / format_nikon.h

diff --git a/src/format_nikon.h b/src/format_nikon.h
index 4d543d4..438de56 100644 (file)
--- a/src/format_nikon.h
+++ b/src/format_nikon.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.
@@ -11,21 +12,35 @@
 #define __FORMAT_NIKON_H
 
 
-#include "exif.h"
+#include "exif-int.h"
 
-gint format_nikon_raw(const void *data, const guint len,
-                     guint *image_offset, guint *exif_offset);
+gboolean format_nikon_raw(guchar *data, const guint len,
+                         guint *image_offset, guint *exif_offset);
 
-#define FORMAT_RAW_NIKON { "II\x2a\x00", 4, "Nikon tiff raw", format_nikon_raw }, \
-                        { "MM\x00\x2a", 4, "Nikon tiff raw", format_nikon_raw }
+#define FORMAT_RAW_NIKON { "nef", \
+                          FORMAT_RAW_MATCH_TIFF_MAKE, 0, "NIKON CORPORATION", 17, \
+                          FORMAT_RAW_EXIF_TIFF, NULL, \
+                          "Nikon raw", format_nikon_raw }
 
+/* If your format is basically just TIFF with an embedded jpeg,
+ * then avoid duplicating code and just stick it here and use the existing nikon parse.
+ */
+#define FORMAT_RAW_PENTAX { "pef", \
+                           FORMAT_RAW_MATCH_TIFF_MAKE, 0, "PENTAX Corporation", 18, \
+                           FORMAT_RAW_EXIF_TIFF, NULL, \
+                           "Pentax raw", format_nikon_raw }
+
+#define FORMAT_RAW_SAMSUNG { "pef", \
+                           FORMAT_RAW_MATCH_TIFF_MAKE, 0, "SAMSUNG TECHWIN", 15, \
+                           FORMAT_RAW_EXIF_TIFF, NULL, \
+                           "Samsung raw", format_nikon_raw }
 
-gint format_nikon_makernote(ExifData *exif, unsigned char *tiff, guint offset,
-                           guint size, ExifByteOrder byte_order);
+gboolean format_nikon_makernote(ExifData *exif, guchar *tiff, guint offset,
+                               guint size, ExifByteOrder bo);
 
 #define FORMAT_EXIF_NIKON { FORMAT_EXIF_MATCH_MAKERNOTE, "Nikon\x00", 6, "Nikon", format_nikon_makernote }, \
                          { FORMAT_EXIF_MATCH_MAKE,      "NIKON",     5, "Nikon", format_nikon_makernote }
 
 
 #endif
-
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */