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

Tidy up. Rename Tag::cr3_exif -> Tag:cmt2

Browse Source
This commit is contained in:
Robin Mills
2021-02-25 15:25:09 +00:00
parent 9515e4658b
commit 4ae0a1d2a3
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/exiv2/bmffimage.hpp
+1 -1
View File
@@ -75,7 +75,7 @@ namespace Exiv2
//@{
/*!
@brief parse embedded tiff file
@param root_tag root of parse tree Tag::root, Tag::cr3_exif etc.
@param root_tag root of parse tree Tag::root, Tag::cmt2 etc.
@param length tiff block length
@param start offset in file (default, io_->tell())
@
src/bmffimage.cpp
+3 -3
View File
@@ -354,13 +354,13 @@ namespace Exiv2
parseTiff(Internal::Tag::root, box.length);
break;
case TAG_cmt2:
parseTiff(Internal::Tag::cr3_exif, box.length);
parseTiff(Internal::Tag::cmt2, box.length);
break;
case TAG_cmt3:
parseTiff(Internal::Tag::cr3_mn, box.length);
parseTiff(Internal::Tag::cmt3, box.length);
break;
case TAG_cmt4:
parseTiff(Internal::Tag::cr3_gps, box.length);
parseTiff(Internal::Tag::cmt4, box.length);
break;
default: break ; /* do nothing */
src/tiffcomposite_int.hpp
+3 -3
View File
@@ -82,9 +82,9 @@ namespace Exiv2 {
const uint32_t all = 0x40000; //!< Special tag: all tags in a group
const uint32_t pana = 0x80000; //!< Special tag: root IFD of Panasonic RAW images
const uint32_t fuji = 0x100000; //!< Special tag: root IFD of Fujifilm RAF images
const uint32_t cr3_exif = 0x110000; //!< Special tag: root IFD of CR3 images
const uint32_t cr3_mn = 0x120000; //!< Special tag: root IFD of CR3 images
const uint32_t cr3_gps = 0x130000; //!< Special tag: root IFD of CR3 images
const uint32_t cmt2 = 0x110000; //!< Special tag: root IFD of CR3 images
const uint32_t cmt3 = 0x120000; //!< Special tag: root IFD of CR3 images
const uint32_t cmt4 = 0x130000; //!< Special tag: root IFD of CR3 images
}
/*!
src/tiffimage_int.cpp
+4 -4
View File
@@ -1126,11 +1126,11 @@ namespace Exiv2 {
{ Tag::fuji, ifdIdNotSet, newTiffDirectory<fujiId> },
{ 0xf000, fujiId, newTiffSubIfd<fujiId> },
// CR3 images #1475
{ Tag::cmt2, ifdIdNotSet, newTiffDirectory<exifId> },
{ Tag::cmt3, ifdIdNotSet, newTiffDirectory<canonId> },
{ Tag::cmt4, ifdIdNotSet, newTiffDirectory<gpsId> },
// CR3 images
{ Tag::cr3_exif, ifdIdNotSet, newTiffDirectory<exifId> },
{ Tag::cr3_mn, ifdIdNotSet, newTiffDirectory<canonId> },
{ Tag::cr3_gps, ifdIdNotSet, newTiffDirectory<gpsId> },
// IFD0
{ 0x8769, ifd0Id, newTiffSubIfd<exifId> },
{ 0x8825, ifd0Id, newTiffSubIfd<gpsId> },