find to std::find
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
parent
9cb1fcef5c
commit
9dc35e7380
@ -2568,16 +2568,16 @@ std::ostream& printCsLensTypeByMetadata(std::ostream& os, const Value& value, co
|
||||
bool unmatched = true;
|
||||
// we loop over all our lenses to print out all matching lenses
|
||||
// if we have multiple possibilities, they are concatenated by "*OR*"
|
||||
for (auto const& lens : canonCsLensType) {
|
||||
if (lens.val_ != lensType) {
|
||||
for (auto&& [val, label] : canonCsLensType) {
|
||||
if (val != lensType) {
|
||||
continue;
|
||||
}
|
||||
|
||||
std::cmatch base_match;
|
||||
if (!std::regex_search(lens.label_, base_match, lens_regex)) {
|
||||
if (!std::regex_search(label, base_match, lens_regex)) {
|
||||
// this should never happen, as it would indicate the lens is specified incorrectly
|
||||
// in the CanonCsLensType array
|
||||
throw Error(ErrorCode::kerErrorMessage, std::string("Lens regex didn't match for: ") + std::string(lens.label_));
|
||||
throw Error(ErrorCode::kerErrorMessage, std::string("Lens regex didn't match for: ") + std::string(label));
|
||||
}
|
||||
|
||||
auto tc = base_match[5].length() > 0 ? std::stof(base_match[5].str()) : 1.f;
|
||||
@ -2595,11 +2595,11 @@ std::ostream& printCsLensTypeByMetadata(std::ostream& os, const Value& value, co
|
||||
|
||||
if (unmatched) {
|
||||
unmatched = false;
|
||||
os << lens.label_;
|
||||
os << label;
|
||||
continue;
|
||||
}
|
||||
|
||||
os << " *OR* " << lens.label_;
|
||||
os << " *OR* " << label;
|
||||
}
|
||||
|
||||
// if the entire for loop left us with unmatched==false
|
||||
|
||||
@ -40,9 +40,9 @@ constexpr RotationMap::OmList RotationMap::omList_[] = {
|
||||
|
||||
uint16_t RotationMap::orientation(int32_t degrees) {
|
||||
uint16_t o = 1;
|
||||
for (auto&& om : omList_) {
|
||||
if (om.degrees == degrees) {
|
||||
o = om.orientation;
|
||||
for (auto&& [deg, orient] : omList_) {
|
||||
if (deg == degrees) {
|
||||
o = orient;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -51,9 +51,9 @@ uint16_t RotationMap::orientation(int32_t degrees) {
|
||||
|
||||
int32_t RotationMap::degrees(uint16_t orientation) {
|
||||
int32_t d = 0;
|
||||
for (auto&& om : omList_) {
|
||||
if (om.orientation == orientation) {
|
||||
d = om.degrees;
|
||||
for (auto&& [deg, orient] : omList_) {
|
||||
if (orient == orientation) {
|
||||
d = deg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -65,41 +65,41 @@ struct Registry {
|
||||
};
|
||||
|
||||
/// \todo Use std::unordered_map for implementing the registry. Avoid to use ImageType::none
|
||||
constexpr Registry registry[] = {
|
||||
constexpr auto registry = std::array{
|
||||
// image type creation fct type check Exif mode IPTC mode XMP mode Comment mode
|
||||
//--------------- --------------- ---------- ----------- ----------- ----------- ------------
|
||||
{ImageType::jpeg, newJpegInstance, isJpegType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
|
||||
{ImageType::exv, newExvInstance, isExvType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
|
||||
{ImageType::cr2, newCr2Instance, isCr2Type, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
{ImageType::crw, newCrwInstance, isCrwType, amReadWrite, amNone, amNone, amReadWrite},
|
||||
{ImageType::mrw, newMrwInstance, isMrwType, amRead, amRead, amRead, amNone},
|
||||
{ImageType::tiff, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
{ImageType::webp, newWebPInstance, isWebPType, amReadWrite, amNone, amReadWrite, amNone},
|
||||
{ImageType::dng, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
{ImageType::nef, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
{ImageType::pef, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
{ImageType::arw, newTiffInstance, isTiffType, amRead, amRead, amRead, amNone},
|
||||
{ImageType::rw2, newRw2Instance, isRw2Type, amRead, amRead, amRead, amNone},
|
||||
{ImageType::sr2, newTiffInstance, isTiffType, amRead, amRead, amRead, amNone},
|
||||
{ImageType::srw, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
{ImageType::orf, newOrfInstance, isOrfType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
Registry{ImageType::jpeg, newJpegInstance, isJpegType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
|
||||
Registry{ImageType::exv, newExvInstance, isExvType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
|
||||
Registry{ImageType::cr2, newCr2Instance, isCr2Type, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
Registry{ImageType::crw, newCrwInstance, isCrwType, amReadWrite, amNone, amNone, amReadWrite},
|
||||
Registry{ImageType::mrw, newMrwInstance, isMrwType, amRead, amRead, amRead, amNone},
|
||||
Registry{ImageType::tiff, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
Registry{ImageType::webp, newWebPInstance, isWebPType, amReadWrite, amNone, amReadWrite, amNone},
|
||||
Registry{ImageType::dng, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
Registry{ImageType::nef, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
Registry{ImageType::pef, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
Registry{ImageType::arw, newTiffInstance, isTiffType, amRead, amRead, amRead, amNone},
|
||||
Registry{ImageType::rw2, newRw2Instance, isRw2Type, amRead, amRead, amRead, amNone},
|
||||
Registry{ImageType::sr2, newTiffInstance, isTiffType, amRead, amRead, amRead, amNone},
|
||||
Registry{ImageType::srw, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
Registry{ImageType::orf, newOrfInstance, isOrfType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
#ifdef EXV_HAVE_LIBZ
|
||||
{ImageType::png, newPngInstance, isPngType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
|
||||
Registry{ImageType::png, newPngInstance, isPngType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
|
||||
#endif // EXV_HAVE_LIBZ
|
||||
{ImageType::pgf, newPgfInstance, isPgfType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
|
||||
{ImageType::raf, newRafInstance, isRafType, amRead, amRead, amRead, amNone},
|
||||
{ImageType::eps, newEpsInstance, isEpsType, amNone, amNone, amReadWrite, amNone},
|
||||
{ImageType::xmp, newXmpInstance, isXmpType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
{ImageType::gif, newGifInstance, isGifType, amNone, amNone, amNone, amNone},
|
||||
{ImageType::psd, newPsdInstance, isPsdType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
{ImageType::tga, newTgaInstance, isTgaType, amNone, amNone, amNone, amNone},
|
||||
{ImageType::bmp, newBmpInstance, isBmpType, amNone, amNone, amNone, amNone},
|
||||
{ImageType::jp2, newJp2Instance, isJp2Type, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
Registry{ImageType::pgf, newPgfInstance, isPgfType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
|
||||
Registry{ImageType::raf, newRafInstance, isRafType, amRead, amRead, amRead, amNone},
|
||||
Registry{ImageType::eps, newEpsInstance, isEpsType, amNone, amNone, amReadWrite, amNone},
|
||||
Registry{ImageType::xmp, newXmpInstance, isXmpType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
Registry{ImageType::gif, newGifInstance, isGifType, amNone, amNone, amNone, amNone},
|
||||
Registry{ImageType::psd, newPsdInstance, isPsdType, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
Registry{ImageType::tga, newTgaInstance, isTgaType, amNone, amNone, amNone, amNone},
|
||||
Registry{ImageType::bmp, newBmpInstance, isBmpType, amNone, amNone, amNone, amNone},
|
||||
Registry{ImageType::jp2, newJp2Instance, isJp2Type, amReadWrite, amReadWrite, amReadWrite, amNone},
|
||||
#ifdef EXV_ENABLE_BMFF
|
||||
{ImageType::bmff, newBmffInstance, isBmffType, amRead, amRead, amRead, amNone},
|
||||
Registry{ImageType::bmff, newBmffInstance, isBmffType, amRead, amRead, amRead, amNone},
|
||||
#endif // EXV_ENABLE_BMFF
|
||||
// End of list marker
|
||||
{ImageType::none, nullptr, nullptr, amNone, amNone, amNone, amNone},
|
||||
Registry{ImageType::none, nullptr, nullptr, amNone, amNone, amNone, amNone},
|
||||
};
|
||||
|
||||
std::string pathOfFileUrl(const std::string& url) {
|
||||
@ -706,8 +706,8 @@ const std::string& Image::tagName(uint16_t tag) {
|
||||
}
|
||||
|
||||
AccessMode ImageFactory::checkMode(ImageType type, MetadataId metadataId) {
|
||||
const Registry* r = find(registry, type);
|
||||
if (!r)
|
||||
auto r = std::find(registry.begin(), registry.end(), type);
|
||||
if (r == registry.end())
|
||||
throw Error(ErrorCode::kerUnsupportedImageType, static_cast<int>(type));
|
||||
AccessMode am = amNone;
|
||||
switch (metadataId) {
|
||||
@ -734,10 +734,9 @@ AccessMode ImageFactory::checkMode(ImageType type, MetadataId metadataId) {
|
||||
}
|
||||
|
||||
bool ImageFactory::checkType(ImageType type, BasicIo& io, bool advance) {
|
||||
const Registry* r = find(registry, type);
|
||||
if (r) {
|
||||
auto r = std::find(registry.begin(), registry.end(), type);
|
||||
if (r != registry.end())
|
||||
return r->isThisType_(io, advance);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -836,12 +835,11 @@ Image::UniquePtr ImageFactory::create(ImageType type) {
|
||||
|
||||
Image::UniquePtr ImageFactory::create(ImageType type, BasicIo::UniquePtr io) {
|
||||
// BasicIo instance does not need to be open
|
||||
const Registry* r = find(registry, type);
|
||||
|
||||
if (!r || type == ImageType::none) {
|
||||
if (type == ImageType::none)
|
||||
return {};
|
||||
auto r = std::find(registry.begin(), registry.end(), type);
|
||||
if (r == registry.end())
|
||||
return {};
|
||||
}
|
||||
|
||||
return r->newInstance_(std::move(io), true);
|
||||
}
|
||||
|
||||
|
||||
@ -808,51 +808,42 @@ struct NikonArrayIdx {
|
||||
#define NA ((uint32_t)-1)
|
||||
|
||||
//! Nikon binary array version lookup table
|
||||
constexpr NikonArrayIdx nikonArrayIdx[] = {
|
||||
constexpr auto nikonArrayIdx = std::array{
|
||||
// NikonSi
|
||||
{0x0091, "0208", 0, 0, 4}, // D80
|
||||
{0x0091, "0209", 0, 1, 4}, // D40
|
||||
{0x0091, "0210", 5291, 2, 4}, // D300
|
||||
{0x0091, "0210", 5303, 3, 4}, // D300, firmware version 1.10
|
||||
{0x0091, "02", 0, 4, 4}, // Other v2.* (encrypted)
|
||||
{0x0091, "01", 0, 5, NA}, // Other v1.* (not encrypted)
|
||||
NikonArrayIdx{0x0091, "0208", 0, 0, 4}, // D80
|
||||
NikonArrayIdx{0x0091, "0209", 0, 1, 4}, // D40
|
||||
NikonArrayIdx{0x0091, "0210", 5291, 2, 4}, // D300
|
||||
NikonArrayIdx{0x0091, "0210", 5303, 3, 4}, // D300, firmware version 1.10
|
||||
NikonArrayIdx{0x0091, "02", 0, 4, 4}, // Other v2.* (encrypted)
|
||||
NikonArrayIdx{0x0091, "01", 0, 5, NA}, // Other v1.* (not encrypted)
|
||||
// NikonCb
|
||||
{0x0097, "0100", 0, 0, NA},
|
||||
{0x0097, "0102", 0, 1, NA},
|
||||
{0x0097, "0103", 0, 4, NA},
|
||||
{0x0097, "0205", 0, 2, 4},
|
||||
{0x0097, "0209", 0, 5, 284},
|
||||
{0x0097, "0212", 0, 5, 284},
|
||||
{0x0097, "0214", 0, 5, 284},
|
||||
{0x0097, "02", 0, 3, 284},
|
||||
NikonArrayIdx{0x0097, "0100", 0, 0, NA}, NikonArrayIdx{0x0097, "0102", 0, 1, NA},
|
||||
NikonArrayIdx{0x0097, "0103", 0, 4, NA}, NikonArrayIdx{0x0097, "0205", 0, 2, 4},
|
||||
NikonArrayIdx{0x0097, "0209", 0, 5, 284}, NikonArrayIdx{0x0097, "0212", 0, 5, 284},
|
||||
NikonArrayIdx{0x0097, "0214", 0, 5, 284}, NikonArrayIdx{0x0097, "02", 0, 3, 284},
|
||||
// NikonLd
|
||||
{0x0098, "0100", 0, 0, NA},
|
||||
{0x0098, "0101", 0, 1, NA},
|
||||
{0x0098, "0201", 0, 1, 4},
|
||||
{0x0098, "0202", 0, 1, 4},
|
||||
{0x0098, "0203", 0, 1, 4},
|
||||
{0x0098, "0204", 0, 2, 4},
|
||||
{0x0098, "0800", 0, 3, 4}, // for e.g. Z6/7
|
||||
{0x0098, "0801", 0, 3, 4}, // for e.g. Z6/7
|
||||
NikonArrayIdx{0x0098, "0100", 0, 0, NA}, NikonArrayIdx{0x0098, "0101", 0, 1, NA},
|
||||
NikonArrayIdx{0x0098, "0201", 0, 1, 4}, NikonArrayIdx{0x0098, "0202", 0, 1, 4},
|
||||
NikonArrayIdx{0x0098, "0203", 0, 1, 4}, NikonArrayIdx{0x0098, "0204", 0, 2, 4},
|
||||
NikonArrayIdx{0x0098, "0800", 0, 3, 4}, // for e.g. Z6/7
|
||||
NikonArrayIdx{0x0098, "0801", 0, 3, 4}, // for e.g. Z6/7
|
||||
// NikonFl
|
||||
{0x00a8, "0100", 0, 0, NA},
|
||||
{0x00a8, "0101", 0, 0, NA},
|
||||
{0x00a8, "0102", 0, 1, NA},
|
||||
{0x00a8, "0103", 0, 2, NA},
|
||||
{0x00a8, "0104", 0, 2, NA},
|
||||
{0x00a8, "0105", 0, 2, NA},
|
||||
{0x00a8, "0107", 0, 3, NA},
|
||||
{0x00a8, "0108", 0, 3, NA},
|
||||
NikonArrayIdx{0x00a8, "0100", 0, 0, NA}, NikonArrayIdx{0x00a8, "0101", 0, 0, NA},
|
||||
NikonArrayIdx{0x00a8, "0102", 0, 1, NA}, NikonArrayIdx{0x00a8, "0103", 0, 2, NA},
|
||||
NikonArrayIdx{0x00a8, "0104", 0, 2, NA}, NikonArrayIdx{0x00a8, "0105", 0, 2, NA},
|
||||
NikonArrayIdx{0x00a8, "0107", 0, 3, NA}, NikonArrayIdx{0x00a8, "0108", 0, 3, NA},
|
||||
// NikonAf
|
||||
{0x00b7, "0100", 30, 0, NA}, // These sizes have been found in tiff headers of MN
|
||||
{0x00b7, "0101", 84, 1, NA}, // tag 0xb7 in sample image metadata for each version
|
||||
NikonArrayIdx{0x00b7, "0100", 30, 0, NA}, // These sizes have been found in tiff headers of MN
|
||||
NikonArrayIdx{0x00b7, "0101", 84, 1, NA}, // tag 0xb7 in sample image metadata for each version
|
||||
};
|
||||
|
||||
int nikonSelector(uint16_t tag, const byte* pData, size_t size, TiffComponent* const /*pRoot*/) {
|
||||
if (size < 4)
|
||||
return -1;
|
||||
const NikonArrayIdx* aix = find(nikonArrayIdx, NikonArrayIdx::Key(tag, reinterpret_cast<const char*>(pData), size));
|
||||
return aix ? aix->idx_ : -1;
|
||||
for (auto&& aix : nikonArrayIdx)
|
||||
if (aix == NikonArrayIdx::Key(tag, reinterpret_cast<const char*>(pData), size))
|
||||
return aix.idx_;
|
||||
return -1;
|
||||
}
|
||||
|
||||
DataBuf nikonCrypt(uint16_t tag, const byte* pData, size_t size, TiffComponent* const pRoot) {
|
||||
@ -860,8 +851,9 @@ DataBuf nikonCrypt(uint16_t tag, const byte* pData, size_t size, TiffComponent*
|
||||
|
||||
if (size < 4)
|
||||
return buf;
|
||||
const NikonArrayIdx* nci = find(nikonArrayIdx, NikonArrayIdx::Key(tag, reinterpret_cast<const char*>(pData), size));
|
||||
if (!nci || nci->start_ == NA || size <= nci->start_)
|
||||
auto nci = std::find(nikonArrayIdx.begin(), nikonArrayIdx.end(),
|
||||
NikonArrayIdx::Key(tag, reinterpret_cast<const char*>(pData), size));
|
||||
if (nci == nikonArrayIdx.end() || nci->start_ == NA || size <= nci->start_)
|
||||
return buf;
|
||||
|
||||
// Find Exif.Nikon3.ShutterCount
|
||||
|
||||
@ -1625,19 +1625,11 @@ static std::ostream& resolveLens0xffff(std::ostream& os, const Value& value, con
|
||||
return EXV_PRINT_TAG(minoltaSonyLensID)(os, value, metadata);
|
||||
}
|
||||
|
||||
struct LensIdFct {
|
||||
uint32_t id_; //!< Lens id
|
||||
PrintFct fct_; //!< Pretty-print function
|
||||
//! Comparison operator for find template
|
||||
bool operator==(uint32_t id) const {
|
||||
return id_ == id;
|
||||
}
|
||||
};
|
||||
|
||||
using LensIdFct = std::pair<uint32_t, PrintFct>;
|
||||
//! List of lens ids which require special treatment from printMinoltaSonyLensID
|
||||
const LensIdFct lensIdFct[] = {
|
||||
{0x001c, resolveLens0x1c}, {0x0029, resolveLens0x29}, {0x0034, resolveLens0x34},
|
||||
{0x0080, resolveLens0x80}, {0x00ff, resolveLens0xff}, {0xffff, resolveLens0xffff},
|
||||
constexpr auto lensIdFct = std::array{
|
||||
LensIdFct(0x001c, resolveLens0x1c), LensIdFct(0x0029, resolveLens0x29), LensIdFct(0x0034, resolveLens0x34),
|
||||
LensIdFct(0x0080, resolveLens0x80), LensIdFct(0x00ff, resolveLens0xff), LensIdFct(0xffff, resolveLens0xffff),
|
||||
// { 0x00ff, resolveLensTypeUsingExiftool }, // was used for debugging
|
||||
};
|
||||
// #1145 end - respect lenses with shared LensID
|
||||
@ -1657,12 +1649,9 @@ std::ostream& printMinoltaSonyLensID(std::ostream& os, const Value& value, const
|
||||
|
||||
// #1145 - respect lenses with shared LensID
|
||||
uint32_t index = value.toUint32();
|
||||
const LensIdFct* lif = find(lensIdFct, index);
|
||||
if (lif && metadata) {
|
||||
if (lif->fct_)
|
||||
return lif->fct_(os, value, metadata);
|
||||
}
|
||||
|
||||
for (auto&& [idx, fct] : lensIdFct)
|
||||
if (metadata && idx == index && fct)
|
||||
return fct(os, value, metadata);
|
||||
return EXV_PRINT_TAG(minoltaSonyLensID)(os, value, metadata);
|
||||
}
|
||||
|
||||
|
||||
@ -9,6 +9,8 @@
|
||||
#include "types.hpp"
|
||||
#include "value.hpp"
|
||||
|
||||
#include <array>
|
||||
|
||||
// *****************************************************************************
|
||||
// class member definitions
|
||||
namespace Exiv2::Internal {
|
||||
@ -1237,11 +1239,12 @@ struct LensIdFct {
|
||||
};
|
||||
|
||||
//! List of lens ids which require special treatment using resolveLensType
|
||||
const LensIdFct lensIdFct[] = {
|
||||
{0x0317, resolveLensType}, {0x0319, resolveLens0x319}, {0x031b, resolveLensType}, {0x031c, resolveLensType},
|
||||
{0x031d, resolveLensType}, {0x031f, resolveLensType}, {0x0329, resolveLensType}, {0x032c, resolveLens0x32c},
|
||||
{0x032e, resolveLensType}, {0x0334, resolveLensType}, {0x03ff, resolveLens0x3ff}, {0x041a, resolveLensType},
|
||||
{0x042d, resolveLensType}, {0x08ff, resolveLens0x8ff},
|
||||
constexpr auto lensIdFct = std::array{
|
||||
LensIdFct{0x0317, resolveLensType}, LensIdFct{0x0319, resolveLens0x319}, LensIdFct{0x031b, resolveLensType},
|
||||
LensIdFct{0x031c, resolveLensType}, LensIdFct{0x031d, resolveLensType}, LensIdFct{0x031f, resolveLensType},
|
||||
LensIdFct{0x0329, resolveLensType}, LensIdFct{0x032c, resolveLens0x32c}, LensIdFct{0x032e, resolveLensType},
|
||||
LensIdFct{0x0334, resolveLensType}, LensIdFct{0x03ff, resolveLens0x3ff}, LensIdFct{0x041a, resolveLensType},
|
||||
LensIdFct{0x042d, resolveLensType}, LensIdFct{0x08ff, resolveLens0x8ff},
|
||||
};
|
||||
|
||||
//! A lens id and a pretty-print function for special treatment of the id.
|
||||
@ -1256,17 +1259,13 @@ std::ostream& printLensType(std::ostream& os, const Value& value, const ExifData
|
||||
const auto index = value.toUint32(0) * 256 + value.toUint32(1);
|
||||
|
||||
// std::cout << std::endl << "printLensType value =" << value.toLong() << " index = " << index << std::endl;
|
||||
const LensIdFct* lif = find(lensIdFct, index);
|
||||
if (!lif) {
|
||||
auto lif = std::find(lensIdFct.begin(), lensIdFct.end(), index);
|
||||
if (lif == lensIdFct.end())
|
||||
return EXV_PRINT_COMBITAG_MULTI(pentaxLensType, 2, 1, 2)(os, value, metadata);
|
||||
}
|
||||
if (metadata && lif->fct_) {
|
||||
if (metadata && lif->fct_)
|
||||
return lif->fct_(os, value, metadata);
|
||||
}
|
||||
|
||||
if (value.typeId() != unsignedShort || value.count() == 0)
|
||||
return os << "(" << value << ")";
|
||||
|
||||
return os << value;
|
||||
}
|
||||
|
||||
|
||||
@ -43,20 +43,12 @@ TiffImage::TiffImage(BasicIo::UniquePtr io, bool /*create*/) :
|
||||
} // TiffImage::TiffImage
|
||||
|
||||
//! Structure for TIFF compression to MIME type mappings
|
||||
struct MimeTypeList {
|
||||
//! Comparison operator for compression
|
||||
bool operator==(int compression) const {
|
||||
return compression_ == compression;
|
||||
}
|
||||
int compression_; //!< TIFF compression
|
||||
const char* mimeType_; //!< MIME type
|
||||
};
|
||||
|
||||
using MimeTypeList = std::pair<int, const char*>;
|
||||
//! List of TIFF compression to MIME type mappings
|
||||
constexpr auto mimeTypeList = std::array{
|
||||
MimeTypeList{32770, "image/x-samsung-srw"},
|
||||
MimeTypeList{34713, "image/x-nikon-nef"},
|
||||
MimeTypeList{65535, "image/x-pentax-pef"},
|
||||
MimeTypeList(32770, "image/x-samsung-srw"),
|
||||
MimeTypeList(34713, "image/x-nikon-nef"),
|
||||
MimeTypeList(65535, "image/x-pentax-pef"),
|
||||
};
|
||||
|
||||
std::string TiffImage::mimeType() const {
|
||||
@ -67,9 +59,10 @@ std::string TiffImage::mimeType() const {
|
||||
std::string key = "Exif." + primaryGroup() + ".Compression";
|
||||
auto md = exifData_.findKey(ExifKey(key));
|
||||
if (md != exifData_.end() && md->count() > 0) {
|
||||
auto i = std::find(mimeTypeList.begin(), mimeTypeList.end(), static_cast<int>(md->toInt64()));
|
||||
if (i != mimeTypeList.end())
|
||||
mimeType_ = std::string(i->mimeType_);
|
||||
for (auto&& [comp, type] : mimeTypeList)
|
||||
if (comp == static_cast<int>(md->toInt64())) {
|
||||
mimeType_ = type;
|
||||
}
|
||||
}
|
||||
return mimeType_;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user