diff src/format_raw.h @ 51:276ea4c98d33

Sat Jun 4 22:24:00 2005 John Ellis <[e-mail]> * exif.[ch]: Use glib provided data types and byte order functions for consistency with rest of application. Made several more functions available in the header. Use MakerNote parsing from format_raw.c. * format_canon.[ch]: Changes to match exif.h and format_raw.h. * format_fuji.[ch]: Add support for Fuji EXIF MakerNote. * format_nikon.[ch]: New files, add support for Nikon EXIF MakerNote. * format_raw.[ch]: Add EXIF MakerNote parser functions to gather all camera formats here (similar to existing raw format list). * src/Makefile.am: Add format_nikon.[ch]. ##### Note: GQview CVS on sourceforge is not always up to date, please use ##### ##### an offical release when making enhancements and translation updates. #####

--- a/src/format_raw.h	Sat Jun 04 08:06:47 2005 +0000
+++ b/src/format_raw.h	Sun Jun 05 02:48:54 2005 +0000
@@ -14,15 +14,29 @@
 #define __FORMAT_RAW_H
 
 
+#include "exif.h"
+
+
 typedef gint (* FormatRawParseFunc)(const void *data, const guint len,
 				    guint *image_offset, guint *exif_offset);
 
-
 gint format_raw_img_exif_offsets(const void *data, const guint len,
 				 guint *image_offset, guint *exif_offset);
 gint format_raw_img_exif_offsets_fd(int fd, const void *header_data, const guint header_len,
 				    guint *image_offset, guint *exif_offset);
 
 
+typedef enum {
+	FORMAT_EXIF_MATCH_MAKE,
+	FORMAT_EXIF_MATCH_MAKERNOTE
+} FormatExifMatchType;
+
+typedef gint (* FormatExifParseFunc)(ExifData *exif, unsigned char *tiff, guint offset,
+				    guint size, ExifByteOrder byte_order);
+
+gint format_exif_makernote_parse(ExifData *exif, unsigned char *tiff, guint offset,
+				 guint size, ExifByteOrder byte_order);
+
+
 #endif