[libexif-cvs] libexif/libexif exif-data.c, 1.99, 1.100 exif-tag.c, 1.34, 1.35

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25905/libexif

Modified Files:
	exif-data.c exif-tag.c 
Log Message:
When NO_VERBOSE_TAG_STRINGS is used, don't set
EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS by default or else no tags at all will
be loaded. Also, properly terminate the ExifTagTable.


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -d -r1.34 -r1.35
--- exif-tag.c	30 Oct 2007 05:03:05 -0000	1.34
+++ exif-tag.c	30 Oct 2007 06:45:23 -0000	1.35
@@ -681,8 +681,8 @@ static const struct {
 	 N_("Indicates the value of coefficient gamma.")},
 	{EXIF_TAG_UNKNOWN_C4A5, "UnknownC4A5", N_("Unknown"),
 	 N_("Unknown (related to Epson's PRINT Image Matching technology)")},
-	{0, NULL, NULL, NULL}
 #endif
+	{0, NULL, NULL, NULL}
 };
 
 /* For now, do not use these functions. */

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -d -r1.99 -r1.100
--- exif-data.c	30 Oct 2007 03:23:28 -0000	1.99
+++ exif-data.c	30 Oct 2007 06:45:23 -0000	1.100
@@ -134,7 +134,13 @@ exif_data_new_mem (ExifMem *mem)
 	}
 
 	/* Default options */
+#ifndef NO_VERBOSE_TAG_STRINGS
+	/*
+	 * When the tag list is compiled away, setting this option prevents
+	 * any tags from being loaded
+	 */
 	exif_data_set_option (data, EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS);
+#endif
 	exif_data_set_option (data, EXIF_DATA_OPTION_FOLLOW_SPECIFICATION);
 
 	/* Default data type: none */