diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index 4cc57c8c..cd80bd01 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -2324,7 +2324,7 @@ namespace Exiv2 { {0x000f, "FlashBias", N_("Flash Bias"), N_("Flash bias"), canonSiId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(canonSiFlashBias)}, {0x0010, "AutoExposureBracketing", N_("Auto Exposure Bracketing"), N_("Auto exposure bracketing"), canonSiId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(autoExposureBracketing)}, {0x0011, "AEBBracketValue", "AEB Bracket Value", N_("AEB Bracket Value"), canonSiId, makerTags, unsignedShort, 1, printValue}, - {0x0012, "0x0012", "0x0012", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue}, + {0x0012, "ControlMode", "Control Mode", N_("Control Mode"), canonSiId, makerTags, unsignedShort, 1, printValue}, {0x0013, "SubjectDistance", N_("Subject Distance"), N_("Subject distance"), canonSiId, makerTags, unsignedShort, 1, printSi0x0013}, {0x0014, "0x0014", "0x0014", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue}, {0x0015, "ApertureValue", N_("Aperture Value"), N_("Aperture"), canonSiId, makerTags, unsignedShort, 1, printSi0x0015}, diff --git a/test/data/test_reference_files/crw-test.out b/test/data/test_reference_files/crw-test.out index cdbe20b0..0b74c059 100644 --- a/test/data/test_reference_files/crw-test.out +++ b/test/data/test_reference_files/crw-test.out @@ -29,6 +29,8 @@ Exif.CanonSi.FlashGuideNumber Short 1 0 Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used Exif.CanonSi.FlashBias Short 1 0 EV Exif.CanonSi.AutoExposureBracketing Short 1 Off +Exif.CanonSi.AEBBracketValue Short 1 0 +Exif.CanonSi.ControlMode Short 1 1 Exif.CanonSi.SubjectDistance Short 1 8.92 m Exif.CanonSi.ApertureValue Short 1 F2.9 Exif.CanonSi.ShutterSpeedValue Short 1 1/15 s @@ -109,6 +111,8 @@ Exif.CanonSi.FlashGuideNumber Short 1 0 Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used Exif.CanonSi.FlashBias Short 1 0 EV Exif.CanonSi.AutoExposureBracketing Short 1 Off +Exif.CanonSi.AEBBracketValue Short 1 0 +Exif.CanonSi.ControlMode Short 1 1 Exif.CanonSi.SubjectDistance Short 1 8.92 m Exif.CanonSi.ApertureValue Short 1 F2.9 Exif.CanonSi.ShutterSpeedValue Short 1 1/15 s @@ -148,6 +152,8 @@ Exif.CanonSi.FlashGuideNumber Short 1 0 Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used Exif.CanonSi.FlashBias Short 1 0 EV Exif.CanonSi.AutoExposureBracketing Short 1 Off +Exif.CanonSi.AEBBracketValue Short 1 0 +Exif.CanonSi.ControlMode Short 1 1 Exif.CanonSi.SubjectDistance Short 1 8.92 m Exif.CanonSi.ApertureValue Short 1 F2.9 Exif.CanonSi.ShutterSpeedValue Short 1 1/15 s @@ -219,6 +225,8 @@ Exif.CanonSi.FlashGuideNumber Short 1 0 Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used Exif.CanonSi.FlashBias Short 1 0 EV Exif.CanonSi.AutoExposureBracketing Short 1 Off +Exif.CanonSi.AEBBracketValue Short 1 0 +Exif.CanonSi.ControlMode Short 1 1 Exif.CanonSi.SubjectDistance Short 1 8.92 m Exif.CanonSi.ApertureValue Short 1 F2.9 Exif.CanonSi.ShutterSpeedValue Short 1 1/15 s diff --git a/test/data/test_reference_files/exiv2-test.out b/test/data/test_reference_files/exiv2-test.out index 4bbf0d9c..9853b6fa 100644 --- a/test/data/test_reference_files/exiv2-test.out +++ b/test/data/test_reference_files/exiv2-test.out @@ -739,8 +739,8 @@ File 2/16: 20031214_000043.jpg 20031214_000043.jpg Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used 20031214_000043.jpg Exif.CanonSi.FlashBias Short 1 0 EV 20031214_000043.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -20031214_000043.jpg Exif.CanonSi.0x0011 Short 1 0 -20031214_000043.jpg Exif.CanonSi.0x0012 Short 1 1 +20031214_000043.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +20031214_000043.jpg Exif.CanonSi.ControlMode Short 1 1 20031214_000043.jpg Exif.CanonSi.SubjectDistance Short 1 7.82 m 20031214_000043.jpg Exif.CanonSi.0x0014 Short 1 0 20031214_000043.jpg Exif.CanonSi.ApertureValue Short 1 F5 @@ -1163,8 +1163,8 @@ File 6/16: 20030925_201850.jpg 20030925_201850.jpg Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used 20030925_201850.jpg Exif.CanonSi.FlashBias Short 1 0 EV 20030925_201850.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -20030925_201850.jpg Exif.CanonSi.0x0011 Short 1 0 -20030925_201850.jpg Exif.CanonSi.0x0012 Short 1 1 +20030925_201850.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +20030925_201850.jpg Exif.CanonSi.ControlMode Short 1 1 20030925_201850.jpg Exif.CanonSi.SubjectDistance Short 1 Infinite 20030925_201850.jpg Exif.CanonSi.0x0014 Short 1 546 20030925_201850.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 @@ -1756,8 +1756,8 @@ Warning: Directory Canon has an unexpected next pointer; ignored. 20060802_095200.jpg Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used 20060802_095200.jpg Exif.CanonSi.FlashBias Short 1 0 EV 20060802_095200.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -20060802_095200.jpg Exif.CanonSi.0x0011 Short 1 0 -20060802_095200.jpg Exif.CanonSi.0x0012 Short 1 1 +20060802_095200.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +20060802_095200.jpg Exif.CanonSi.ControlMode Short 1 1 20060802_095200.jpg Exif.CanonSi.SubjectDistance Short 1 0 m 20060802_095200.jpg Exif.CanonSi.0x0014 Short 1 0 20060802_095200.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 @@ -1964,8 +1964,8 @@ File 14/16: 20001004_015404.jpg 20001004_015404.jpg Exif.CanonSi.AFPointUsed Short 1 3 focus points; none used 20001004_015404.jpg Exif.CanonSi.FlashBias Short 1 0 EV 20001004_015404.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -20001004_015404.jpg Exif.CanonSi.0x0011 Short 1 0 -20001004_015404.jpg Exif.CanonSi.0x0012 Short 1 1 +20001004_015404.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +20001004_015404.jpg Exif.CanonSi.ControlMode Short 1 1 20001004_015404.jpg Exif.CanonSi.SubjectDistance Short 1 0 m 20001004_015404.jpg Exif.CanonSi.0x0014 Short 1 0 20001004_015404.jpg Exif.CanonSi.ApertureValue Short 1 F4 @@ -2107,8 +2107,8 @@ File 15/16: 20060127_225027.jpg 20060127_225027.jpg Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used 20060127_225027.jpg Exif.CanonSi.FlashBias Short 1 0 EV 20060127_225027.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -20060127_225027.jpg Exif.CanonSi.0x0011 Short 1 0 -20060127_225027.jpg Exif.CanonSi.0x0012 Short 1 1 +20060127_225027.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +20060127_225027.jpg Exif.CanonSi.ControlMode Short 1 1 20060127_225027.jpg Exif.CanonSi.SubjectDistance Short 1 65.53 m 20060127_225027.jpg Exif.CanonSi.0x0014 Short 1 0 20060127_225027.jpg Exif.CanonSi.ApertureValue Short 1 F4 @@ -2380,8 +2380,8 @@ Compare image data and extracted data ------------------------------------ < 20031214_000043.jpg Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used < 20031214_000043.jpg Exif.CanonSi.FlashBias Short 1 0 EV < 20031214_000043.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -< 20031214_000043.jpg Exif.CanonSi.0x0011 Short 1 0 -< 20031214_000043.jpg Exif.CanonSi.0x0012 Short 1 1 +< 20031214_000043.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +< 20031214_000043.jpg Exif.CanonSi.ControlMode Short 1 1 < 20031214_000043.jpg Exif.CanonSi.SubjectDistance Short 1 7.82 m < 20031214_000043.jpg Exif.CanonSi.0x0014 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.ApertureValue Short 1 F5 @@ -2804,8 +2804,8 @@ Compare image data and extracted data ------------------------------------ < 20030925_201850.jpg Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used < 20030925_201850.jpg Exif.CanonSi.FlashBias Short 1 0 EV < 20030925_201850.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -< 20030925_201850.jpg Exif.CanonSi.0x0011 Short 1 0 -< 20030925_201850.jpg Exif.CanonSi.0x0012 Short 1 1 +< 20030925_201850.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +< 20030925_201850.jpg Exif.CanonSi.ControlMode Short 1 1 < 20030925_201850.jpg Exif.CanonSi.SubjectDistance Short 1 Infinite < 20030925_201850.jpg Exif.CanonSi.0x0014 Short 1 546 < 20030925_201850.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 @@ -3396,8 +3396,8 @@ Compare image data and extracted data ------------------------------------ < 20060802_095200.jpg Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used < 20060802_095200.jpg Exif.CanonSi.FlashBias Short 1 0 EV < 20060802_095200.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -< 20060802_095200.jpg Exif.CanonSi.0x0011 Short 1 0 -< 20060802_095200.jpg Exif.CanonSi.0x0012 Short 1 1 +< 20060802_095200.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +< 20060802_095200.jpg Exif.CanonSi.ControlMode Short 1 1 < 20060802_095200.jpg Exif.CanonSi.SubjectDistance Short 1 0 m < 20060802_095200.jpg Exif.CanonSi.0x0014 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 @@ -3604,8 +3604,8 @@ Compare image data and extracted data ------------------------------------ < 20001004_015404.jpg Exif.CanonSi.AFPointUsed Short 1 3 focus points; none used < 20001004_015404.jpg Exif.CanonSi.FlashBias Short 1 0 EV < 20001004_015404.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -< 20001004_015404.jpg Exif.CanonSi.0x0011 Short 1 0 -< 20001004_015404.jpg Exif.CanonSi.0x0012 Short 1 1 +< 20001004_015404.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +< 20001004_015404.jpg Exif.CanonSi.ControlMode Short 1 1 < 20001004_015404.jpg Exif.CanonSi.SubjectDistance Short 1 0 m < 20001004_015404.jpg Exif.CanonSi.0x0014 Short 1 0 < 20001004_015404.jpg Exif.CanonSi.ApertureValue Short 1 F4 @@ -3747,8 +3747,8 @@ Compare image data and extracted data ------------------------------------ < 20060127_225027.jpg Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used < 20060127_225027.jpg Exif.CanonSi.FlashBias Short 1 0 EV < 20060127_225027.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -< 20060127_225027.jpg Exif.CanonSi.0x0011 Short 1 0 -< 20060127_225027.jpg Exif.CanonSi.0x0012 Short 1 1 +< 20060127_225027.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +< 20060127_225027.jpg Exif.CanonSi.ControlMode Short 1 1 < 20060127_225027.jpg Exif.CanonSi.SubjectDistance Short 1 65.53 m < 20060127_225027.jpg Exif.CanonSi.0x0014 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.ApertureValue Short 1 F4 @@ -3943,8 +3943,8 @@ Compare image data and extracted data ------------------------------------ > 20031214_000043.exv Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used > 20031214_000043.exv Exif.CanonSi.FlashBias Short 1 0 EV > 20031214_000043.exv Exif.CanonSi.AutoExposureBracketing Short 1 Off -> 20031214_000043.exv Exif.CanonSi.0x0011 Short 1 0 -> 20031214_000043.exv Exif.CanonSi.0x0012 Short 1 1 +> 20031214_000043.exv Exif.CanonSi.AEBBracketValue Short 1 0 +> 20031214_000043.exv Exif.CanonSi.ControlMode Short 1 1 > 20031214_000043.exv Exif.CanonSi.SubjectDistance Short 1 7.82 m > 20031214_000043.exv Exif.CanonSi.0x0014 Short 1 0 > 20031214_000043.exv Exif.CanonSi.ApertureValue Short 1 F5 @@ -4367,8 +4367,8 @@ Compare image data and extracted data ------------------------------------ > 20030925_201850.exv Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used > 20030925_201850.exv Exif.CanonSi.FlashBias Short 1 0 EV > 20030925_201850.exv Exif.CanonSi.AutoExposureBracketing Short 1 Off -> 20030925_201850.exv Exif.CanonSi.0x0011 Short 1 0 -> 20030925_201850.exv Exif.CanonSi.0x0012 Short 1 1 +> 20030925_201850.exv Exif.CanonSi.AEBBracketValue Short 1 0 +> 20030925_201850.exv Exif.CanonSi.ControlMode Short 1 1 > 20030925_201850.exv Exif.CanonSi.SubjectDistance Short 1 Infinite > 20030925_201850.exv Exif.CanonSi.0x0014 Short 1 546 > 20030925_201850.exv Exif.CanonSi.ApertureValue Short 1 F5.4 @@ -4959,8 +4959,8 @@ Compare image data and extracted data ------------------------------------ > 20060802_095200.exv Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used > 20060802_095200.exv Exif.CanonSi.FlashBias Short 1 0 EV > 20060802_095200.exv Exif.CanonSi.AutoExposureBracketing Short 1 Off -> 20060802_095200.exv Exif.CanonSi.0x0011 Short 1 0 -> 20060802_095200.exv Exif.CanonSi.0x0012 Short 1 1 +> 20060802_095200.exv Exif.CanonSi.AEBBracketValue Short 1 0 +> 20060802_095200.exv Exif.CanonSi.ControlMode Short 1 1 > 20060802_095200.exv Exif.CanonSi.SubjectDistance Short 1 0 m > 20060802_095200.exv Exif.CanonSi.0x0014 Short 1 0 > 20060802_095200.exv Exif.CanonSi.ApertureValue Short 1 F5.4 @@ -5167,8 +5167,8 @@ Compare image data and extracted data ------------------------------------ > 20001004_015404.exv Exif.CanonSi.AFPointUsed Short 1 3 focus points; none used > 20001004_015404.exv Exif.CanonSi.FlashBias Short 1 0 EV > 20001004_015404.exv Exif.CanonSi.AutoExposureBracketing Short 1 Off -> 20001004_015404.exv Exif.CanonSi.0x0011 Short 1 0 -> 20001004_015404.exv Exif.CanonSi.0x0012 Short 1 1 +> 20001004_015404.exv Exif.CanonSi.AEBBracketValue Short 1 0 +> 20001004_015404.exv Exif.CanonSi.ControlMode Short 1 1 > 20001004_015404.exv Exif.CanonSi.SubjectDistance Short 1 0 m > 20001004_015404.exv Exif.CanonSi.0x0014 Short 1 0 > 20001004_015404.exv Exif.CanonSi.ApertureValue Short 1 F4 @@ -5310,8 +5310,8 @@ Compare image data and extracted data ------------------------------------ > 20060127_225027.exv Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used > 20060127_225027.exv Exif.CanonSi.FlashBias Short 1 0 EV > 20060127_225027.exv Exif.CanonSi.AutoExposureBracketing Short 1 Off -> 20060127_225027.exv Exif.CanonSi.0x0011 Short 1 0 -> 20060127_225027.exv Exif.CanonSi.0x0012 Short 1 1 +> 20060127_225027.exv Exif.CanonSi.AEBBracketValue Short 1 0 +> 20060127_225027.exv Exif.CanonSi.ControlMode Short 1 1 > 20060127_225027.exv Exif.CanonSi.SubjectDistance Short 1 65.53 m > 20060127_225027.exv Exif.CanonSi.0x0014 Short 1 0 > 20060127_225027.exv Exif.CanonSi.ApertureValue Short 1 F4 @@ -5744,8 +5744,8 @@ Compare original and inserted image data --------------------------------- < 20031214_000043.jpg Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used < 20031214_000043.jpg Exif.CanonSi.FlashBias Short 1 0 EV < 20031214_000043.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -< 20031214_000043.jpg Exif.CanonSi.0x0011 Short 1 0 -< 20031214_000043.jpg Exif.CanonSi.0x0012 Short 1 1 +< 20031214_000043.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +< 20031214_000043.jpg Exif.CanonSi.ControlMode Short 1 1 < 20031214_000043.jpg Exif.CanonSi.SubjectDistance Short 1 7.82 m < 20031214_000043.jpg Exif.CanonSi.0x0014 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.ApertureValue Short 1 F5 @@ -6168,8 +6168,8 @@ Compare original and inserted image data --------------------------------- < 20030925_201850.jpg Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used < 20030925_201850.jpg Exif.CanonSi.FlashBias Short 1 0 EV < 20030925_201850.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -< 20030925_201850.jpg Exif.CanonSi.0x0011 Short 1 0 -< 20030925_201850.jpg Exif.CanonSi.0x0012 Short 1 1 +< 20030925_201850.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +< 20030925_201850.jpg Exif.CanonSi.ControlMode Short 1 1 < 20030925_201850.jpg Exif.CanonSi.SubjectDistance Short 1 Infinite < 20030925_201850.jpg Exif.CanonSi.0x0014 Short 1 546 < 20030925_201850.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 @@ -6760,8 +6760,8 @@ Compare original and inserted image data --------------------------------- < 20060802_095200.jpg Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used < 20060802_095200.jpg Exif.CanonSi.FlashBias Short 1 0 EV < 20060802_095200.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -< 20060802_095200.jpg Exif.CanonSi.0x0011 Short 1 0 -< 20060802_095200.jpg Exif.CanonSi.0x0012 Short 1 1 +< 20060802_095200.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +< 20060802_095200.jpg Exif.CanonSi.ControlMode Short 1 1 < 20060802_095200.jpg Exif.CanonSi.SubjectDistance Short 1 0 m < 20060802_095200.jpg Exif.CanonSi.0x0014 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 @@ -6968,8 +6968,8 @@ Compare original and inserted image data --------------------------------- < 20001004_015404.jpg Exif.CanonSi.AFPointUsed Short 1 3 focus points; none used < 20001004_015404.jpg Exif.CanonSi.FlashBias Short 1 0 EV < 20001004_015404.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -< 20001004_015404.jpg Exif.CanonSi.0x0011 Short 1 0 -< 20001004_015404.jpg Exif.CanonSi.0x0012 Short 1 1 +< 20001004_015404.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +< 20001004_015404.jpg Exif.CanonSi.ControlMode Short 1 1 < 20001004_015404.jpg Exif.CanonSi.SubjectDistance Short 1 0 m < 20001004_015404.jpg Exif.CanonSi.0x0014 Short 1 0 < 20001004_015404.jpg Exif.CanonSi.ApertureValue Short 1 F4 @@ -7111,8 +7111,8 @@ Compare original and inserted image data --------------------------------- < 20060127_225027.jpg Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used < 20060127_225027.jpg Exif.CanonSi.FlashBias Short 1 0 EV < 20060127_225027.jpg Exif.CanonSi.AutoExposureBracketing Short 1 Off -< 20060127_225027.jpg Exif.CanonSi.0x0011 Short 1 0 -< 20060127_225027.jpg Exif.CanonSi.0x0012 Short 1 1 +< 20060127_225027.jpg Exif.CanonSi.AEBBracketValue Short 1 0 +< 20060127_225027.jpg Exif.CanonSi.ControlMode Short 1 1 < 20060127_225027.jpg Exif.CanonSi.SubjectDistance Short 1 65.53 m < 20060127_225027.jpg Exif.CanonSi.0x0014 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.ApertureValue Short 1 F4 @@ -7307,8 +7307,8 @@ Compare original and inserted image data --------------------------------- > 20031214_000043.exv Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used > 20031214_000043.exv Exif.CanonSi.FlashBias Short 1 0 EV > 20031214_000043.exv Exif.CanonSi.AutoExposureBracketing Short 1 Off -> 20031214_000043.exv Exif.CanonSi.0x0011 Short 1 0 -> 20031214_000043.exv Exif.CanonSi.0x0012 Short 1 1 +> 20031214_000043.exv Exif.CanonSi.AEBBracketValue Short 1 0 +> 20031214_000043.exv Exif.CanonSi.ControlMode Short 1 1 > 20031214_000043.exv Exif.CanonSi.SubjectDistance Short 1 7.82 m > 20031214_000043.exv Exif.CanonSi.0x0014 Short 1 0 > 20031214_000043.exv Exif.CanonSi.ApertureValue Short 1 F5 @@ -7731,8 +7731,8 @@ Compare original and inserted image data --------------------------------- > 20030925_201850.exv Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used > 20030925_201850.exv Exif.CanonSi.FlashBias Short 1 0 EV > 20030925_201850.exv Exif.CanonSi.AutoExposureBracketing Short 1 Off -> 20030925_201850.exv Exif.CanonSi.0x0011 Short 1 0 -> 20030925_201850.exv Exif.CanonSi.0x0012 Short 1 1 +> 20030925_201850.exv Exif.CanonSi.AEBBracketValue Short 1 0 +> 20030925_201850.exv Exif.CanonSi.ControlMode Short 1 1 > 20030925_201850.exv Exif.CanonSi.SubjectDistance Short 1 Infinite > 20030925_201850.exv Exif.CanonSi.0x0014 Short 1 546 > 20030925_201850.exv Exif.CanonSi.ApertureValue Short 1 F5.4 @@ -8323,8 +8323,8 @@ Compare original and inserted image data --------------------------------- > 20060802_095200.exv Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used > 20060802_095200.exv Exif.CanonSi.FlashBias Short 1 0 EV > 20060802_095200.exv Exif.CanonSi.AutoExposureBracketing Short 1 Off -> 20060802_095200.exv Exif.CanonSi.0x0011 Short 1 0 -> 20060802_095200.exv Exif.CanonSi.0x0012 Short 1 1 +> 20060802_095200.exv Exif.CanonSi.AEBBracketValue Short 1 0 +> 20060802_095200.exv Exif.CanonSi.ControlMode Short 1 1 > 20060802_095200.exv Exif.CanonSi.SubjectDistance Short 1 0 m > 20060802_095200.exv Exif.CanonSi.0x0014 Short 1 0 > 20060802_095200.exv Exif.CanonSi.ApertureValue Short 1 F5.4 @@ -8531,8 +8531,8 @@ Compare original and inserted image data --------------------------------- > 20001004_015404.exv Exif.CanonSi.AFPointUsed Short 1 3 focus points; none used > 20001004_015404.exv Exif.CanonSi.FlashBias Short 1 0 EV > 20001004_015404.exv Exif.CanonSi.AutoExposureBracketing Short 1 Off -> 20001004_015404.exv Exif.CanonSi.0x0011 Short 1 0 -> 20001004_015404.exv Exif.CanonSi.0x0012 Short 1 1 +> 20001004_015404.exv Exif.CanonSi.AEBBracketValue Short 1 0 +> 20001004_015404.exv Exif.CanonSi.ControlMode Short 1 1 > 20001004_015404.exv Exif.CanonSi.SubjectDistance Short 1 0 m > 20001004_015404.exv Exif.CanonSi.0x0014 Short 1 0 > 20001004_015404.exv Exif.CanonSi.ApertureValue Short 1 F4 @@ -8674,8 +8674,8 @@ Compare original and inserted image data --------------------------------- > 20060127_225027.exv Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used > 20060127_225027.exv Exif.CanonSi.FlashBias Short 1 0 EV > 20060127_225027.exv Exif.CanonSi.AutoExposureBracketing Short 1 Off -> 20060127_225027.exv Exif.CanonSi.0x0011 Short 1 0 -> 20060127_225027.exv Exif.CanonSi.0x0012 Short 1 1 +> 20060127_225027.exv Exif.CanonSi.AEBBracketValue Short 1 0 +> 20060127_225027.exv Exif.CanonSi.ControlMode Short 1 1 > 20060127_225027.exv Exif.CanonSi.SubjectDistance Short 1 65.53 m > 20060127_225027.exv Exif.CanonSi.0x0014 Short 1 0 > 20060127_225027.exv Exif.CanonSi.ApertureValue Short 1 F4