diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index 52883ce1..f8ac11f4 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -1155,6 +1155,7 @@ namespace Exiv2 { constexpr TagInfo CanonMakerNote::tagInfoHdr_[] = { {0x0001, "HDR", N_("HDR"), N_("HDR"), canonHdrId, makerTags, signedLong, -1, EXV_PRINT_TAG(canonHdr)}, {0x0002, "HDREffect", N_("HDR Effect"), N_("HDR Effect"), canonHdrId, makerTags, signedLong, -1, EXV_PRINT_TAG(canonHdrEffect)}, + (0xffff, "(UnknownHDRTag)", "(UnknownHDRTag)", N_("Unknown Canon HDR Tag"), canonHdrId, makerTags, signedLong, 1, printValue) }; diff --git a/src/tiffimage_int.cpp b/src/tiffimage_int.cpp index 31c1aff1..4da7e812 100644 --- a/src/tiffimage_int.cpp +++ b/src/tiffimage_int.cpp @@ -154,11 +154,6 @@ namespace Exiv2 { { 0, ttSignedLong, 1 } }; - //! Canon Hdr Info binary array - definition - extern const ArrayDef canonHdrDef[] = { - { 2, ttSignedLong, 3 } // Exif.CanonHdr - }; - //! Nikon Vibration Reduction binary array - configuration constexpr ArrayCfg nikonVrCfg = { nikonVrId, // Group for the elements @@ -1559,7 +1554,7 @@ namespace Exiv2 { //{ 0x4020, canonId, EXV_SIMPLE_BINARY_ARRAY(canonAmCfg) }, //{ 0x4021, canonId, EXV_SIMPLE_BINARY_ARRAY(canonMeCfg) }, //{ 0x4024, canonId, EXV_SIMPLE_BINARY_ARRAY(canonFilCfg) }, - // { 0x4025, canonId, EXV_BINARY_ARRAY(canonHdrCfg, canonHdrDef) }, + { 0x4025, canonId, EXV_SIMPLE_BINARY_ARRAY(canonHdrCfg) }, //{ 0x4028, canonId, EXV_SIMPLE_BINARY_ARRAY(canonAfCCfg) }, { Tag::next, canonId, ignoreTiffComponent }, { Tag::all, canonId, newTiffEntry },