From 2ceb07cd6c04b94196a6b0d92658f16f114794e8 Mon Sep 17 00:00:00 2001 From: nkbj Date: Sat, 4 Oct 2014 05:53:40 +0000 Subject: [PATCH] Update various lists to match ExifTool version 9.72. --- src/canonmn.cpp | 5 ++++- src/nikonmn.cpp | 13 +++++++------ src/pentaxmn.cpp | 6 ++++++ src/sonymn.cpp | 9 ++++++++- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/canonmn.cpp b/src/canonmn.cpp index ebf748cb..517ec22f 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -264,6 +264,7 @@ namespace Exiv2 { { (long int)0x3690000, N_("PowerShot ELPH 135 / IXUS 145 / IXY 120") }, { (long int)0x3700000, N_("PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630") }, { (long int)0x3710000, N_("PowerShot ELPH 150 IS / IXUS 155 / IXY 140") }, + { (long int)0x3760000, N_("PowerShot SX520 HS") }, { (long int)0x3780000, N_("PowerShot G7 X") }, { (long int)0x4040000, N_("PowerShot G1") }, { (long int)0x6040000, N_("PowerShot S100 / Digital IXUS / IXY Digital") }, @@ -770,7 +771,8 @@ namespace Exiv2 { { 169, "Sigma 35mm f/1.4 DG HSM" }, // 7 { 170, "Canon EF 200mm f/2.8L II" }, { 171, "Canon EF 300mm f/4L" }, - { 172, "Canon EF 400mm f/5.6L" }, + { 172, "Canon EF 400mm f/5.6L" }, // 0 + { 172, "Sigma 150-600mm f/5-6.3 DG OS HSM | S" }, // 1 { 173, "Canon EF 180mm Macro f/3.5L" }, // 0 { 173, "Sigma 180mm EX HSM Macro f/3.5" }, // 1 { 173, "Sigma APO Macro 150mm f/3.5 EX DG IF HSM" }, // 2 @@ -910,6 +912,7 @@ namespace Exiv2 { { 160, printCsLensByFocalLength }, { 161, printCsLensByFocalLength }, { 169, printCsLensByFocalLength }, + { 172, printCsLensByFocalLength }, // not tested { 173, printCsLensByFocalLength }, // works partly { 174, printCsLensByFocalLength }, // not tested { 180, printCsLensByFocalLength }, diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp index bf9e8f16..aecc90a6 100644 --- a/src/nikonmn.cpp +++ b/src/nikonmn.cpp @@ -847,12 +847,13 @@ namespace Exiv2 { //! PhaseDetectAF extern const TagDetails nikonPhaseDetectAF[] = { - { 0, N_("Off") }, - { 1, N_("On (51-point)") }, - { 2, N_("On (11-point)") }, - { 3, N_("On (39-point)") }, - { 4, N_("On (hybrid)") }, - { 5, N_("On (105-point)") } + { 0, N_("Off") }, + { 1, N_("On (51-point)") }, + { 2, N_("On (11-point)") }, + { 3, N_("On (39-point)") }, + { 4, N_("On (73-point)") }, + { 5, N_("On (73-point, new)") }, + { 6, N_("On (105-point)") } }; // Nikon3 Auto Focus Tag Info diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp index 70a7ce4f..95ef47a3 100644 --- a/src/pentaxmn.cpp +++ b/src/pentaxmn.cpp @@ -342,6 +342,12 @@ namespace Exiv2 { { 31, N_("32000") }, { 32, N_("40000") }, { 33, N_("51200") }, + { 34, N_("64000") }, + { 35, N_("80000") }, + { 36, N_("102400") }, + { 37, N_("128000") }, + { 38, N_("160000") }, + { 39, N_("204800") }, { 50, N_("50") }, { 100, N_("100") }, { 200, N_("200") }, diff --git a/src/sonymn.cpp b/src/sonymn.cpp index 87010213..0135b804 100644 --- a/src/sonymn.cpp +++ b/src/sonymn.cpp @@ -112,7 +112,14 @@ namespace Exiv2 { { 308, "DSC-RX100M2" }, { 309, "DSC-RX10" }, { 310, "DSC-RX1R" }, - { 311, "ILCE-7R" } + { 311, "ILCE-7R" }, + { 312, "ILCE-6000" }, + { 313, "ILCE-5000" }, + { 317, "DSC-RX100M3" }, + { 318, "ILCE-7S" }, + { 319, "ILCA-77M2" }, + { 339, "ILCE-5100" }, + { 346, "ILCE-QX1" } }; //! Lookup table to translate Sony dynamic range optimizer values to readable labels