Fixes

Signed-off-by: Larry Gritz <[email protected]>

Author: lgritz

src/include/OpenImageIO/tiffutils.h

@@ -136,6 +136,7 @@ enum TIFFTAG {
     EXIF_LENSMODEL                  = 42036,
     EXIF_LENSSERIALNUMBER           = 42037,
     EXIF_GAMMA                      = 42240,
+    // Exif 3.0 additions follow
     EXIF_IMAGETITLE                 = 42038,
     EXIF_PHOTOGRAPHER               = 42039,
     EXIF_IMAGEEDTOR                 = 42040,
@@ -144,8 +145,8 @@ enum TIFFTAG {
     EXIF_IMAGEEDITINGSOFTWARE       = 42043,
     EXIF_METADATAEDITINGSOFTWARE    = 42044,
     EXIF_COMPOSITEIMAGE             = 42080,
-    EXIF_SOURCEIMAGENUMBEROFCOMPOSITEIMAGE        = 42080,
-    EXIF_SOURCEIMAGEEXPOSURETIMESOFCOMPOSITEIMAGE = 42080,
+    EXIF_SOURCEIMAGENUMBEROFCOMPOSITEIMAGE        = 42081,
+    EXIF_SOURCEIMAGEEXPOSURETIMESOFCOMPOSITEIMAGE = 42082,
 };
 
 OIIO_NAMESPACE_END

src/libOpenImageIO/exif.cpp

@@ -524,6 +524,7 @@ static const TagInfo exif_tag_table[] = {
     { EXIF_LENSMODEL,  "Exif:LensModel",        TIFF_ASCII, 0 },
     { EXIF_LENSSERIALNUMBER,  "Exif:LensSerialNumber", TIFF_ASCII, 0 },
     { EXIF_GAMMA,  "Exif:Gamma", TIFF_RATIONAL, 0 },
+    // Exif 3.0 additions follow
     { EXIF_IMAGETITLE, "Exif:ImageTitle", TIFF_ASCII, 0 },
     { EXIF_PHOTOGRAPHER, "Exif:Photographer", TIFF_ASCII, 0 },
     { EXIF_IMAGEEDTOR, "Exif:ImageEdtor", TIFF_ASCII, 0 },