Thu Jun 9 22:23:18 2005 John Ellis <johne@verizon.net>

[geeqie.git] / src / format_nikon.h

diff --git a/src/format_nikon.h b/src/format_nikon.h
index 4d543d4..c089cf6 100644 (file)
--- a/src/format_nikon.h
+++ b/src/format_nikon.h
@@ -13,15 +13,16 @@
 
 #include "exif.h"
 
-gint format_nikon_raw(const void *data, const guint len,
+gint format_nikon_raw(unsigned char *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, \
+                          "Nikon raw", format_nikon_raw }
 
 
 gint format_nikon_makernote(ExifData *exif, unsigned char *tiff, guint offset,
-                           guint size, ExifByteOrder byte_order);
+                           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 }