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

Update various lists to match ExifTool version 9.83.

Browse Source
v0.27.3
nkbj 11 years ago
parent 47db07bee4
commit 0fd3e9e8cd
5 changed files with 70 additions and 27 deletions
Show Stats Download Patch File Download Diff File

20
src/canonmn.cpp
Unescape Escape View File

@ -270,6 +270,7 @@ namespace Exiv2 {
{ (long int)0x3800000, "PowerShot SX530 HS" },
{ (long int)0x3820000, "PowerShot SX710 HS" },
{ (long int)0x3830000, "PowerShot SX610 HS" },
{ (long int)0x3910000, "PowerShot SX410 HS" },
{ (long int)0x4040000, "PowerShot G1" },
{ (long int)0x6040000, "PowerShot S100 / Digital IXUS / IXY Digital" },
{ (long int)0x4007d673, "DC19/DC21/DC22" },
@ -346,6 +347,10 @@ namespace Exiv2 {
{ (long int)0x80000331, "EOS M" },
{ (long int)0x80000355, "EOS M2" },
{ (long int)0x80000346, "EOS Rebel SL1 / 100D / Kiss X7" },
{ (long int)0x80000347, "EOS Rebel T6s / 760D / 8000D" },
{ (long int)0x80000382, "EOS 5DS" },
{ (long int)0x80000393, "EOS Rebel T6i / 750D / Kiss X8i" },
{ (long int)0x80000401, "EOS 5DS R" }
};
//! SerialNumberFormat, tag 0x0015
@ -883,8 +888,10 @@ namespace Exiv2 {
{ 504, "Canon EF 24-70mm f/4L IS USM" },
{ 505, "Canon EF 35mm f/2 IS USM" },
{ 507, "Canon EF 16-35mm f/4L IS USM" },
{ 508, "Canon EF 11-24mm f/4L USM" },
{ 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" }, // 0
{ 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" },
{ 4146,"Canon EF-S 18-55mm f/3.5-5.6 IS STM" },
@ -892,6 +899,7 @@ namespace Exiv2 {
{ 4148,"Canon EF-S 55-250mm f/4-5.6 IS STM" },
{ 4149,"Canon EF-M 55-200mm f/4.5-6.3 IS STM" },
{ 4150,"Canon EF-S 10-18mm f/4.5-5.6 IS STM" },
{ 4152,"Canon EF 24-105mm f/3.5-5.6 IS STM" },
{ 4154,"Canon EF-S 24mm f/2.8 STM" }
};
@ -934,7 +942,8 @@ namespace Exiv2 {
{ 183, printCsLensByFocalLength }, // not tested
{ 198, printCsLensByFocalLength }, // not tested
{ 213, printCsLensByFocalLength }, // not tested
{ 234, printCsLensByFocalLength } // not tested
{ 234, printCsLensByFocalLength }, // not tested
{ 4143,printCsLensByFocalLength } // not tested
};
//! FlashActivity, tag 0x001c
@ -1070,7 +1079,7 @@ namespace Exiv2 {
//! WhiteBalance, multiple tags
extern const TagDetails canonSiWhiteBalance[] = {
{ 0, N_("Auto") },
{ 1, N_("Sunny") },
{ 1, N_("Daylight") },
{ 2, N_("Cloudy") },
{ 3, N_("Tungsten") },
{ 4, N_("Fluorescent") },
@ -1089,7 +1098,8 @@ namespace Exiv2 {
{ 18, N_("Custom 3") },
{ 19, N_("Custom 3") },
{ 20, N_("PC Set 4") },
{ 21, N_("PC Set 5") }
{ 21, N_("PC Set 5") },
{ 23, N_("Auto (ambience priority)") }
};
//! AFPointUsed, tag 0x000e
@ -1370,6 +1380,8 @@ namespace Exiv2 {
{ 0x84, N_("Neutral") },
{ 0x85, N_("Faithful") },
{ 0x86, N_("Monochrome") },
{ 0x87, N_("Auto") },
{ 0x88, N_("Fine Detail") }
};
// Canon Processing Info Tag

11
src/nikonmn.cpp
Unescape Escape View File

@ -150,11 +150,13 @@ namespace Exiv2 {
extern const TagDetailsBitmask nikonShootingMode[] = {
{ 0x0001, N_("Continuous") },
{ 0x0002, N_("Delay") },
{ 0x0004, N_("PC control") },
{ 0x0010, N_("Exposure bracketing") },
{ 0x0004, N_("PC Control") },
{ 0x0008, N_("Self-timer") },
{ 0x0010, N_("Exposure Bracketing") },
{ 0x0020, N_("Auto ISO") },
{ 0x0040, N_("White balance bracketing") },
{ 0x0080, N_("IR control") }
{ 0x0040, N_("White-Balance Bracketing") },
{ 0x0080, N_("IR Control") },
{ 0x0100, N_("D-Lighting Bracketing") }
};
//! ShootingMode D70, tag 0x0089
@ -2012,6 +2014,7 @@ fmountlens[] = {
{0xA4,0x40,0x2D,0x8E,0x2C,0x40,0xBF,0x0E,0x01,0x00,0x01, "Nikon", "JAA821DA", "AF-S DX Nikkor 18-300mm f/3.5-6.3G ED VR"},
{0xA5,0x4C,0x44,0x44,0x14,0x14,0xC0,0x06,0x01,0x00,0x01, "Nikon", "JAA137DA", "AF-S Nikkor 35mm f/1.8G ED"},
{0xA8,0x48,0x8E,0x8E,0x30,0x30,0xC3,0x4E,0x01,0x00,0x01, "Nikon", "JAA342DA", "AF-S Nikkor 300mm f/4E PF ED VR"},
{0xA8,0x48,0x8E,0x8E,0x30,0x30,0xC3,0x0E,0x01,0x00,0x01, "Nikon", "JAA342DA", "AF-S Nikkor 300mm f/4E PF ED VR"},
{0xA9,0x4C,0x31,0x31,0x14,0x14,0xC4,0x06,0x01,0x00,0x01, "Nikon", "JAA138DA", "AF-S Nikkor 20mm f/1.8G ED"},
//
// 3B 53 80 30 3C " "0E" "01" "00" "01" "Nikon" "JAA823DA" "AF-S DX Nikkor 55-200mm f/4-5.6G VR II"

27
src/olympusmn.cpp
Unescape Escape View File

@ -1505,6 +1505,33 @@ namespace Exiv2 {
{ { 10, 1280}, N_("Cross Process") },
{ { 12, 1280}, N_("Fish Eye") },
{ { 13, 1280}, N_("Drawing") },
{ { 14, 1280}, N_("Gentle Sepia") },
{ { 15, 1280}, N_("Pale & Light Color II") },
{ { 16, 1280}, N_("Pop Art II") },
{ { 17, 1280}, N_("Pin Hole II") },
{ { 18, 1280}, N_("Pin Hole III") },
{ { 19, 1280}, N_("Grainy Film II") },
{ { 20, 1280}, N_("Dramatic Tone") },
{ { 21, 1280}, N_("Punk") },
{ { 22, 1280}, N_("Soft Focus 2") },
{ { 23, 1280}, N_("Sparkle") },
{ { 24, 1280}, N_("Watercolor") },
{ { 25, 1280}, N_("Key Line") },
{ { 26, 1280}, N_("Key Line II") },
{ { 27, 1280}, N_("Miniature") },
{ { 28, 1280}, N_("Reflection") },
{ { 29, 1280}, N_("Fragmented") },
{ { 31, 1280}, N_("Cross Process II") },
{ { 32, 1280}, N_("Dramatic Tone II") },
{ { 33, 1280}, N_("Watercolor I") },
{ { 34, 1280}, N_("Watercolor II") },
{ { 35, 1280}, N_("Diorama II") },
{ { 36, 1280}, N_("Vintage") },
{ { 37, 1280}, N_("Vintage II") },
{ { 38, 1280}, N_("Vintage III") },
{ { 39, 1280}, N_("Partial Color") },
{ { 40, 1280}, N_("Partial Color II") },
{ { 41, 1280}, N_("Partial Color III") },
// End of list marker
{ { 0xffff, 0 }, "" }
};

1
src/pentaxmn.cpp
Unescape Escape View File

@ -188,6 +188,7 @@ namespace Exiv2 {
{ 0x13010, "645Z" },
{ 0x1301a, "K-S1" },
{ 0x1302e, "Q-S1" },
{ 0x13056, "WG-30" },
};
//! Quality, tag 0x0008

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

@ -569,7 +569,7 @@ File 14/15: 20001004_015404.jpg
20001004_015404.jpg Macro mode : Off
20001004_015404.jpg Image quality : Fine
20001004_015404.jpg Exif Resolution : 2160 x 1440
20001004_015404.jpg White balance : Sunny
20001004_015404.jpg White balance : Daylight
20001004_015404.jpg Thumbnail : image/jpeg, 13824 Bytes
20001004_015404.jpg Copyright :
20001004_015404.jpg Exif comment :
@ -1902,7 +1902,7 @@ File 14/15: 20001004_015404.jpg
20001004_015404.jpg Exif.CanonSi.TargetAperture Short 1 F4
20001004_015404.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/347 s
20001004_015404.jpg Exif.CanonSi.0x0006 Short 1 0
20001004_015404.jpg Exif.CanonSi.WhiteBalance Short 1 Sunny
20001004_015404.jpg Exif.CanonSi.WhiteBalance Short 1 Daylight
20001004_015404.jpg Exif.CanonSi.0x0008 Short 1 3
20001004_015404.jpg Exif.CanonSi.Sequence Short 1 1
20001004_015404.jpg Exif.CanonSi.0x000a Short 1 8
@ -3514,7 +3514,7 @@ Compare image data and extracted data ------------------------------------
< 20001004_015404.jpg Exif.CanonSi.TargetAperture Short 1 F4
< 20001004_015404.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/347 s
< 20001004_015404.jpg Exif.CanonSi.0x0006 Short 1 0
< 20001004_015404.jpg Exif.CanonSi.WhiteBalance Short 1 Sunny
< 20001004_015404.jpg Exif.CanonSi.WhiteBalance Short 1 Daylight
< 20001004_015404.jpg Exif.CanonSi.0x0008 Short 1 3
< 20001004_015404.jpg Exif.CanonSi.Sequence Short 1 1
< 20001004_015404.jpg Exif.CanonSi.0x000a Short 1 8
@ -5055,7 +5055,7 @@ Compare image data and extracted data ------------------------------------
> 20001004_015404.exv Exif.CanonSi.TargetAperture Short 1 F4
> 20001004_015404.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/347 s
> 20001004_015404.exv Exif.CanonSi.0x0006 Short 1 0
> 20001004_015404.exv Exif.CanonSi.WhiteBalance Short 1 Sunny
> 20001004_015404.exv Exif.CanonSi.WhiteBalance Short 1 Daylight
> 20001004_015404.exv Exif.CanonSi.0x0008 Short 1 3
> 20001004_015404.exv Exif.CanonSi.Sequence Short 1 1
> 20001004_015404.exv Exif.CanonSi.0x000a Short 1 8
@ -6816,7 +6816,7 @@ Compare original and inserted image data ---------------------------------
< 20001004_015404.jpg Exif.CanonSi.TargetAperture Short 1 F4
< 20001004_015404.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/347 s
< 20001004_015404.jpg Exif.CanonSi.0x0006 Short 1 0
< 20001004_015404.jpg Exif.CanonSi.WhiteBalance Short 1 Sunny
< 20001004_015404.jpg Exif.CanonSi.WhiteBalance Short 1 Daylight
< 20001004_015404.jpg Exif.CanonSi.0x0008 Short 1 3
< 20001004_015404.jpg Exif.CanonSi.Sequence Short 1 1
< 20001004_015404.jpg Exif.CanonSi.0x000a Short 1 8
@ -8357,7 +8357,7 @@ Compare original and inserted image data ---------------------------------
> 20001004_015404.exv Exif.CanonSi.TargetAperture Short 1 F4
> 20001004_015404.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/347 s
> 20001004_015404.exv Exif.CanonSi.0x0006 Short 1 0
> 20001004_015404.exv Exif.CanonSi.WhiteBalance Short 1 Sunny
> 20001004_015404.exv Exif.CanonSi.WhiteBalance Short 1 Daylight
> 20001004_015404.exv Exif.CanonSi.0x0008 Short 1 3
> 20001004_015404.exv Exif.CanonSi.Sequence Short 1 1
> 20001004_015404.exv Exif.CanonSi.0x000a Short 1 8

Write Preview
Loading…
Cancel
Save