xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restoring files which should in PR fix_1004_0.27 (they are unrelated to contrib/vs2019)

Browse Source
v0.27.3
clanmills 5 years ago
parent dc92e0fc05
commit 3bcc6c8156
7 changed files with 98 additions and 114 deletions
Show Stats Download Patch File Download Diff File

178
src/canonmn_int.cpp
Unescape Escape View File

@ -312,7 +312,6 @@ namespace Exiv2 {
{ (long int)0x805, "PowerShot SX70 HS" },
{ (long int)0x808, "PowerShot G7 X Mark III" },
{ (long int)0x811, "EOS M6 Mark II" },
{ (long int)0x812, "EOS M200" },
{ (long int)0x4007d673, "DC19/DC21/DC22" },
{ (long int)0x4007d674, "XH A1" },
{ (long int)0x4007d675, "HV10" },
@ -403,14 +402,11 @@ namespace Exiv2 {
{ (long int)0x80000408, "EOS 77D / 9000D" },
{ (long int)0x80000417, "EOS Rebel SL2 / 200D / Kiss X9" },
{ (long int)0x80000422, "EOS Rebel T100 / 4000D / 3000D" },
{ (long int)0x80000424, "EOS R" },
{ (long int)0x80000428, "EOS-1D X Mark III" },
{ (long int)0x80000424, "EOR R" },
{ (long int)0x80000432, "EOS Rebel T7 / 2000D / 1500D / Kiss X90" },
{ (long int)0x80000433, "EOS RP" },
{ (long int)0x80000436, "EOS SL3 / 250D / Kiss X10" },
{ (long int)0x80000437, "EOS 90D" },
{ (long int)0x80000520, "EOS D2000C" },
{ (long int)0x80000560, "EOS D6000C" }
{ (long int)0x80000437, "EOS 90D" }
};
//! SerialNumberFormat, tag 0x0015
@ -769,25 +765,25 @@ namespace Exiv2 {
extern const TagDetails canonCsLensType[] = {
{ -1, "n/a" },
{ 1, "Canon EF 50mm f/1.8" },
{ 2, "Canon EF 28mm f/2.8" },
{ 2, "Canon EF 28mm f/2.8 or Sigma Lens" },
{ 2, "Sigma 24mm f/2.8 Super Wide II" }, // 1
{ 3, "Canon EF 135mm f/2.8 Soft" },
{ 4, "Canon EF 35-105mm f/3.5-4.5" },
{ 4, "Canon EF 35-105mm f/3.5-4.5 or Sigma Lens" },
{ 4, "Sigma UC Zoom 35-135mm f/4-5.6" }, // 1
{ 5, "Canon EF 35-70mm f/3.5-4.5" },
{ 6, "Canon EF 28-70mm f/3.5-4.5" },
{ 6, "Canon EF 28-70mm f/3.5-4.5 or Sigma or Tokina Lens" },
{ 6, "Sigma 18-50mm f/3.5-5.6 DC" }, // 1
{ 6, "Sigma 18-125mm f/3.5-5.6 DC IF ASP" }, // 2
{ 6, "Tokina AF 193-2 19-35mm f/3.5-4.5" }, // 3
{ 6, "Sigma 28-80mm f/3.5-5.6 II Macro" }, // 4
{ 6, "Sigma 28-300mm f/3.5-6.3 DG Macro" }, // 5
{ 7, "Canon EF 100-300mm f/5.6L" },
{ 8, "Canon EF 100-300mm f/5.6" },
{ 8, "Canon EF 100-300mm f/5.6 or Sigma or Tokina Lens" },
{ 8, "Sigma 70-300mm f/4-5.6 [APO] DG Macro" }, // 1
{ 8, "Tokina AT-X 242 AF 24-200mm f/3.5-5.6" }, // 2
{ 9, "Canon EF 70-210mm f/4" },
{ 9, "Sigma 55-200mm f/4-5.6 DC" }, // 1
{ 10, "Canon EF 50mm f/2.5 Macro" },
{ 10, "Canon EF 50mm f/2.5 Macro or Sigma Lens" },
{ 10, "Sigma 50mm f/2.8 EX" }, // 1
{ 10, "Sigma 28mm f/1.8" }, // 2
{ 10, "Sigma 105mm f/2.8 Macro EX" }, // 3
@ -801,12 +797,12 @@ namespace Exiv2 {
{ 18, "Canon EF 28-70mm f/3.5-4.5" },
{ 20, "Canon EF 100-200mm f/4.5A" },
{ 21, "Canon EF 80-200mm f/2.8L" },
{ 22, "Canon EF 20-35mm f/2.8L" },
{ 22, "Canon EF 20-35mm f/2.8L or Tokina Lens" },
{ 22, "Tokina AT-X 280 AF Pro 28-80mm f/2.8 Aspherical" }, // 1
{ 23, "Canon EF 35-105mm f/3.5-4.5" },
{ 24, "Canon EF 35-80mm f/4-5.6 Power Zoom" },
{ 25, "Canon EF 35-80mm f/4-5.6 Power Zoom" },
{ 26, "Canon EF 100mm f/2.8 Macro" },
{ 26, "Canon EF 100mm f/2.8 Macro or Other Lens" },
{ 26, "Cosina 100mm f/3.5 Macro AF" }, // 1
{ 26, "Tamron SP AF 90mm f/2.8 Di Macro" }, // 2
{ 26, "Tamron SP AF 180mm f/3.5 Di Macro" }, // 3
@ -814,16 +810,16 @@ namespace Exiv2 {
{ 26, "Voigtlander APO Lanthar 125mm F2.5 SL Macro" }, // 5
{ 26, "Carl Zeiss Planar T 85mm f/1.4 ZE" }, // 6
{ 27, "Canon EF 35-80mm f/4-5.6" },
{ 28, "Canon EF 80-200mm f/4.5-5.6" },
{ 28, "Canon EF 80-200mm f/4.5-5.6 or Tamron Lens" },
{ 28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF" }, // 1
{ 28, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro" }, // 2
{ 28, "Tamron AF 70-300mm f/4-5.6 Di LD 1:2 Macro" }, // 3
{ 28, "Tamron AF Aspherical 28-200mm f/3.8-5.6" }, // 4
{ 29, "Canon EF 50mm f/1.8 II" },
{ 30, "Canon EF 35-105mm f/4.5-5.6" },
{ 31, "Canon EF 75-300mm f/4-5.6" },
{ 31, "Canon EF 75-300mm f/4-5.6 or Tamron Lens" },
{ 31, "Tamron SP AF 300mm f/2.8 LD IF" }, // 1
{ 32, "Canon EF 24mm f/2.8" },
{ 32, "Canon EF 24mm f/2.8 or Sigma Lens" },
{ 32, "Sigma 15mm f/2.8 EX Fisheye" }, // 1
{ 33, "Voigtlander or Carl Zeiss Lens" },
{ 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical" }, // 1
@ -842,22 +838,22 @@ namespace Exiv2 {
{ 33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE" }, // 14
{ 35, "Canon EF 35-80mm f/4-5.6" },
{ 36, "Canon EF 38-76mm f/4.5-5.6" },
{ 37, "Canon EF 35-80mm f/4-5.6" },
{ 37, "Canon EF 35-80mm f/4-5.6 or Tamron Lens" },
{ 37, "Tamron 70-200mm f/2.8 Di LD IF Macro" }, // 1
{ 37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro"}, // 2
{ 37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"}, // 2
{ 37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]" }, // 3
{ 37, "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro"}, // 4
{ 38, "Canon EF 80-200mm f/4.5-5.6" },
{ 39, "Canon EF 75-300mm f/4-5.6" },
{ 40, "Canon EF 28-80mm f/3.5-5.6" },
{ 41, "Canon EF 28-90mm f/4-5.6" },
{ 42, "Canon EF 28-200mm f/3.5-5.6" },
{ 42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro"}, // 1
{ 42, "Canon EF 28-200mm f/3.5-5.6 or Tamron Lens" },
{ 42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"}, // 1
{ 43, "Canon EF 28-105mm f/4-5.6" },
{ 44, "Canon EF 90-300mm f/4.5-5.6" },
{ 45, "Canon EF-S 18-55mm f/3.5-5.6 [II]" },
{ 46, "Canon EF 28-90mm f/4-5.6" },
{ 47, "Zeiss Milvus 35mm f/2" },
{ 47, "Zeiss Milvus 35mm f/2 or 50mm f/2" },
{ 47, "Zeiss Milvus 50mm f/2 Makro" }, // 1
{ 47, "Zeiss Milvus 135mm f/2 ZE" }, // 2
{ 48, "Canon EF-S 18-55mm f/3.5-5.6 IS" },
@ -873,23 +869,21 @@ namespace Exiv2 {
{ 82, "Canon TS-E 135mm f/4L Macro" },
{ 94, "Canon TS-E 17mm f/4L" },
{ 95, "Canon TS-E 24mm f/3.5L II" },
{ 103, "Samyang AF 14mm f/2.8 EF" },
{ 103, "Samyang AF 14mm f/2.8 EF or Rokinon Lens" },
{ 103, "Rokinon SP 14mm f/2.4" }, // 1
{ 103, "Rokinon AF 14mm f/2.8 EF" }, // 2
{ 106, "Rokinon SP / Samyang XP 35mm f/1.2" },
{ 112, "Sigma 28mm f/1.5 FF High-speed Prime" },
{ 112, "Sigma 28mm f/1.5 FF High-speed Prime or other Sigma Lens" },
{ 112, "Sigma 40mm f/1.5 FF High-speed Prime" }, // 1
{ 112, "Sigma 105mm f/1.5 FF High-speed Prime" }, // 2
{ 117, "Tamron 35-150mm f/2.8-4.0 Di VC OSD" },
{ 117, "Tamron SP 35mm f/1.4 Di USD" }, // 1
{ 124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo" },
{ 125, "Canon TS-E 24mm f/3.5L" },
{ 126, "Canon TS-E 45mm f/2.8" },
{ 127, "Canon TS-E 90mm f/2.8" },
{ 127, "Tamron 18-200mm f/3.5-6.3 Di II VC" }, // 1
{ 129, "Canon EF 300mm f/2.8L USM" },
{ 130, "Canon EF 50mm f/1.0L USM" },
{ 131, "Canon EF 28-80mm f/2.8-4L USM" },
{ 131, "Canon EF 28-80mm f/2.8-4L USM or Sigma Lens" },
{ 131, "Sigma 8mm f/3.5 EX DG Circular Fisheye" }, // 1
{ 131, "Sigma 17-35mm f/2.8-4 EX DG Aspherical HSM" }, // 2
{ 131, "Sigma 17-70mm f/2.8-4.5 DC Macro" }, // 3
@ -902,8 +896,8 @@ namespace Exiv2 {
{ 134, "Canon EF 600mm f/4L IS USM" },
{ 135, "Canon EF 200mm f/1.8L USM" },
{ 136, "Canon EF 300mm f/2.8L USM" },
{ 136, "Tamron SP 15-30mm f/2.8 Di VC USD" }, // 1
{ 137, "Canon EF 85mm f/1.2L USM" },
{ 136, "Tamron SP 15-30mm f/2.8 Di VC USD A012" }, // 1
{ 137, "Canon EF 85mm f/1.2L USM or Sigma or Tamron Lens" },
{ 137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM" }, // 1
{ 137, "Sigma 50-200mm f/4-5.6 DC OS HSM" }, // 2
{ 137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM" }, // 3
@ -926,49 +920,49 @@ namespace Exiv2 {
{ 140, "Canon EF 500mm f/4.5L USM" },
{ 141, "Canon EF 500mm f/4.5L USM" },
{ 142, "Canon EF 300mm f/2.8L IS USM" },
{ 143, "Canon EF 500mm f/4L IS USM" },
{ 143, "Canon EF 500mm f/4L IS USM or Sigma Lens" },
{ 143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM" }, // 1
{ 143, "Sigma 24-105mm F4 DG OS HSM | A" }, // 2
{ 143, "Sigma 24-105mm F4 DG OS HSM [Art 013]" }, // 2
{ 144, "Canon EF 35-135mm f/4-5.6 USM" },
{ 145, "Canon EF 100-300mm f/4.5-5.6 USM" },
{ 146, "Canon EF 70-210mm f/3.5-4.5 USM" },
{ 147, "Canon EF 35-135mm f/4-5.6 USM" },
{ 148, "Canon EF 28-80mm f/3.5-5.6 USM" },
{ 149, "Canon EF 100mm f/2 USM" },
{ 150, "Canon EF 14mm f/2.8L USM" },
{ 150, "Canon EF 14mm f/2.8L USM or Sigma Lens" },
{ 150, "Sigma 20mm EX f/1.8" }, // 1
{ 150, "Sigma 30mm f/1.4 DC HSM" }, // 2
{ 150, "Sigma 24mm f/1.8 DG Macro EX" }, // 3
{ 150, "Sigma 28mm f/1.8 DG Macro EX" }, // 4
{ 150, "Sigma 18-35mm f/1.8 DC HSM | A" }, // 5
{ 151, "Canon EF 200mm f/2.8L USM" },
{ 152, "Canon EF 300mm f/4L IS USM" },
{ 152, "Canon EF 300mm f/4L IS USM or Sigma Lens" },
{ 152, "Sigma 12-24mm f/4.5-5.6 EX DG ASPHERICAL HSM" }, // 1
{ 152, "Sigma 14mm f/2.8 EX Aspherical HSM" }, // 2
{ 152, "Sigma 10-20mm f/4-5.6" }, // 3
{ 152, "Sigma 100-300mm f/4" }, // 4
{ 152, "Sigma 300-800mm f/5.6 APO EX DG HSM" }, // 5
{ 153, "Canon EF 35-350mm f/3.5-5.6L USM" },
{ 153, "Canon EF 35-350mm f/3.5-5.6L USM or Sigma or Tamron Lens" },
{ 153, "Sigma 50-500mm f/4-6.3 APO HSM EX" }, // 1
{ 153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro" }, // 2
{ 153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro"}, // 3
{ 153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14"}, // 3
{ 153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro" }, // 4
{ 154, "Canon EF 20mm f/2.8 USM" },
{ 154, "Canon EF 20mm f/2.8 USM or Zeiss Lens" },
{ 154, "Zeiss Milvus 21mm f/2.8" }, // 1
{ 154, "Zeiss Milvus 15mm f/2.8 ZE" }, // 2
{ 154, "Zeiss Milvus 18mm f/2.8 ZE" }, // 3
{ 155, "Canon EF 85mm f/1.8 USM" },
{ 155, "Canon EF 85mm f/1.8 USM or Sigma Lens" },
{ 155, "Sigma 14mm f/1.8 DG HSM | A" }, // 1
{ 156, "Canon EF 28-105mm f/3.5-4.5 USM" },
{ 156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens" },
{ 156, "Tamron SP 70-300mm f/4-5.6 Di VC USD" }, // 1
{ 156, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF" }, // 2
{ 160, "Canon EF 20-35mm f/3.5-4.5 USM" },
{ 160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens" },
{ 160, "Tamron AF 19-35mm f/3.5-4.5" }, // 1
{ 160, "Tokina AT-X 124 AF Pro DX 12-24mm f/4" }, // 2
{ 160, "Tokina AT-X 107 AF DX 10-17mm f/3.5-4.5 Fisheye" }, // 3
{ 160, "Tokina AT-X 116 AF Pro DX 11-16mm f/2.8" }, // 4
{ 160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8" }, // 5
{ 161, "Canon EF 28-70mm f/2.8L USM" },
{ 161, "Canon EF 28-70mm f/2.8L USM or Other Lens" },
{ 161, "Sigma 24-70mm f/2.8 EX" }, // 1
{ 161, "Sigma 28-70mm f/2.8 EX" }, // 2
{ 161, "Sigma 24-60mm f/2.8 EX DG" }, // 3
@ -983,9 +977,9 @@ namespace Exiv2 {
{ 165, "Canon EF 70-200mm f/2.8L USM" },
{ 166, "Canon EF 70-200mm f/2.8L USM + 1.4x" },
{ 167, "Canon EF 70-200mm f/2.8L USM + 2x" },
{ 168, "Canon EF 28mm f/1.8 USM" },
{ 168, "Canon EF 28mm f/1.8 USM or Sigma Lens" },
{ 168, "Sigma 50-100mm f/1.8 DC HSM | A" }, // 1
{ 169, "Canon EF 17-35mm f/2.8L USM" },
{ 169, "Canon EF 17-35mm f/2.8L USM or Sigma Lens" },
{ 169, "Sigma 18-200mm f/3.5-6.3 DC OS" }, // 1
{ 169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical" }, // 2
{ 169, "Sigma 18-50mm f/2.8 Macro" }, // 3
@ -995,21 +989,20 @@ namespace Exiv2 {
{ 169, "Sigma 35mm f/1.4 DG HSM" }, // 7
{ 169, "Sigma 35mm f/1.5 FF High-Speed Prime | 017" }, // 8
{ 169, "Sigma 70mm f/2.8 Macro EX DG" }, // 9
{ 170, "Canon EF 200mm f/2.8L II USM" },
{ 170, "Canon EF 200mm f/2.8L II USM or Sigma Lens" },
{ 170, "Sigma 300mm f/2.8 APO EX DG HSM" }, // 1
{ 170, "Sigma 800mm f/5.6 APO EX DG HSM" }, // 2
{ 171, "Canon EF 300mm f/4L USM" },
{ 172, "Canon EF 400mm f/5.6L USM" },
{ 172, "Canon EF 400mm f/5.6L USM or Sigma Lens" },
{ 172, "Sigma 150-600mm f/5-6.3 DG OS HSM | S" }, // 1
{ 172, "Sigma 500mm f/4.5 APO EX DG HSM" }, // 2
{ 173, "Canon EF 180mm Macro f/3.5L USM" },
{ 173, "Canon EF 180mm Macro f/3.5L USM or Sigma Lens" },
{ 173, "Sigma 180mm EX HSM Macro f/3.5" }, // 1
{ 173, "Sigma APO Macro 150mm f/2.8 EX DG HSM" }, // 2
{ 173, "Sigma 10mm f/2.8 EX DC Fisheye" }, // 3
{ 173, "Sigma 15mm f/2.8 EX DG Diagonal Fisheye" }, // 4
{ 173, "Venus Laowa 100mm F2.8 2X Ultra Macro APO" }, // 5
{ 173, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x" }, // 6
{ 174, "Canon EF 135mm f/2L USM" },
{ 173, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x" }, // 2
{ 173, "Sigma APO Macro 150mm f/2.8 EX DG HSM" }, // 3
{ 173, "Sigma 10mm f/2.8 EX DC Fisheye" }, // 4
{ 173, "Sigma 15mm f/2.8 EX DG Diagonal Fisheye" }, // 5
{ 174, "Canon EF 135mm f/2L USM or Other Lens" },
{ 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM" }, // 1
{ 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM" }, // 2
{ 174, "Sigma 150-500mm f/5-6.3 APO DG OS HSM" }, // 3
@ -1024,7 +1017,7 @@ namespace Exiv2 {
{ 177, "Canon EF 300mm f/4L IS USM" },
{ 178, "Canon EF 28-135mm f/3.5-5.6 IS" },
{ 179, "Canon EF 24mm f/1.4L USM" },
{ 180, "Canon EF 35mm f/1.4L USM" },
{ 180, "Canon EF 35mm f/1.4L USM or Other Lens" },
{ 180, "Sigma 50mm f/1.4 DG HSM | A" }, // 1
{ 180, "Sigma 24mm f/1.4 DG HSM | A" }, // 2
{ 180, "Zeiss Milvus 50mm f/1.4" }, // 3
@ -1035,11 +1028,11 @@ namespace Exiv2 {
{ 180, "Sigma 85mm f/1.5 FF High-Speed Prime | 017" }, // 8
{ 180, "Tokina Opera 50mm f/1.4 FF" }, // 9
{ 180, "Sigma 20mm f/1.4 DG HSM | A" }, // 10
{ 181, "Canon EF 100-400mm f/4.5-5.6L IS USM + 1.4x" },
{ 181, "Canon EF 100-400mm f/4.5-5.6L IS USM + 1.4x or Sigma Lens" },
{ 181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x" }, // 1
{ 182, "Canon EF 100-400mm f/4.5-5.6L IS USM + 2x" },
{ 182, "Canon EF 100-400mm f/4.5-5.6L IS USM + 2x or Sigma Lens" },
{ 182, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 2x" }, // 1
{ 183, "Canon EF 100-400mm f/4.5-5.6L IS USM" },
{ 183, "Canon EF 100-400mm f/4.5-5.6L IS USM or Sigma Lens" },
{ 183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro" }, // 1
{ 183, "Sigma 105mm f/2.8 EX DG OS HSM Macro" }, // 2
{ 183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 3
@ -1054,15 +1047,15 @@ namespace Exiv2 {
{ 188, "Canon EF 70-200mm f/4L USM + 2x" },
{ 189, "Canon EF 70-200mm f/4L USM + 2.8x" },
{ 190, "Canon EF 100mm f/2.8 Macro USM" },
{ 191, "Canon EF 400mm f/4 DO IS" },
{ 191, "Canon EF 400mm f/4 DO IS or Sigma Lens" },
{ 191, "Sigma 500mm f/4 DG OS HSM" }, // 1
{ 193, "Canon EF 35-80mm f/4-5.6 USM" },
{ 194, "Canon EF 80-200mm f/4.5-5.6 USM" },
{ 195, "Canon EF 35-105mm f/4.5-5.6 USM" },
{ 196, "Canon EF 75-300mm f/4-5.6 USM" },
{ 197, "Canon EF 75-300mm f/4-5.6 IS USM" },
{ 197, "Sigma 18-300mm f/3.5-6.3 DC Macro OS HSM" }, // 1
{ 198, "Canon EF 50mm f/1.4 USM" },
{ 197, "Canon EF 75-300mm f/4-5.6 IS USM or Sigma Lens" },
{ 197, "Sigma 18-300mm f/3.5-6.3 DC Macro OS HS" }, // 1
{ 198, "Canon EF 50mm f/1.4 USM or Other Lens" },
{ 198, "Zeiss Otus 55mm f/1.4 ZE" }, // 1
{ 198, "Zeiss Otus 85mm f/1.4 ZE" }, // 2
{ 198, "Zeiss Milvus 25mm f/1.4" }, // 3
@ -1078,7 +1071,7 @@ namespace Exiv2 {
{ 210, "Canon EF 28-90mm f/4-5.6 USM" },
{ 211, "Canon EF 28-200mm f/3.5-5.6 USM" },
{ 212, "Canon EF 28-105mm f/4-5.6 USM" },
{ 213, "Canon EF 90-300mm f/4.5-5.6 USM" },
{ 213, "Canon EF 90-300mm f/4.5-5.6 USM or Tamron Lens" },
{ 213, "Tamron SP 150-600mm f/5-6.3 Di VC USD" }, // 1
{ 213, "Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro" }, // 2
{ 213, "Tamron SP 35mm f/1.8 Di VC USD" }, // 3
@ -1094,19 +1087,19 @@ namespace Exiv2 {
{ 228, "Canon EF 28-105mm f/3.5-4.5 USM" },
{ 229, "Canon EF 16-35mm f/2.8L USM" },
{ 230, "Canon EF 24-70mm f/2.8L USM" },
{ 231, "Canon EF 17-40mm f/4L USM" },
{ 231, "Canon EF 17-40mm f/4L USM or Sigma Lens" },
{ 231, "Sigma 12-24mm f/4 DG HSM A016" }, // 1
{ 232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM" },
{ 233, "Canon EF 28-300mm f/3.5-5.6L IS USM" },
{ 234, "Canon EF-S 17-85mm f/4-5.6 IS USM" },
{ 234, "Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens" },
{ 234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4" }, // 1
{ 235, "Canon EF-S 10-22mm f/3.5-4.5 USM" },
{ 236, "Canon EF-S 60mm f/2.8 Macro USM" },
{ 237, "Canon EF 24-105mm f/4L IS USM" },
{ 238, "Canon EF 70-300mm f/4-5.6 IS USM" },
{ 239, "Canon EF 85mm f/1.2L II USM" },
{ 239, "Canon EF 85mm f/1.2L II USM or Rokinon Lens" },
{ 239, "Rokinon SP 85mm f/1.2" }, // 1
{ 240, "Canon EF-S 17-55mm f/2.8 IS USM" },
{ 240, "Canon EF-S 17-55mm f/2.8 IS USM or Sigma Lens" },
{ 240, "Sigma 17-50mm f/2.8 EX DC OS HSM" }, // 1
{ 241, "Canon EF 50mm f/1.2L USM" },
{ 242, "Canon EF 70-200mm f/4L IS USM" },
@ -1115,13 +1108,13 @@ namespace Exiv2 {
{ 245, "Canon EF 70-200mm f/4L IS USM + 2.8x" },
{ 246, "Canon EF 16-35mm f/2.8L II USM" },
{ 247, "Canon EF 14mm f/2.8L II USM" },
{ 248, "Canon EF 200mm f/2L IS USM" },
{ 248, "Canon EF 200mm f/2L IS USM or Sigma Lens" },
{ 248, "Sigma 24-35mm f/2 DG HSM | A" }, // 1
{ 248, "Sigma 135mm f/2 FF High-Speed Prime | 017" }, // 2
{ 248, "Sigma 24-35mm f/2.2 FF Zoom | 017" }, // 3
{ 248, "Sigma 135mm f/1.8 DG HSM A017" }, // 4
{ 249, "Canon EF 800mm f/5.6L IS USM" },
{ 250, "Canon EF 24mm f/1.4L II USM" },
{ 250, "Canon EF 24mm f/1.4L II USM or Sigma Lens" },
{ 250, "Sigma 20mm f/1.4 DG HSM | A" }, // 1
{ 250, "Sigma 20mm f/1.5 FF High-Speed Prime | 017" }, // 2
{ 250, "Tokina Opera 16-28mm f/2.8 FF" }, // 3
@ -1132,11 +1125,11 @@ namespace Exiv2 {
{ 252, "Canon EF 70-200mm f/2.8L IS III USM + 1.4x" }, // 1
{ 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x" },
{ 253, "Canon EF 70-200mm f/2.8L IS III USM + 2x" }, // 1
{ 254, "Canon EF 100mm f/2.8L Macro IS USM" }, // 1
{ 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1" }, // 2
{ 255, "Sigma 24-105mm f/4 DG OS HSM | A" },
{ 254, "Canon EF 100mm f/2.8L Macro IS USM" },
{ 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1" }, // 1
{ 255, "Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens" },
{ 255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 1
{ 368, "Sigma 14-24mm f/2.8 DG HSM | A" },
{ 368, "Sigma 14-24mm f/2.8 DG HSM | A or other Sigma Lens" },
{ 368, "Sigma 20mm f/1.4 DG HSM | A" }, // 1
{ 368, "Sigma 50mm f/1.4 DG HSM | A" }, // 2
{ 368, "Sigma 40mm f/1.4 DG HSM | A" }, // 3
@ -1150,40 +1143,38 @@ namespace Exiv2 {
{ 488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM" },
{ 489, "Canon EF 70-300mm f/4-5.6L IS USM" },
{ 490, "Canon EF 8-15mm f/4L Fisheye USM" },
{ 491, "Canon EF 300mm f/2.8L IS II USM" },
{ 491, "Tamron SP 70-200mm f/2.8 Di VC USD G2" }, // 1
{ 491, "Tamron 18-400mm f/3.5-6.3 Di II VC HLD" }, // 2
{ 491, "Tamron 100-400mm f/4.5-6.3 Di VC USD" }, // 3
{ 491, "Tamron 70-210mm f/4 Di VC USD" }, // 4
{ 491, "Tamron 70-210mm f/4 Di VC USD + 1.4x" }, // 5
{ 491, "Tamron SP 24-70mm f/2.8 Di VC USD G2" }, // 6
{ 491, "Canon EF 300mm f/2.8L IS II USM or Tamron Lens" },
{ 491, "Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)" }, // 1
{ 491, "Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)" }, // 2
{ 491, "Tamron 100-400mm f/4.5-6.3 Di VC USD (A035)" }, // 3
{ 491, "Tamron 70-210mm f/4 Di VC USD (A034)" }, // 4
{ 491, "Tamron 70-210mm f/4 Di VC USD (A034) + 1.4x" }, // 5
{ 491, "Tamron SP 24-70mm f/2.8 Di VC USD G2 (A032)" }, // 6
{ 492, "Canon EF 400mm f/2.8L IS II USM" },
{ 493, "Canon EF 500mm f/4L IS II USM" },
{ 493, "Canon EF 500mm f/4L IS II USM or EF 24-105mm f4L IS USM" },
{ 493, "Canon EF 24-105mm f/4L IS USM" }, // 1
{ 494, "Canon EF 600mm f/4L IS II USM" },
{ 495, "Canon EF 24-70mm f/2.8L II USM" },
{ 495, "Sigma 24-70mm f/2.8 DG OS HSM | A" }, // 1
{ 495, "Canon EF 24-70mm f/2.8L II USM or Sigma Lens" },
{ 495, "Sigma 24-70mm F2.8 DG OS HSM | A" }, // 1
{ 496, "Canon EF 200-400mm f/4L IS USM" },
{ 499, "Canon EF 200-400mm f/4L IS USM + 1.4x" },
{ 502, "Canon EF 28mm f/2.8 IS USM" },
{ 502, "Tamron 35mm f/1.8 Di VC USD" }, // 1
{ 502, "Canon EF 28mm f/2.8 IS USM or Tamron Lens" },
{ 502, "Tamron 35mm f/1.8 Di VC USD (F012)" }, // 1
{ 503, "Canon EF 24mm f/2.8 IS USM" },
{ 504, "Canon EF 24-70mm f/4L IS USM" },
{ 505, "Canon EF 35mm f/2 IS USM" },
{ 506, "Canon EF 400mm f/4 DO IS II USM" },
{ 507, "Canon EF 16-35mm f/4L IS USM" },
{ 508, "Canon EF 11-24mm f/4L USM" },
{ 508, "Canon EF 11-24mm f/4L USM or Tamron Lens" },
{ 508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD" }, // 1
{ 624, "Sigma 70-200mm f/2.8 DG OS HSM | S" },
{ 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM" },
{ 624, "Sigma 70-200mm F2.8 DG OS HSM | S" },
{ 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens" },
{ 747, "Tamron SP 150-600mm f/5-6.3 Di VC USD G2" }, // 1
{ 748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x" },
{ 748, "Tamron 100-400mm f/4.5-6.3 Di VC USD + 1.4x" }, // 1
{ 748, "Tamron 70-210mm f/4 Di VC USD + 2x" }, // 2
{ 749, "Tamron 100-400mm f/4.5-6.3 Di VC USD + 2x" },
{ 748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x or Tamron Lens"},
{ 748, "Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 1.4x" }, // 1
{ 748, "Tamron 70-210mm f/4 Di VC USD (A034) + 2x" }, // 2
{ 749, "Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 2x" },
{ 750, "Canon EF 35mm f/1.4L II USM" },
{ 750, "Tamron SP 85mm f/1.8 Di VC USD" }, // 1
{ 750, "Tamron SP 45mm f/1.8 Di VC USD" }, // 2
{ 751, "Canon EF 16-35mm f/2.8L III USM" },
{ 752, "Canon EF 24-105mm f/4L IS II USM" },
{ 753, "Canon EF 85mm f/1.4L IS USM" },
@ -1192,7 +1183,7 @@ namespace Exiv2 {
{ 758, "Canon EF 600mm f/4L IS III USM" },
{ 1136, "Sigma 24-70mm f/2.8 DG OS HSM | Art 017" },
{ 4142, "Canon EF-S 18-135mm f/3.5-5.6 IS STM" },
{ 4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM" },
{ 4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens" },
{ 4143, "Tamron 18-200mm f/3.5-6.3 Di III VC" }, // 1
{ 4144, "Canon EF 40mm f/2.8 STM" },
{ 4145, "Canon EF-M 22mm f/2 STM" },
@ -1210,7 +1201,6 @@ namespace Exiv2 {
{ 4158, "Canon EF-S 18-55mm f/4-5.6 IS STM" },
{ 4159, "Canon EF-M 32mm f/1.4 STM" },
{ 4160, "Canon EF-S 35mm f/2.8 Macro IS STM" },
{ 4208, "Sigma 56mm f/1.4 DC DN | C" },
{36910, "Canon EF 70-300mm f/4-5.6 IS II USM" },
{36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM" },
{61491, "Canon CN-E 14mm T3.1 L F" },
@ -1218,14 +1208,12 @@ namespace Exiv2 {
{61494, "Canon CN-E 85mm T1.3 L F" },
{61495, "Canon CN-E 135mm T2.2 L F" },
{61496, "Canon CN-E 35mm T1.5 L F" },
{61182, "Canon RF 35mm F1.8 Macro IS STM" },
{61182, "Canon RF 35mm F1.8 Macro IS STM or other Canon RF Lens" },
{61182, "Canon RF 50mm F1.2 L USM" }, // 1
{61182, "Canon RF 24-105mm F4 L IS USM" }, // 2
{61182, "Canon RF 28-70mm F2 L USM" }, // 3
{61182, "Canon RF 85mm F1.2L USM" }, // 4
{61182, "Canon RF 24-240mm F4-6.3 IS USM" }, // 5
{61182, "Canon RF 24-70mm F2.8 L IS USM" }, // 6
{61182, "Canon RF 15-35mm F2.8 L IS USM" }, // 7
{65535, "n/a" }
};

10
test/data/exiv2-test.out
Unescape Escape View File

@ -1890,7 +1890,7 @@ File 14/15: 20001004_015404.jpg
20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected
20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av)
20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0
20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM
20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens
20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm
20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8
20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22
@ -3502,7 +3502,7 @@ Compare image data and extracted data ------------------------------------
< 20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected
< 20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av)
< 20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0
< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM
< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens
< 20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm
< 20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8
< 20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22
@ -5043,7 +5043,7 @@ Compare image data and extracted data ------------------------------------
> 20001004_015404.exv Exif.CanonCs.AFPoint Short 1 Auto-selected
> 20001004_015404.exv Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av)
> 20001004_015404.exv Exif.CanonCs.0x0015 Short 1 0
> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM
> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens
> 20001004_015404.exv Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm
> 20001004_015404.exv Exif.CanonCs.MaxAperture Short 1 F2.8
> 20001004_015404.exv Exif.CanonCs.MinAperture Short 1 F22
@ -6804,7 +6804,7 @@ Compare original and inserted image data ---------------------------------
< 20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected
< 20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av)
< 20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0
< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM
< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens
< 20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm
< 20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8
< 20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22
@ -8345,7 +8345,7 @@ Compare original and inserted image data ---------------------------------
> 20001004_015404.exv Exif.CanonCs.AFPoint Short 1 Auto-selected
> 20001004_015404.exv Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av)
> 20001004_015404.exv Exif.CanonCs.0x0015 Short 1 0
> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM
> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens
> 20001004_015404.exv Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm
> 20001004_015404.exv Exif.CanonCs.MaxAperture Short 1 F2.8
> 20001004_015404.exv Exif.CanonCs.MinAperture Short 1 F22

8
test/functions.source
Unescape Escape View File

@ -11,7 +11,7 @@ runTest()
if [ ! -z $EXIV2_ECHO ]; then
echoTest $VALGRIND $bin$prog "$@"
fi
$VALGRIND $bin$prog$exe "$@"
$VALGRIND $bin$prog "$@"
)
}
@ -37,7 +37,7 @@ existsTest()
result=1
fi
else
if [ -e $bin$prog -o -e $bin$prog$exe ]; then
if [ -e $bin$prog -o -e $bin$prog.exe ]; then
result=1
fi
fi
@ -464,10 +464,6 @@ prepareTest()
if [ "$PLATFORM" == cygwin -o "$PLATFORM" == mingw ]; then
exe=.exe
fi
if [ ! -z $EXIV2_EXT ]; then
exe=$EXIV2_EXT
fi
if [ "$PLATFORM" == cygwin ]; then
# We need a private version of diff for linux compatibility

6
test/path-test.sh
Unescape Escape View File

@ -4,13 +4,13 @@ source ./functions.source
( cd "$testdir"
if [ $(existsTest pathtest) == 1 ] ; then
if [ $(existsTest path-test) == 1 ] ; then
copyTestFile path-test.txt
runTest pathtest path-test.txt
runTest path-test path-test.txt
else
echo "$0: path-test executable not found. Skipping path tests."
fi
)
# That's all Folks!
##
##

4
test/xmpparser-test.sh
Unescape Escape View File

@ -17,13 +17,13 @@ fi
for f in ${files[@]} ; do
runTest xmpparser-test $f
diff $diffargs $f ${f}-new
diff $f ${f}-new
done
testfile=xmpsdk.xmp
runTest xmpparse ${testfile} > t1 2>&1
runTest xmpparse ${testfile}-new > t2 2>&1
diff $diffargs t1 t2
diff t1 t2
# ----------------------------------------------------------------------
# xmpsample

4
tests/bugfixes/github/test_issue_20.py
Unescape Escape View File

@ -5,7 +5,7 @@ import system_tests
class TamronSupport(metaclass=system_tests.CaseMeta):
description = "Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1'"
description = "Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD A012' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1'"
files = [
"exiv2-g20.exv",
@ -36,7 +36,7 @@ Exif.Photo.LensSerialNumber Ascii 12 0000000000
""",
# TamronSP15-30mmF2.8DiVCUSDA012.exv"
"""Exif.CanonCs.LensType Short 1 Tamron SP 15-30mm f/2.8 Di VC USD
"""Exif.CanonCs.LensType Short 1 Tamron SP 15-30mm f/2.8 Di VC USD A012
""",
# TamronSP90mmF2.8DiVCUSDMacroF004.exv

2
tests/bugfixes/github/test_issue_45.py
Unescape Escape View File

@ -9,7 +9,7 @@ class Sigma24_105mmRecognization(metaclass=system_tests.CaseMeta):
filename = "$data_path/exiv2-g45.exv"
commands = ["$exiv2 -pa --grep lens/i " + filename]
stdout = ["""Exif.CanonCs.LensType Short 1 Sigma 24-105mm F4 DG OS HSM | A
stdout = ["""Exif.CanonCs.LensType Short 1 Sigma 24-105mm F4 DG OS HSM [Art 013]
Exif.CanonCs.Lens Short 3 24.0 - 105.0 mm
Exif.CanonCf.LensAFStopButton Short 1 0
Exif.Canon.LensModel Ascii 74 24-105mm F4 DG OS HSM | Art 013

Write Preview
Loading…
Cancel
Save