use erase remove

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Exiv2 · Jan 6, 2025 · d13712e · d13712e
1 parent a2b6d6d
commit d13712e
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/exif.cpp b/src/exif.cpp
@@ -644,16 +644,10 @@ WriteMethod ExifParser::encode(Blob& blob, const byte* pData, size_t size, ByteO
   }
 
   // Delete unknown tags larger than 4kB and known tags larger than 20kB.
-  for (auto tag_iter = exifData.begin(); tag_iter != exifData.end();) {
-    if ((tag_iter->size() > 4096 && tag_iter->tagName().substr(0, 2) == "0x") || tag_iter->size() > 20480) {
-#ifndef SUPPRESS_WARNINGS
-      EXV_WARNING << "Exif tag " << tag_iter->key() << " not encoded\n";
-#endif
-      tag_iter = exifData.erase(tag_iter);
-    } else {
-      ++tag_iter;
-    }
-  }
+  auto f = [](const auto& tag) {
+    return (tag.size() > 4096 && tag.tagName().substr(0, 2) == "0x") || tag.size() > 20480;
+  };
+  exifData.erase(std::remove_if(exifData.begin(), exifData.end(), f), exifData.end());
 
   // Encode the remaining Exif tags again, don't care if it fits this time
   MemIo mio2;