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

second rund

Browse Source
This commit is contained in:
Alex Esseling 2021-05-10 22:31:08 +02:00 committed by Luis Diaz
parent 23293064bb
commit f41e7e59e3
5 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/templates/Makefile vendored
View File

@ -53,7 +53,9 @@ TABLES = Exif \
CanonFi \ CanonFi \
CanonPa \ CanonPa \
CanonPr \ CanonPr \
CanonTi \ CanonMe \
CanonHdr \
CanonVigCor2 \
Casio \ Casio \
Casio2 \ Casio2 \
Fujifilm \ Fujifilm \

4
src/tags_int.cpp
View File

@ -91,7 +91,9 @@ namespace Exiv2 {
{ canonPaId, "Makernote", "CanonPa", CanonMakerNote::tagListPa }, { canonPaId, "Makernote", "CanonPa", CanonMakerNote::tagListPa },
{ canonPrId, "Makernote", "CanonPr", CanonMakerNote::tagListPr }, { canonPrId, "Makernote", "CanonPr", CanonMakerNote::tagListPr },
{ canonVigCor2Id, "Makernote", "CanonVigCor2", CanonMakerNote::tagListVigCor2 }, // new { canonVigCor2Id, "Makernote", "CanonVigCor2", CanonMakerNote::tagListVigCor2 }, // new
{ canonAfMiAdjId, "Makernote", "CanonAfMiAdjId", CanonMakerNote::tagListAfMiAdj }, // new { canonAfMiAdjId, "Makernote", "CanonAfMiAdj", CanonMakerNote::tagListAfMiAdj }, // new
{ canonHdrId, "Makernote", "CanonHdr", CanonMakerNote::tagListHdr }, // new
{ canonMeId, "Makernote", "CanonMe", CanonMakerNote::tagListMe }, // new
{ casioId, "Makernote", "Casio", CasioMakerNote::tagList }, { casioId, "Makernote", "Casio", CasioMakerNote::tagList },
{ casio2Id, "Makernote", "Casio2", Casio2MakerNote::tagList }, { casio2Id, "Makernote", "Casio2", Casio2MakerNote::tagList },
{ fujiId, "Makernote", "Fujifilm", FujiMakerNote::tagList }, { fujiId, "Makernote", "Fujifilm", FujiMakerNote::tagList },

17
src/tiffimage_int.cpp
View File

@ -141,6 +141,19 @@ namespace Exiv2 {
{ 0, ttSignedShort, 1 } { 0, ttSignedShort, 1 }
}; };
//! Canon Hdr Info binary array - configuration
extern const ArrayCfg canonHdrCfg = {
canonHdrId, // Group for the elements
invalidByteOrder, // Use byte order from parent
ttSignedLong, // Type for array entry and size element
notEncrypted, // Not encrypted
true, // Has a size element
false, // No fillers
false, // Don't concatenate gaps
{ 0, ttSignedLong, 1 }
};
//! Nikon Vibration Reduction binary array - configuration //! Nikon Vibration Reduction binary array - configuration
constexpr ArrayCfg nikonVrCfg = { constexpr ArrayCfg nikonVrCfg = {
nikonVrId, // Group for the elements nikonVrId, // Group for the elements
@ -1531,7 +1544,8 @@ namespace Exiv2 {
{ 0x0012, canonId, EXV_SIMPLE_BINARY_ARRAY(canonPiCfg) }, { 0x0012, canonId, EXV_SIMPLE_BINARY_ARRAY(canonPiCfg) },
{ 0x0035, canonId, EXV_SIMPLE_BINARY_ARRAY(canonTiCfg) }, { 0x0035, canonId, EXV_SIMPLE_BINARY_ARRAY(canonTiCfg) },
{ 0x0093, canonId, EXV_BINARY_ARRAY(canonFiCfg, canonFiDef) }, { 0x0093, canonId, EXV_BINARY_ARRAY(canonFiCfg, canonFiDef) },
{ 0x00a0, canonId, EXV_SIMPLE_BINARY_ARRAY(canonPrCfg) }, { 0x00a0, canonId, EXV_SIMPLE_BINARY_ARRAY(canonPrCfg) },
{ 0x4025, canonId, EXV_SIMPLE_BINARY_ARRAY(canonHdrCfg) },
{ Tag::next, canonId, ignoreTiffComponent }, { Tag::next, canonId, ignoreTiffComponent },
{ Tag::all, canonId, newTiffEntry }, { Tag::all, canonId, newTiffEntry },
@ -1544,6 +1558,7 @@ namespace Exiv2 {
{ Tag::all, canonTiId, newTiffBinaryElement }, { Tag::all, canonTiId, newTiffBinaryElement },
{ Tag::all, canonFiId, newTiffBinaryElement }, { Tag::all, canonFiId, newTiffBinaryElement },
{ Tag::all, canonPrId, newTiffBinaryElement }, { Tag::all, canonPrId, newTiffBinaryElement },
{ Tag::all, canonHdrId, newTiffBinaryElement },
// Nikon1 makernote // Nikon1 makernote
{ Tag::next, nikon1Id, ignoreTiffComponent }, { Tag::next, nikon1Id, ignoreTiffComponent },