Fixed the internal MakerNote tag structs to use the correct enum type.

Patch by Google.

diff --git a/libexif/fuji/mnote-fuji-entry.c b/libexif/fuji/mnote-fuji-entry.c
index 0ca1634..0dbea49 100644 (file)
--- a/libexif/fuji/mnote-fuji-entry.c
+++ b/libexif/fuji/mnote-fuji-entry.c
@@ -51,7 +51,7 @@
 }
 
 static const struct {
-       ExifTag tag;
+       MnoteFujiTag tag;
        struct {
                int index;
                const char *string;

diff --git a/libexif/olympus/mnote-olympus-entry.c b/libexif/olympus/mnote-olympus-entry.c
index 96c919d..4b45632 100644 (file)
--- a/libexif/olympus/mnote-olympus-entry.c
+++ b/libexif/olympus/mnote-olympus-entry.c
@@ -80,7 +80,7 @@
 #define R2D(n) ((n).denominator ? (double)(n).numerator/(n).denominator : 0.0)
 
 static const struct {
-       ExifTag tag;
+       MnoteOlympusTag tag;
        ExifFormat fmt;
        struct {
                int index;

diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c
index 7e97c2c..d03d159 100644 (file)
--- a/libexif/pentax/mnote-pentax-entry.c
+++ b/libexif/pentax/mnote-pentax-entry.c
@@ -66,7 +66,7 @@
 }
 
 static const struct {
-       ExifTag tag;
+       MnotePentaxTag tag;
        struct {
                int index;
                const char *string;
@@ -266,7 +266,7 @@ static const struct {
 
 /* Two-component values */
 static const struct {
-       ExifTag tag;
+       MnotePentaxTag tag;
        struct {
                int index1, index2;
                const char *string;