comparison 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
comparison
equal deleted inserted replaced
100:deafec7cd99f 101:847e4bc6b54c
12 12
13 13
14 #include "exif.h" 14 #include "exif.h"
15 15
16 16
17 #if 0
18 gint format_olympus_raw(unsigned char *data, const guint len, 17 gint format_olympus_raw(unsigned char *data, const guint len,
19 guint *image_offset, guint *exif_offset); 18 guint *image_offset, guint *exif_offset);
20 19
21 20
22 #define FORMAT_RAW_OLYMPUS { "orf", \ 21 #define FORMAT_RAW_OLYMPUS { "orf", \
23 FORMAT_RAW_MATCH_MAGIC, 0, "IIRS", 4, \ 22 FORMAT_RAW_MATCH_MAGIC, 0, "IIR", 3, \
23 FORMAT_RAW_EXIF_IFD_II, NULL, \
24 "Olympus raw", format_olympus_raw } 24 "Olympus raw", format_olympus_raw }
25 #endif
26 25
27 26
28 gint format_olympus_makernote(ExifData *exif, unsigned char *tiff, guint offset, 27 gint format_olympus_makernote(ExifData *exif, unsigned char *tiff, guint offset,
29 guint size, ExifByteOrder bo); 28 guint size, ExifByteOrder bo);
30 29