Merge pull request #437 from kiwix/count-webp-media

More robust getMediaCount()
kiwix · Jan 3, 2021 · 18afa97 · 18afa97
2 parents 2659f32 + 44c4aa9
commit 18afa97
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/src/reader.cpp b/src/reader.cpp
@@ -120,20 +120,12 @@ unsigned int Reader::getMediaCount() const
       = this->parseCounterMetadata();
   unsigned int counter = 0;
 
-  auto it = counterMap.find("image/jpeg");
-  if (it != counterMap.end()) {
-    counter += it->second;
-  }
-
-  it = counterMap.find("image/gif");
-  if (it != counterMap.end()) {
-    counter += it->second;
+  for (auto &pair:counterMap) {
+    if (startsWith(pair.first, "image/")) {
+      counter += pair.second;
+    }
   }
 
-  it = counterMap.find("image/png");
-  if (it != counterMap.end()) {
-    counter += it->second;
-  }
   return counter;
 }