diff src/format_olympus.h @ 101:847e4bc6b54c

Tue Nov 7 15:35:59 2006 John Ellis <johne@verizon.net> * 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).
author gqview
date Tue, 07 Nov 2006 21:00:50 +0000
parents a8c9992320f4
children 695e1ad3b169
line wrap: on
line diff
--- a/src/format_olympus.h	Tue Nov 07 01:57:19 2006 +0000
+++ b/src/format_olympus.h	Tue Nov 07 21:00:50 2006 +0000
@@ -14,15 +14,14 @@
 #include "exif.h"
 
 
-#if 0
 gint format_olympus_raw(unsigned char *data, const guint len,
 			guint *image_offset, guint *exif_offset);
 
 
 #define FORMAT_RAW_OLYMPUS { "orf", \
-			     FORMAT_RAW_MATCH_MAGIC, 0, "IIRS", 4, \
+			     FORMAT_RAW_MATCH_MAGIC, 0, "IIR", 3, \
+			     FORMAT_RAW_EXIF_IFD_II, NULL, \
 			     "Olympus raw", format_olympus_raw }
-#endif
 
 
 gint format_olympus_makernote(ExifData *exif, unsigned char *tiff, guint offset,