Merge pull request #2504 from neheb/r

fixes
2023-02-10 10:07:32 -08:00 · 2023-02-10 10:07:32 -08:00 · 4bdee6f4a4
commit 4bdee6f4a4
parent aa16a54a7f dee0598edf
4 changed files with 59 additions and 73 deletions
--- a/include/exiv2/riffvideo.hpp
+++ b/include/exiv2/riffvideo.hpp
@ -44,7 +44,7 @@ class EXIV2API RiffVideo : public Image {

 protected:
  class HeaderReader {
-    std::string id_ = "";
+    std::string id_;
    uint64_t size_ = 0;

   public:
@ -54,7 +54,7 @@ class EXIV2API RiffVideo : public Image {
      return size_;
    }

-    [[nodiscard]] std::string& getId() {
+    [[nodiscard]] const std::string& getId() const {
      return id_;
    }
  };
@ -66,7 +66,7 @@ class EXIV2API RiffVideo : public Image {
  void decodeBlocks();

 private:
-  bool equal(const std::string& str1, const std::string& str2);
+  static bool equal(const std::string& str1, const std::string& str2);

  /*!
  @brief Interpret MainAVIHeader (avih) structure, and save it in the respective XMP container.
@ -130,7 +130,7 @@ class EXIV2API RiffVideo : public Image {
 */
  void readJunk(uint64_t size_);

-  std::string getStreamType(uint32_t stream);
+  static std::string getStreamType(uint32_t stream);
  /*!
   @brief Calculates Duration of a video, and stores it in the respective XMP container.
   @param frame_rate Frame rate of the video.
--- a/src/image.cpp
+++ b/src/image.cpp
@ -73,46 +73,46 @@ struct Registry {
 };

 /// \todo Use std::unordered_map for implementing the registry. Avoid to use ImageType::none
-constexpr auto registry = std::array{
+constexpr Registry registry[] = {
    // image type       creation fct     type check  Exif mode    IPTC mode    XMP mode     Comment mode
    //---------------  ---------------  ----------  -----------  -----------  -----------  ------------
-    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},
+    {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},
 #ifdef EXV_HAVE_LIBZ
-    Registry{ImageType::png, newPngInstance, isPngType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
+    {ImageType::png, newPngInstance, isPngType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
 #endif  // EXV_HAVE_LIBZ
-    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},
+    {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},
 // needs to be before bmff because some ftyp files are handled as qt and
 // the rest should fall through to bmff
 #ifdef EXV_ENABLE_VIDEO
-    Registry{ImageType::qtime, newQTimeInstance, isQTimeType, amRead, amNone, amRead, amNone},
-    Registry{ImageType::asf, newAsfInstance, isAsfType, amRead, amNone, amRead, amNone},
-    Registry{ImageType::riff, newRiffInstance, isRiffType, amRead, amNone, amRead, amNone},
-    Registry{ImageType::mkv, newMkvInstance, isMkvType, amRead, amNone, amRead, amNone},
+    {ImageType::qtime, newQTimeInstance, isQTimeType, amRead, amNone, amRead, amNone},
+    {ImageType::asf, newAsfInstance, isAsfType, amRead, amNone, amRead, amNone},
+    {ImageType::riff, newRiffInstance, isRiffType, amRead, amNone, amRead, amNone},
+    {ImageType::mkv, newMkvInstance, isMkvType, amRead, amNone, amRead, amNone},
 #endif  // EXV_ENABLE_VIDEO
 #ifdef EXV_ENABLE_BMFF
-    Registry{ImageType::bmff, newBmffInstance, isBmffType, amRead, amRead, amRead, amNone},
+    {ImageType::bmff, newBmffInstance, isBmffType, amRead, amRead, amRead, amNone},
 #endif  // EXV_ENABLE_BMFF
 };

@ -730,38 +730,29 @@ const std::string& Image::tagName(uint16_t tag) {
 }

 AccessMode ImageFactory::checkMode(ImageType type, MetadataId metadataId) {
-  auto r = std::find(registry.begin(), registry.end(), type);
-  if (r == registry.end())
+  auto r = Exiv2::find(registry, type);
+  if (!r)
    throw Error(ErrorCode::kerUnsupportedImageType, static_cast<int>(type));
-  AccessMode am = amNone;
  switch (metadataId) {
-    case mdNone:
-      break;
    case mdExif:
-      am = r->exifSupport_;
-      break;
+      return r->exifSupport_;
    case mdIptc:
-      am = r->iptcSupport_;
-      break;
+      return r->iptcSupport_;
    case mdXmp:
-      am = r->xmpSupport_;
-      break;
+      return r->xmpSupport_;
    case mdComment:
-      am = r->commentSupport_;
-      break;
-    case mdIccProfile:
-      break;
-
-      // no default: let the compiler complain
+      return r->commentSupport_;
+    default:
+      return amNone;
  }
-  return am;
+  return {};
 }

 bool ImageFactory::checkType(ImageType type, BasicIo& io, bool advance) {
-  auto r = std::find(registry.begin(), registry.end(), type);
-  if (r != registry.end())
-    return r->isThisType_(io, advance);
-  return false;
+  auto r = Exiv2::find(registry, type);
+  if (!r)
+    return false;
+  return r->isThisType_(io, advance);
 }

 ImageType ImageFactory::getType(const std::string& path) {
@ -859,8 +850,8 @@ Image::UniquePtr ImageFactory::create(ImageType type, BasicIo::UniquePtr io) {
  // BasicIo instance does not need to be open
  if (type == ImageType::none)
    return {};
-  auto r = std::find(registry.begin(), registry.end(), type);
-  if (r == registry.end())
+  auto r = Exiv2::find(registry, type);
+  if (!r)
    return {};
  return r->newInstance_(std::move(io), true);
 }
--- a/src/makernote_int.cpp
+++ b/src/makernote_int.cpp
@ -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;

--- a/src/riffvideo.cpp
+++ b/src/riffvideo.cpp
@ -12,6 +12,7 @@
 #include "error.hpp"
 #include "futils.hpp"
 #include "helper_functions.hpp"
+#include "utils.hpp"

 namespace Exiv2::Internal {

@ -397,10 +398,8 @@ RiffVideo::HeaderReader::HeaderReader(BasicIo::UniquePtr& io) {
 bool RiffVideo::equal(const std::string& str1, const std::string& str2) {
  if (str1.size() != str2.size())
    return false;
-  for (size_t i = 0; i < str1.size(); i++)
-    if (toupper(str1[i]) != str2[i])
-      return false;
-  return true;
+
+  return Internal::upper(str1) == str2;
 }

 void RiffVideo::readList(HeaderReader& header_) {
@ -741,14 +740,13 @@ void RiffVideo::readJunk(uint64_t size_) {
 std::string RiffVideo::getStreamType(uint32_t stream) {
  if (stream == 1)
    return "Mono";
-  else if (stream == 2)
+  if (stream == 2)
    return "Stereo";
-  else if (stream == 5)
+  if (stream == 5)
    return "5.1 Surround Sound";
-  else if (stream == 7)
+  if (stream == 7)
    return "7.1 Surround Sound";
-  else
-    return "Mono";
+  return "Mono";
 }

 void RiffVideo::fillDuration(double frame_rate, size_t frame_count) {