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.

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index 0a0c77b..88758ce 100644 (file)
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -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 */

diff --git a/libexif/exif-tag.c b/libexif/exif-tag.c
index 95360fe..d0c4564 100644 (file)
--- a/libexif/exif-tag.c
+++ b/libexif/exif-tag.c
@@ -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. */