Rename resp. remove duplicate exif keys (#2434)

* rename resp. remove duplicate Exif keys Duplicate key names with different tag are renamed Following most of the existing entries, the key with higher tag number is renamed to ...2. Exceptions: Canon.CustomFunctions,Olympus.ImageHeight,Olympus.ImageWidth In the available images samples only the key with higher tag number is used, so changing the other has less impact on test data and also on users. Canon.WhiteBalanceTable with tag 0x00a4 was listed twice, once with description "SharpnessTable". The entry with the deviating description is deleted. * clang format * adjust test output files (after merge with Exiv2) * add Exif.NikonLd4.FocusDistance to EasyAccess API * clang format
Exiv2 · Dec 30, 2022 · 9ca161d · 9ca161d
1 parent 5bbd702
commit 9ca161d
Show file tree

Hide file tree

Showing 27 changed files with 383 additions and 57 deletions.
diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp
@@ -473,8 +473,8 @@ constexpr TagInfo CanonMakerNote::tagInfo_[] = {
      -1, printValue},
     {0x000e, "FileLength", N_("FileLength"), N_("FileLength"), IfdId::canonId, SectionId::makerTags, unsignedLong, -1,
      printValue},
-    {0x000f, "CustomFunctions", N_("Custom Functions"), N_("Custom Functions"), IfdId::canonId, SectionId::makerTags,
-     unsignedShort, -1, printValue},
+    {0x000f, "CustomFunctions2", N_("Custom Functions 2"), N_("Custom Functions 2"), IfdId::canonId,
+     SectionId::makerTags, unsignedShort, -1, printValue},
     {0x0010, "ModelID", N_("ModelID"), N_("Model ID"), IfdId::canonId, SectionId::makerTags, unsignedLong, -1,
      EXV_PRINT_TAG(canonModelId)},
     {0x0011, "MovieInfo", N_("MovieInfo"), N_("Movie info"), IfdId::canonId, SectionId::makerTags, unsignedShort, -1,
@@ -518,8 +518,6 @@ constexpr TagInfo CanonMakerNote::tagInfo_[] = {
      signedLong, -1, printValue},
     {0x0083, "OriginalDecisionDataOffset", N_("Original Decision Data Offset"), N_("Original decision data offset"),
      IfdId::canonId, SectionId::makerTags, signedLong, -1, printValue},
-    {0x00a4, "WhiteBalanceTable", N_("White Balance Table"), N_("White balance table"), IfdId::canonId,
-     SectionId::makerTags, unsignedShort, -1, printValue},
     // {0x0090, "CustomFunctions1D", N_("CustomFunctions1D"), N_("CustomFunctions1D"), IfdId::canonId,
     // SectionId::makerTags, unsignedShort, -1, printValue}, // ToDo {0x0091, "PersonalFunctions",
     // N_("PersonalFunctions"), N_("PersonalFunctions"), IfdId::canonId, SectionId::makerTags, unsignedShort, -1,
@@ -547,8 +545,8 @@ constexpr TagInfo CanonMakerNote::tagInfo_[] = {
      unsignedShort, -1, printValue},
     {0x00a3, "SharpnessFreqTable", N_("SharpnessFreqTable"), N_("SharpnessFreqTable"), IfdId::canonId,
      SectionId::makerTags, unsignedShort, -1, printValue},
-    {0x00a4, "WhiteBalanceTable", N_("SharpnessTable"), N_("SharpnessTable"), IfdId::canonId, SectionId::makerTags,
-     unsignedShort, -1, printValue},
+    {0x00a4, "WhiteBalanceTable", N_("White Balance Table"), N_("White balance table"), IfdId::canonId,
+     SectionId::makerTags, unsignedShort, -1, printValue},
     {0x00a9, "ColorBalance", N_("ColorBalance"), N_("ColorBalance"), IfdId::canonId, SectionId::makerTags,
      unsignedShort, -1, printValue},
     {0x00aa, "MeasuredColor", N_("Measured Color"), N_("Measured color"), IfdId::canonId, SectionId::makerTags,

diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp
@@ -365,8 +365,8 @@ ExifData::const_iterator subjectDistance(const ExifData& ed) {
       "Exif.Photo.SubjectDistance",      "Exif.Image.SubjectDistance",      "Exif.CanonSi.SubjectDistance",
       "Exif.CanonFi.FocusDistanceUpper", "Exif.CanonFi.FocusDistanceLower", "Exif.MinoltaCsNew.FocusDistance",
       "Exif.Nikon1.FocusDistance",       "Exif.Nikon3.FocusDistance",       "Exif.NikonLd2.FocusDistance",
-      "Exif.NikonLd3.FocusDistance",     "Exif.Olympus.FocusDistance",      "Exif.OlympusFi.FocusDistance",
-      "Exif.Casio.ObjectDistance",       "Exif.Casio2.ObjectDistance"};
+      "Exif.NikonLd3.FocusDistance",     "Exif.NikonLd4.FocusDistance",     "Exif.Olympus.FocusDistance",
+      "Exif.OlympusFi.FocusDistance",    "Exif.Casio.ObjectDistance",       "Exif.Casio2.ObjectDistance"};
   return findMetadatum(ed, keys, std::size(keys));
 }
 

diff --git a/src/minoltamn_int.cpp b/src/minoltamn_int.cpp
@@ -498,14 +498,14 @@ constexpr TagInfo MinoltaMakerNote::tagInfoCs7D_[] = {
     {0x0048, "ExposureTime", N_("Exposure Time"), N_("Exposure time"), IfdId::minoltaCs7DId, SectionId::makerTags,
      unsignedShort, 1, printValue},
     // 0x004A is a duplicate than 0x002D.
-    {0x004A, "FreeMemoryCardImages", N_("Free Memory Card Images"), N_("Free memory card images"), IfdId::minoltaCs7DId,
-     SectionId::makerTags, unsignedShort, 1, printValue},
+    {0x004A, "FreeMemoryCardImages2", N_("Free Memory Card Images 2"), N_("Free memory card images 2"),
+     IfdId::minoltaCs7DId, SectionId::makerTags, unsignedShort, 1, printValue},
     {0x005E, "ImageNumber", N_("Image Number"), N_("Image number"), IfdId::minoltaCs7DId, SectionId::makerTags,
      unsignedShort, 1, printValue},
     {0x0060, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), IfdId::minoltaCs7DId, SectionId::makerTags,
      unsignedShort, 1, printMinoltaSonyBoolValue},
     // 0x0062 is a duplicate than 0x005E.
-    {0x0062, "ImageNumber", N_("Image Number"), N_("Image number"), IfdId::minoltaCs7DId, SectionId::makerTags,
+    {0x0062, "ImageNumber2", N_("Image Number 2"), N_("Image number 2"), IfdId::minoltaCs7DId, SectionId::makerTags,
      unsignedShort, 1, printValue},
     {0x0071, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), IfdId::minoltaCs7DId,
      SectionId::makerTags, unsignedShort, 1, printMinoltaSonyBoolValue},
@@ -661,8 +661,8 @@ constexpr TagInfo MinoltaMakerNote::tagInfoCs5D_[] = {
      EXV_PRINT_TAG(minoltaRotation5D)},
     {0x0053, "ExposureCompensation", N_("Exposure Compensation"), N_("Exposure compensation"), IfdId::minoltaCs5DId,
      SectionId::makerTags, unsignedShort, -1, printMinoltaExposureCompensation5D},
-    {0x0054, "FreeMemoryCardImages", N_("Free Memory Card Images"), N_("Free memory card images"), IfdId::minoltaCs5DId,
-     SectionId::makerTags, unsignedShort, -1, printValue},
+    {0x0054, "FreeMemoryCardImages2", N_("Free Memory Card Images 2"), N_("Free memory card images 2"),
+     IfdId::minoltaCs5DId, SectionId::makerTags, unsignedShort, -1, printValue},
     {0x0065, "Rotation2", N_("Rotation2"), N_("Rotation2"), IfdId::minoltaCs5DId, SectionId::makerTags, unsignedShort,
      -1, printMinoltaSonyRotation},
     {0x006E, "Color Temperature", N_("Color Temperature"), N_("Color Temperature"), IfdId::minoltaCs5DId,
@@ -1003,9 +1003,9 @@ constexpr TagInfo MinoltaMakerNote::tagInfoCsA100_[] = {
      1, printMinoltaSonyRotation},
     {0x004B, "AELock", N_("AE Lock"), N_("AE lock"), IfdId::sony1MltCsA100Id, SectionId::makerTags, unsignedShort, 1,
      printMinoltaSonyBoolValue},
-    {0x005E, "ColorTemperature", N_("Color Temperature"), N_("Color temperature"), IfdId::sony1MltCsA100Id,
+    {0x005E, "ColorTemperature2", N_("Color Temperature 2"), N_("Color temperature 2"), IfdId::sony1MltCsA100Id,
      SectionId::makerTags, unsignedLong, 1, printValue},
-    {0x005F, "ColorCompensationFilter", N_("Color Compensation Filter"),
+    {0x005F, "ColorCompensationFilter2", N_("Color Compensation Filter 2"),
      N_("Color compensation filter: negative is green, positive is magenta"), IfdId::sony1MltCsA100Id,
      SectionId::makerTags, unsignedLong, 1, printValue},
     {0x0060, "BatteryLevel", N_("Battery Level"), N_("Battery level"), IfdId::sony1MltCsA100Id, SectionId::makerTags,

diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp
@@ -504,8 +504,8 @@ constexpr TagInfo Nikon3MakerNote::tagInfo_[] = {
      printValue},
     {0x00a9, "ImageOptimization", N_("Image Optimization"), N_("Image optimization"), IfdId::nikon3Id,
      SectionId::makerTags, asciiString, -1, printValue},
-    {0x00aa, "Saturation", N_("Saturation"), N_("Saturation"), IfdId::nikon3Id, SectionId::makerTags, asciiString, -1,
-     printValue},
+    {0x00aa, "Saturation2", N_("Saturation 2"), N_("Saturation 2"), IfdId::nikon3Id, SectionId::makerTags, asciiString,
+     -1, printValue},
     {0x00ab, "VariProgram", N_("Program Variation"), N_("Program variation"), IfdId::nikon3Id, SectionId::makerTags,
      asciiString, -1, printValue},
     {0x00ac, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), IfdId::nikon3Id,
@@ -1621,9 +1621,9 @@ constexpr TagInfo Nikon3MakerNote::tagInfoLd4_[] = {
      1, printApertureLd4},
     {56, "FNumber", N_("F-Number"), N_("F-Number"), IfdId::nikonLd4Id, SectionId::makerTags, unsignedShort, 1,
      printApertureLd4},
-    {60, "FocalLength", N_("Focal Length"), N_("Focal length"), IfdId::nikonLd4Id, SectionId::makerTags, unsignedShort,
-     1, printFocalLd4},
-    {79, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), IfdId::nikonLd4Id, SectionId::makerTags,
+    {60, "FocalLength2", N_("Focal Length 2"), N_("Focal length 2"), IfdId::nikonLd4Id, SectionId::makerTags,
+     unsignedShort, 1, printFocalLd4},
+    {79, "FocusDistance2", N_("Focus Distance 2"), N_("Focus distance 2"), IfdId::nikonLd4Id, SectionId::makerTags,
      unsignedByte, 1, printFocusDistance},
     // End of list marker
     {0xffff, "(UnknownNikonLd4Tag)", "(UnknownNikonLd4Tag)", N_("Unknown Nikon Lens Data 3 Tag"), IfdId::nikonLd4Id,

diff --git a/src/olympusmn_int.cpp b/src/olympusmn_int.cpp
@@ -130,9 +130,9 @@ constexpr TagInfo OlympusMakerNote::tagInfo_[] = {
      SectionId::makerTags, asciiString, -1, printValue},
     {0x0209, "CameraID", N_("Camera ID"), N_("Camera ID data"), IfdId::olympusId, SectionId::makerTags, asciiString, -1,
      print0x0209},
-    {0x020b, "ImageWidth", N_("Image Width"), N_("Image width"), IfdId::olympusId, SectionId::makerTags, unsignedShort,
-     -1, printValue},
-    {0x020c, "ImageHeight", N_("Image Height"), N_("Image height"), IfdId::olympusId, SectionId::makerTags,
+    {0x020b, "ImageWidth2", N_("Image Width 2"), N_("Image width 2"), IfdId::olympusId, SectionId::makerTags,
+     unsignedShort, -1, printValue},
+    {0x020c, "ImageHeight2", N_("Image Height 2"), N_("Image height 2"), IfdId::olympusId, SectionId::makerTags,
      unsignedShort, -1, printValue},
     {0x020d, "Software", N_("Software"), N_("Software"), IfdId::olympusId, SectionId::makerTags, asciiString, -1,
      printValue},
@@ -229,8 +229,8 @@ constexpr TagInfo OlympusMakerNote::tagInfo_[] = {
      SectionId::makerTags, unsignedShort, -1, printValue},
     {0x1029, "Contrast", N_("Contrast"), N_("Contrast setting"), IfdId::olympusId, SectionId::makerTags, unsignedShort,
      -1, EXV_PRINT_TAG(olympusContrast)},
-    {0x102a, "SharpnessFactor", N_("Sharpness Factor"), N_("Sharpness factor"), IfdId::olympusId, SectionId::makerTags,
-     unsignedShort, -1, printValue},
+    {0x102a, "SharpnessFactor2", N_("Sharpness Factor 2"), N_("Sharpness factor 2"), IfdId::olympusId,
+     SectionId::makerTags, unsignedShort, -1, printValue},
     {0x102b, "ColorControl", N_("Color Control"), N_("Color control"), IfdId::olympusId, SectionId::makerTags,
      unsignedShort, -1, printValue},
     {0x102c, "ValidBits", N_("ValidBits"), N_("Valid bits"), IfdId::olympusId, SectionId::makerTags, unsignedShort, -1,

diff --git a/src/panasonicmn_int.cpp b/src/panasonicmn_int.cpp
@@ -325,8 +325,8 @@ constexpr TagInfo PanasonicMakerNote::tagInfo_[] = {
      unsignedShort, -1, EXV_PRINT_TAG(panasonicConversionLens)},
     {0x0036, "TravelDay", N_("Travel Day"), N_("Travel day"), IfdId::panasonicId, SectionId::makerTags, unsignedShort,
      -1, print0x0036},
-    {0x0039, "Contrast", N_("Contrast"), N_("Contrast"), IfdId::panasonicId, SectionId::makerTags, unsignedShort, -1,
-     printValue},
+    {0x0039, "Contrast2", N_("Contrast 2"), N_("Contrast 2"), IfdId::panasonicId, SectionId::makerTags, unsignedShort,
+     -1, printValue},
     {0x003a, "WorldTimeLocation", N_("World Time Location"), N_("World time location"), IfdId::panasonicId,
      SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicWorldTimeLocation)},
     {0x003b, "TextStamp1", N_("Text Stamp 1"), N_("Text Stamp 1"), IfdId::panasonicId, SectionId::makerTags,

diff --git a/src/sonymn_int.cpp b/src/sonymn_int.cpp
@@ -2213,7 +2213,7 @@ constexpr TagInfo SonyMakerNote::tagInfo2010e_[] = {
      printValue},
     {4444, "ReleaseMode3", N_("ReleaseMode3"), N_("ReleaseMode3"), IfdId::sony2010eId, SectionId::makerTags,
      unsignedByte, 1, printValue},
-    {4448, "ReleaseMode2", N_("ReleaseMode2"), N_("ReleaseMode2"), IfdId::sony2010eId, SectionId::makerTags,
+    {4448, "ReleaseMode4", N_("ReleaseMode4"), N_("ReleaseMode4"), IfdId::sony2010eId, SectionId::makerTags,
      unsignedByte, 1, printValue},
     {4456, "SelfTimer", N_("SelfTimer"), N_("SelfTimer"), IfdId::sony2010eId, SectionId::makerTags, unsignedByte, 1,
      printValue},
@@ -2223,7 +2223,7 @@ constexpr TagInfo SonyMakerNote::tagInfo2010e_[] = {
      SectionId::makerTags, unsignedShort, 1, printValue},
     {4468, "BrightnessValue", N_("BrightnessValue"), N_("BrightnessValue"), IfdId::sony2010eId, SectionId::makerTags,
      unsignedShort, 1, printValue},
-    {4472, "DynamicRangeOptimizer", N_("DynamicRangeOptimizer"), N_("DynamicRangeOptimizer"), IfdId::sony2010eId,
+    {4472, "DynamicRangeOptimizer2", N_("DynamicRangeOptimizer 2"), N_("DynamicRangeOptimizer 2"), IfdId::sony2010eId,
      SectionId::makerTags, unsignedByte, 1, printValue},
     {4476, "HDRSetting", N_("HDRSetting"), N_("HDRSetting"), IfdId::sony2010eId, SectionId::makerTags, unsignedByte, 1,
      printValue},

diff --git a/test/data/KonicaMinoltaMAXXUM7D.exv b/test/data/KonicaMinoltaMAXXUM7D.exv
diff --git a/test/data/Olympus_u10D.exv b/test/data/Olympus_u10D.exv
diff --git a/test/data/PanasonicDMC-ZS7.exv b/test/data/PanasonicDMC-ZS7.exv
diff --git a/test/data/test_reference_files/CH0_0174.exv.out b/test/data/test_reference_files/CH0_0174.exv.out
@@ -115,8 +115,8 @@ Exif.NikonLd4.EffectiveMaxAperture           Byte        1  36  F2.8
 Exif.NikonLd4.LensID                         Short       1  0  0
 Exif.NikonLd4.MaxAperture                    Short       1  0  F0.5
 Exif.NikonLd4.FNumber                        Short       1  0  F0.5
-Exif.NikonLd4.FocalLength                    Short       1  0  0 mm
-Exif.NikonLd4.FocusDistance                  Byte        1  0  0.01 m
+Exif.NikonLd4.FocalLength2                   Short       1  0  0 mm
+Exif.NikonLd4.FocusDistance2                 Byte        1  0  0.01 m
 Exif.Nikon3.RawImageCenter                   Short       2  2274 1515  2274 1515
 Exif.Nikon3.RetouchHistory                   Short      10  0 0 0 0 0 0 0 0 0 0  None
 Exif.Nikon3.ShutterCount                     Long        1  174  174

diff --git a/test/data/test_reference_files/KonicaMinoltaDYNAX5D.exv.out b/test/data/test_reference_files/KonicaMinoltaDYNAX5D.exv.out
@@ -68,7 +68,7 @@ Exif.MinoltaCs5D.FocusMode                   Short       1  0  Auto focus
 Exif.MinoltaCs5D.ColorTemperature            SShort      1  0  0
 Exif.MinoltaCs5D.Rotation                    Short       1  72  Horizontal (normal)
 Exif.MinoltaCs5D.ExposureCompensation        Short       1  300  0.00
-Exif.MinoltaCs5D.FreeMemoryCardImages        Short       1  77  77
+Exif.MinoltaCs5D.FreeMemoryCardImages2       Short       1  77  77
 Exif.MinoltaCs5D.Rotation2                   Short       1  0  Horizontal (normal)
 Exif.MinoltaCs5D.Color Temperature           Short       1  55  55
 Exif.MinoltaCs5D.PictureFinish               Short       1  0  Natural

diff --git a/test/data/test_reference_files/KonicaMinoltaMAXXUM7D.exv.out b/test/data/test_reference_files/KonicaMinoltaMAXXUM7D.exv.out
diff --git a/test/data/test_reference_files/Olympus_u10D.exv.out b/test/data/test_reference_files/Olympus_u10D.exv.out
diff --git a/test/data/test_reference_files/PanasonicDMC-ZS7.exv.out b/test/data/test_reference_files/PanasonicDMC-ZS7.exv.out
diff --git a/test/data/test_reference_files/SonyDSLR-A100.exv.out b/test/data/test_reference_files/SonyDSLR-A100.exv.out
@@ -143,8 +143,8 @@ Exif.Sony1MltCsA100.ImageStabilization       Short       1  1  On
 Exif.Sony1MltCsA100.FocusModeSwitch          Short       1  0  AM
 Exif.Sony1MltCsA100.FlashType                Short       1  0  Off
 Exif.Sony1MltCsA100.Rotation                 Short       1  0  Horizontal (normal)
-Exif.Sony1MltCsA100.ColorTemperature         Short       1  55  55
-Exif.Sony1MltCsA100.ColorCompensationFilter  SShort      1  0  0
+Exif.Sony1MltCsA100.ColorTemperature2        Short       1  55  55
+Exif.Sony1MltCsA100.ColorCompensationFilter2 SShort      1  0  0
 Exif.Sony1MltCsA100.BatteryLevel             Short       1  6  Sufficient Power Remaining
 Exif.SonyMinolta.WhiteBalance                Long        1  0  Auto
 Exif.Sony1.ColorMode                         Long        1  0  Standard

diff --git a/test/data/test_reference_files/exifdata-test.out b/test/data/test_reference_files/exifdata-test.out
@@ -817,7 +817,7 @@ Exif.NikonFl1.FlashGroupAControlMode          0x000f Makernote    Byte        1
 Exif.NikonFl1.FlashGroupBControlMode          0x0010 Makernote    Byte        1 0
 Exif.NikonFl1.0x0011                          0x0011 Makernote    Byte        3 0 0 0
 Exif.Nikon3.ImageOptimization                 0x00a9 Makernote    Ascii      16 NORMAL         
-Exif.Nikon3.Saturation                        0x00aa Makernote    Ascii      16 NORMAL         
+Exif.Nikon3.Saturation2                       0x00aa Makernote    Ascii      16 NORMAL         
 Exif.Nikon3.VariProgram                       0x00ab Makernote    Ascii      16                
 Exif.Photo.UserComment                        0x9286 Exif         Undefined  44 charset=Ascii                                     
 Exif.Photo.SubSecTime                         0x9290 Exif         Ascii       3 00
@@ -988,7 +988,7 @@ Exif.NikonFl1.FlashGroupAControlMode          0x000f Makernote    Byte        1
 Exif.NikonFl1.FlashGroupBControlMode          0x0010 Makernote    Byte        1 0
 Exif.NikonFl1.0x0011                          0x0011 Makernote    Byte        3 0 0 0
 Exif.Nikon3.ImageOptimization                 0x00a9 Makernote    Ascii      16 NORMAL         
-Exif.Nikon3.Saturation                        0x00aa Makernote    Ascii      16 NORMAL         
+Exif.Nikon3.Saturation2                       0x00aa Makernote    Ascii      16 NORMAL         
 Exif.Nikon3.VariProgram                       0x00ab Makernote    Ascii      16                
 Exif.Photo.UserComment                        0x9286 Exif         Undefined  44 charset=Ascii                                     
 Exif.Photo.SubSecTime                         0x9290 Exif         Ascii       3 00
@@ -1160,7 +1160,7 @@ Exif.NikonFl1.FlashGroupAControlMode          0x000f Makernote    Byte        1
 Exif.NikonFl1.FlashGroupBControlMode          0x0010 Makernote    Byte        1 0
 Exif.NikonFl1.0x0011                          0x0011 Makernote    Byte        3 0 0 0
 Exif.Nikon3.ImageOptimization                 0x00a9 Makernote    Ascii      16 NORMAL         
-Exif.Nikon3.Saturation                        0x00aa Makernote    Ascii      16 NORMAL         
+Exif.Nikon3.Saturation2                       0x00aa Makernote    Ascii      16 NORMAL         
 Exif.Nikon3.VariProgram                       0x00ab Makernote    Ascii      16                
 Exif.Photo.UserComment                        0x9286 Exif         Undefined  44 charset=Ascii                                     
 Exif.Photo.SubSecTime                         0x9290 Exif         Ascii       3 00
@@ -1332,7 +1332,7 @@ Exif.NikonFl1.FlashGroupAControlMode          0x000f Makernote    Byte        1
 Exif.NikonFl1.FlashGroupBControlMode          0x0010 Makernote    Byte        1 0
 Exif.NikonFl1.0x0011                          0x0011 Makernote    Byte        3 0 0 0
 Exif.Nikon3.ImageOptimization                 0x00a9 Makernote    Ascii      16 NORMAL         
-Exif.Nikon3.Saturation                        0x00aa Makernote    Ascii      16 NORMAL         
+Exif.Nikon3.Saturation2                       0x00aa Makernote    Ascii      16 NORMAL         
 Exif.Nikon3.VariProgram                       0x00ab Makernote    Ascii      16                
 Exif.Photo.UserComment                        0x9286 Exif         Undefined  44 charset=Ascii                                     
 Exif.Photo.SubSecTime                         0x9290 Exif         Ascii       3 00

diff --git a/test/data/test_reference_files/exiv2-SonySLT-A58.exv.out b/test/data/test_reference_files/exiv2-SonySLT-A58.exv.out
@@ -104,12 +104,12 @@ Exif.Sony2010e.SonyDateTime                  Undefined   1  221  221
 Exif.Sony2010e.DynamicRangeOptimizer         Byte        1  0  0
 Exif.Sony2010e.MeterInfo                     Undefined   1  12  12
 Exif.Sony2010e.ReleaseMode3                  Byte        1  0  0
-Exif.Sony2010e.ReleaseMode2                  Byte        1  0  0
+Exif.Sony2010e.ReleaseMode4                  Byte        1  0  0
 Exif.Sony2010e.SelfTimer                     Byte        1  2  2
 Exif.Sony2010e.FlashMode                     Byte        1  1  1
 Exif.Sony2010e.StopsAboveBaseISO             Short       1  4096  4096
 Exif.Sony2010e.BrightnessValue               Short       1  15806  15806
-Exif.Sony2010e.DynamicRangeOptimizer         Byte        1  0  0
+Exif.Sony2010e.DynamicRangeOptimizer2        Byte        1  0  0
 Exif.Sony2010e.HDRSetting                    Byte        1  0  0
 Exif.Sony2010e.ExposureCompensation          SShort      1  0  0
 Exif.Sony2010e.PictureProfile                Byte        1  0  0

diff --git a/test/data/test_reference_files/exiv2-bug922.png.out b/test/data/test_reference_files/exiv2-bug922.png.out
@@ -73,7 +73,7 @@ Exif.Nikon3.SerialNO                         Ascii      21
 Exif.Nikon3.ShutterCount                     Long        1  5670  5670
 Exif.Nikon3.FlashInfo                        Undefined  20  0 0 0 1 0 0 0 8 0 0 97 126 78 73 75 79 78 32 67 79  0 0 0 1 0 0 0 8 0 0 97 126 78 73 75 79 78 32 67 79
 Exif.Nikon3.ImageOptimization                Ascii      16  RPORATION  RPORATION
-Exif.Nikon3.Saturation                       Ascii      16  D70  D70
+Exif.Nikon3.Saturation2                      Ascii      16  D70  D70
 Exif.Nikon3.VariProgram                      Ascii      16    
 Exif.Photo.PixelXDimension                   SLong       1  320  320
 Exif.Photo.PixelYDimension                   SLong       1  211  211