diff src/format_raw.c @ 53:00843150f7c8

Tue Jun 7 03:47:03 2005 John Ellis <[e-mail]> * filelist.c (filter_add_defaults): Add Nikon file extension for nef. * format_canon.[ch], format_fuji.[ch]: Add comment tile, and description field for MakerNote parser. * format_nikon.[ch]: Add support for jpegs embedded in Nikon nef files. * format_raw.c: Add debug description output and Nikon raw parser hook. ##### 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.c	Sun Jun 05 07:09:12 2005 +0000
+++ b/src/format_raw.c	Tue Jun 07 07:55:00 2005 +0000
@@ -33,6 +33,10 @@
 #include "format_nikon.h"
 
 
+/* so that debugging is honored */
+extern gint debug;
+
+
 typedef struct _FormatRawEntry FormatRawEntry;
 struct _FormatRawEntry {
 	const void *header_pattern;
@@ -44,6 +48,7 @@
 static FormatRawEntry format_raw_list[] = {
 	FORMAT_RAW_CANON,
 	FORMAT_RAW_FUJI,
+	FORMAT_RAW_NIKON,
 	{ NULL, 0, NULL, NULL }
 };
 
@@ -53,6 +58,7 @@
 	FormatExifMatchType header_type;
 	const void *header_pattern;
 	const guint header_length;
+	const gchar *description;
 	FormatExifParseFunc func_parse;
 };
 
@@ -92,6 +98,8 @@
 
 	if (!entry || !entry->func_parse) return FALSE;
 
+	if (debug) printf("RAW using file parser for %s\n", entry->description);
+
 	found = entry->func_parse(data, len, &io, &eo);
 
 	if (!found ||
@@ -219,6 +227,8 @@
 
 	if (!entry || !entry->func_parse) return FALSE;
 
+	if (debug) printf("EXIF using makernote parser for %s\n", entry->description);
+
 	return entry->func_parse(exif, tiff, offset, size, byte_order);
 }