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

Include CanonFlashInfo (somehow missing after cherry-picking)

Browse Source
This commit is contained in:
Luis Díaz Más 2022-02-09 23:14:54 +01:00 committed by Luis Diaz
parent de036b2b2a
commit e625f331f9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/canonmn_int.cpp
View File

@ -533,7 +533,7 @@ namespace Exiv2 {
{0x0000, "0x0000", "0x0000", N_("Unknown"), canonId, makerTags, unsignedShort, -1, printValue},
{0x0001, "CameraSettings", N_("Camera Settings"), N_("Various camera settings"), canonId, makerTags, unsignedShort, -1, printValue},
{0x0002, "FocalLength", N_("Focal Length"), N_("Focal length"), canonId, makerTags, unsignedShort, -1, printFocalLength},
{0x0003, "0x0003", "0x0003", N_("Unknown"), canonId, makerTags, unsignedShort, -1, printValue},
{0x0003, "CanonFlashInfo", "Canon Flash Info", N_("Canon Flash Info"), canonId, makerTags, unsignedShort, -1, printValue},
{0x0004, "ShotInfo", N_("Shot Info"), N_("Shot information"), canonId, makerTags, unsignedShort, -1, printValue},
{0x0005, "Panorama", N_("Panorama"), N_("Panorama"), canonId, makerTags, unsignedShort, -1, printValue},
{0x0006, "ImageType", N_("Image Type"), N_("Image type"), canonId, makerTags, asciiString, -1, printValue},

2
test/data/test_reference_files/exiv2-test.out
View File

@ -1145,7 +1145,7 @@ File 6/16: 20030925_201850.jpg
20030925_201850.jpg Exif.CanonCs.0x002c Short 1 65535
20030925_201850.jpg Exif.CanonCs.0x002d Short 1 65535
20030925_201850.jpg Exif.Canon.FocalLength Short 4 18.0 mm
20030925_201850.jpg Exif.Canon.0x0003 Short 4 100 0 0 0
20030925_201850.jpg Exif.Canon.CanonFlashInfo Short 4 100 0 0 0
20030925_201850.jpg Exif.CanonSi.0x0000 Short 1 66
20030925_201850.jpg Exif.CanonSi.AutoISO Short 1 100
20030925_201850.jpg Exif.CanonSi.ISOSpeed Short 1 100