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

remove constructors

Browse Source 
Just direct initialize

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-02-09 14:45:15 -08:00
parent aa16a54a7f
commit 33e5ef5ffd
No known key found for this signature in database
GPG Key ID: 36D31CFA845F0E3B
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/makernote_int.cpp
View File

@ -842,9 +842,6 @@ TiffComponent* newCasio2Mn2(uint16_t tag, IfdId group, IfdId mnGroup) {
struct NikonArrayIdx {
//! Key for comparisons
struct Key {
//! Constructor
Key(uint16_t tag, const char* ver, size_t size) : tag_(tag), ver_(ver), size_(size) {
}
uint16_t tag_; //!< Tag number
const char* ver_; //!< Version string
size_t size_; //!< Size of the data (not the version string)
@ -910,7 +907,7 @@ int nikonSelector(uint16_t tag, const byte* pData, size_t size, TiffComponent* /
if (size < 4)
return -1;
auto ix = NikonArrayIdx::Key(tag, reinterpret_cast<const char*>(pData), size);
auto ix = NikonArrayIdx::Key{tag, reinterpret_cast<const char*>(pData), size};
auto it = Exiv2::find(nikonArrayIdx, ix);
if (!it)
return -1;
@ -923,7 +920,7 @@ DataBuf nikonCrypt(uint16_t tag, const byte* pData, size_t size, TiffComponent*
if (size < 4)
return buf;
auto nci = Exiv2::find(nikonArrayIdx, NikonArrayIdx::Key(tag, reinterpret_cast<const char*>(pData), size));
auto nci = Exiv2::find(nikonArrayIdx, NikonArrayIdx::Key{tag, reinterpret_cast<const char*>(pData), size});
if (!nci || nci->start_ == NA || size <= nci->start_)
return buf;