diff src/format_nikon.h @ 101:847e4bc6b54c

Tue Nov 7 15:35:59 2006 John Ellis <[e-mail]> * exif.c: Use new format_raw_exif_offset() function to find Exif in raw files. * filelist.c: Add orf and pef to displayed file types. * format_canon.h, format_fuji.h: Update to new #define format. * format_fuji.c: Use same offset for Exif as the jpeg image as the Exif is always embedded in the jpeg and assuming offset of 12 is just broken. * format_nikon.h: Update to new #define format, and add pentax here as finding the jpeg will be same code. * format_olympus.[ch]: Support Olympus raw files with embedded jpegs, not all raw files will have a jpeg, but all appear to have Exif tags. * format_raw.[ch]: Add new camera types, and add a debugging facility to easily list all tags within tiff files (see format_raw.h to enable).

--- a/src/format_nikon.h	Tue Nov 07 01:57:19 2006 +0000
+++ b/src/format_nikon.h	Tue Nov 07 21:00:50 2006 +0000
@@ -18,8 +18,17 @@
 
 #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_MAGIC, 242, "PENTAX Corporation", 18, \
+			    FORMAT_RAW_EXIF_TIFF, NULL, \
+			    "Pentax raw", format_nikon_raw }
+
 
 gint format_nikon_makernote(ExifData *exif, unsigned char *tiff, guint offset,
 			    guint size, ExifByteOrder bo);