clazy: remove some non-POD statics

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

src/asfvideo.cpp

@@ -70,7 +70,14 @@ bool AsfVideo::GUIDTag::operator<(const GUIDTag& other) const {
 
 constexpr AsfVideo::GUIDTag Header(0x75B22630, 0x668E, 0x11CF, {0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C});
 
-const std::map<AsfVideo::GUIDTag, std::string> GUIDReferenceTags = {
+constexpr struct tags {
+  AsfVideo::GUIDTag first;
+  std::string_view second;
+
+  bool operator==(const AsfVideo::GUIDTag& tag) const {
+    return first == tag;
+  };
+} GUIDReferenceTags[] = {
     //!< Top-level ASF object GUIDS
     {Header, "Header"},
     {{0x75B22636, 0x668E, 0x11CF, {0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C}}, "Data"},
@@ -231,9 +238,8 @@ void AsfVideo::decodeBlock() {
            << "\tsize= " << objectHeader.getSize() << "\t " << io_->tell() << "/" << io_->size() << '\n';
 #endif
   Internal::enforce(objectHeader.getSize() <= io_->size() - io_->tell(), Exiv2::ErrorCode::kerCorruptedMetadata);
-  auto tag = GUIDReferenceTags.find(GUIDTag(objectHeader.getId().data()));
 
-  if (tag != GUIDReferenceTags.end()) {
+  if (auto tag = Exiv2::find(GUIDReferenceTags, GUIDTag(objectHeader.getId().data()))) {
     if (tag->second == "Header")
       decodeHeader();
     else if (tag->second == "File_Properties")
@@ -339,8 +345,7 @@ void AsfVideo::streamProperties() {
   enum class streamTypeInfo { Audio = 1, Video = 2 };
   auto stream = streamTypeInfo{0};
 
-  auto tag_stream_type = GUIDReferenceTags.find(GUIDTag(streamTypedBuf.data()));
-  if (tag_stream_type != GUIDReferenceTags.end()) {
+  if (auto tag_stream_type = Exiv2::find(GUIDReferenceTags, GUIDTag(streamTypedBuf.data()))) {
     if (tag_stream_type->second == "Audio_Media")
       stream = streamTypeInfo::Audio;
     else if (tag_stream_type->second == "Video_Media")

src/image.cpp

@@ -129,6 +129,12 @@ std::string pathOfFileUrl(const std::string& url) {
 }
 #endif
 
+bool typeValid(uint16_t type) {
+  return type >= 1 && type <= 13;
+}
+
+std::set<size_t> visits;  // #547
+
 }  // namespace
 
 // *****************************************************************************
@@ -305,12 +311,6 @@ const char* Image::typeName(uint16_t tag) {
   return result;
 }
 
-static bool typeValid(uint16_t type) {
-  return type >= 1 && type <= 13;
-}
-
-static std::set<size_t> visits;  // #547
-
 void Image::printIFDStructure(BasicIo& io, std::ostream& out, Exiv2::PrintStructureOption option, size_t start,
                               bool bSwap, char c, size_t depth) {
   if (depth == 1)

src/riffvideo.cpp

@@ -16,9 +16,16 @@
 
 #include <array>
 
-namespace Exiv2::Internal {
+namespace {
 
-const std::map<std::string, std::string> infoTags = {
+constexpr struct tags {
+  std::string_view first;
+  const char* second;
+
+  bool operator==(std::string_view tag) const {
+    return tag == first;
+  };
+} infoTags[] = {
     {"AGES", "Xmp.video.Rated"},
     {"CMNT", "Xmp.video.Comment"},
     {"CODE", "Xmp.video.EncodedBy"},
@@ -105,7 +112,14 @@ const std::map<std::string, std::string> infoTags = {
     {"YEAR", "Xmp.video.Year"},
 };
 
-const std::map<uint16_t, std::string> audioEncodingValues = {
+constexpr struct encoding {
+  uint16_t first;
+  std::string_view second;
+
+  bool operator==(uint16_t tag) const {
+    return tag = first;
+  };
+} audioEncodingValues[] = {
     {0x1, "Microsoft PCM"},
     {0x2, "Microsoft ADPCM"},
     {0x3, "Microsoft IEEE float"},
@@ -351,7 +365,7 @@ const std::map<uint16_t, std::string> audioEncodingValues = {
     {0xffff, "Development"},
 };
 
-}  // namespace Exiv2::Internal
+}  // namespace
 // *****************************************************************************
 // class member definitions
 
@@ -625,7 +639,7 @@ void RiffVideo::readStreamFormat(uint64_t size_) {
       xmpData_["Xmp.video.NumIfImpColours"] = "All";
   } else if (streamType_ == Audio) {
     uint16_t format_tag = readWORDTag(io_);
-    if (auto it = Internal::audioEncodingValues.find(format_tag); it != Internal::audioEncodingValues.end())
+    if (auto it = Exiv2::find(audioEncodingValues, format_tag))
       xmpData_["Xmp.audio.Compressor"] = it->second;
     else
       xmpData_["Xmp.audio.Compressor"] = format_tag;
@@ -657,7 +671,7 @@ void RiffVideo::readInfoListChunk(uint64_t size_) {
     std::string type = readStringTag(io_);
     size_t size = readDWORDTag(io_);
     std::string content = readStringTag(io_, size);
-    if (auto it = Internal::infoTags.find(type); it != Internal::infoTags.end())
+    if (auto it = Exiv2::find(infoTags, type))
       xmpData_[it->second] = content;
     current_size += DWORD * 2;
     current_size += size;