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

#1275 Fix submitted.

Browse Source
This commit is contained in:
Robin Mills 2017-02-08 20:10:01 +00:00
parent 5c308319b7
commit b668455721
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/tags.cpp
View File

@ -201,6 +201,7 @@ namespace Exiv2 {
{ captureCond, "CaptureConditions", N_("Picture taking conditions") },
{ gpsTags, "GPS", N_("GPS information") },
{ iopTags, "Interoperability", N_("Interoperability information") },
{ mpfTags, "MPF", N_("CIPA Multi-Picture Format") },
{ makerTags, "Makernote", N_("Vendor specific information") },
{ dngTags, "DngTags", N_("Adobe DNG tags") },
{ panaRaw, "PanasonicRaw", N_("Panasonic RAW tags") },
@ -2167,65 +2168,65 @@ namespace Exiv2 {
static const TagInfo mpfTagInfo[] = {
TagInfo(0xb000, "MPFVersion", N_("MPFVersion"),
N_("MPF Version"),
mpfId, iopTags, asciiString, 0, printValue),
mpfId, mpfTags, asciiString, 0, printValue),
TagInfo(0xb001, "MPFNumberOfImages", N_("MPFNumberOfImages"),
N_("MPF Number of Images"),
mpfId, iopTags, undefined, -1, printExifVersion),
mpfId, mpfTags, undefined, -1, printExifVersion),
TagInfo(0xb002, "MPFImageList", N_("MPFImageList"),
N_("MPF Image List"),
mpfId, iopTags, asciiString, 0, printValue),
mpfId, mpfTags, asciiString, 0, printValue),
TagInfo(0xb003, "MPFImageUIDList", N_("MPFImageUIDList "),
N_("MPF Image UID List"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb004, "MPFTotalFrames", N_("MPFTotalFrames"),
N_("MPF Total Frames"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb101, "MPFIndividualNum", N_("MPFIndividualNum"),
N_("MPF Individual Num"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb201, "MPFPanOrientation", N_("MPFPanOrientation"),
N_("MPFPanOrientation"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb202, "MPFPanOverlapH", N_("MPFPanOverlapH"),
N_("MPF Pan Overlap Horizonal"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb203, "MPFPanOverlapV", N_("MPFPanOverlapV"),
N_("MPF Pan Overlap Vertical"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb204, "MPFBaseViewpointNum", N_("MPFBaseViewpointNum"),
N_("MPF Base Viewpoint Number"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb205, "MPFConvergenceAngle", N_("MPFConvergenceAngle"),
N_("MPF Convergence Angle"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb206, "MPFBaselineLength", N_("MPFBaselineLength"),
N_("MPF Baseline Length"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb207, "MPFVerticalDivergence", N_("MPFVerticalDivergence"),
N_("MPF Vertical Divergence"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb208, "MPFAxisDistanceX", N_("MPFAxisDistanceX"),
N_("MPF Axis Distance X"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb209, "MPFAxisDistanceY", N_("MPFAxisDistanceY"),
N_("MPF Axis Distance Y"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb20a, "MPFAxisDistanceZ", N_("MPFAxisDistanceZ"),
N_("MPF Axis Distance Z"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb20b, "MPFYawAngle", N_("MPFYawAngle"),
N_("MPF Yaw Angle"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb20c, "MPFPitchAngle", N_("MPFPitchAngle"),
N_("MPF Pitch Angle"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
TagInfo(0xb20d, "MPFRollAngle", N_("MPFRollAngle"),
N_("MPF Roll Angle"),
mpfId, iopTags, unsignedLong, 1, printValue),
mpfId, mpfTags, unsignedLong, 1, printValue),
// End of list marker
TagInfo(0xffff, "(UnknownIopTag)", N_("Unknown MPF tag"),
TagInfo(0xffff, "(UnknownMpfTag)", N_("Unknown MPF tag"),
N_("Unknown MPF tag"),
mpfId, iopTags, asciiString, -1, printValue)
mpfId, mpfTags, asciiString, -1, printValue)
};
const TagInfo* iopTagList()

2
src/tags_int.hpp
View File

@ -170,7 +170,7 @@ namespace Exiv2 {
enum SectionId { sectionIdNotSet,
imgStruct, recOffset, imgCharacter, otherTags, exifFormat,
exifVersion, imgConfig, userInfo, relatedFile, dateTime,
captureCond, gpsTags, iopTags, makerTags, dngTags, panaRaw,
captureCond, gpsTags, iopTags, mpfTags, makerTags, dngTags, panaRaw,
tiffEp, tiffPm6, adobeOpi,
lastSectionId };