third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update makernote model ID tags (#2389)

Browse Source 
* Update `Exif.Sony(1|2).SonyModelID` values

* Update `Exif.Pentax.ModelID` values

* Update `Exif.Canon.ModelID` values

* Purge duplicates in `Exif.Canon.ModelID`

* Correct text in `Exif.Canon.ModelID`
This commit is contained in:
Peter 2022-10-23 14:35:35 +01:00 committed by GitHub
parent 3897f17b1e
commit 9767e375af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/canonmn_int.cpp
View File

@ -275,11 +275,6 @@ constexpr TagDetails canonModelId[] = {{0x00000811, "EOS M6 Mark II"},
{0x4180000, "PowerShot G1 X Mark III"},
{0x6040000, "PowerShot S100 / Digital IXUS / IXY Digital"},
{0x801, "PowerShot SX740 HS"},
{0x804, "PowerShot G5 X Mark II"},
{0x805, "PowerShot SX70 HS"},
{0x808, "PowerShot G7 X Mark III"},
{0x811, "EOS M6 Mark II"},
{0x812, "EOS M200"},
{0x4007d673, "DC19/DC21/DC22"},
{0x4007d674, "XH A1"},
{0x4007d675, "HV10"},
@ -354,7 +349,7 @@ constexpr TagDetails canonModelId[] = {{0x00000811, "EOS M6 Mark II"},
{0x80000325, "EOS 70D"},
{0x80000326, "EOS Rebel T5i / 700D / Kiss X7i"},
{0x80000327, "EOS Rebel T5 / 1200D / Kiss X70 / Hi"},
{0x80000328, "EOS-1D X MARK II"},
{0x80000328, "EOS-1D X Mark II"},
{0x80000331, "EOS M"},
{0x80000350, "EOS 80D"},
{0x80000355, "EOS M2"},
@ -375,11 +370,15 @@ constexpr TagDetails canonModelId[] = {{0x00000811, "EOS M6 Mark II"},
{0x80000428, "EOS-1D X Mark III"},
{0x80000432, "EOS Rebel T7 / 2000D / 1500D / Kiss X90"},
{0x80000433, "EOS RP"},
{0x80000435, "EOS 850D / T8i / Kiss X10i"},
{0x80000435, "EOS 850D / EOS Rebel T8i / Kiss X10i"},
{0x80000436, "EOS SL3 / 250D / Kiss X10"},
{0x80000437, "EOS 90D"},
{0x80000450, "EOS R3"},
{0x80000453, "EOS R6"},
//{ (long int)tbd, "EOS Ra" },
{0x80000464, "EOS R7"},
{0x80000465, "EOS R10"},
{0x80000467, "PowerShot ZOOM"},
{0x80000468, "EOS M50 Mark II / Kiss M2"},
//{ (long int)tbd, "EOS M50 Mark II" },
{0x80000520, "EOS D2000C"},
{0x80000560, "EOS D6000C"}};

4
src/pentaxmn_int.cpp
View File

@ -158,8 +158,12 @@ constexpr TagDetails pentaxModel[] = {
{0x13092, "K-1"},
{0x1309c, "K-3 II"},
{0x131f0, "WG-M2"},
{0x1320e, "GR III"},
{0x13222, "K-70"},
{0x1322c, "KP"},
{0x13240, "K-1 Mark II"},
{0x13254, "K-3 Mark III"},
{0x13290, "WG-70"},
};
//! Quality, tag 0x0008

4
src/sonymn_int.cpp
View File

@ -428,7 +428,9 @@ constexpr TagDetails sonyModelId[] = {{0, N_("Multiple camera models")},
{385, "ILME-FX3"},
{386, "ILCE-7RM3A"},
{387, "ILCE-7RM4A"},
{388, "ILCE-7M4"}};
{388, "ILCE-7M4"},
{389, "ZV-1F"},
{391, "ILME-FX30"}};
//! Lookup table to translate Sony creative style (main group) values to readable labels
constexpr StringTagDetails sonyCreativeStyleStd[] = {{"AdobeRGB", N_("Adobe RGB")},