Use better method to determine the format from the file name.

diff --git a/Magick++/fuzz/encoder_format.h b/Magick++/fuzz/encoder_format.h
index 3f214b1966212d94c81d6cbc1d91659be2033b04..9d72179c947e830e6a8cbe74a3989521b15e0140 100644 (file)
--- a/Magick++/fuzz/encoder_format.h
+++ b/Magick++/fuzz/encoder_format.h
@@ -1,10 +1,21 @@
 class EncoderFormat {
 public:
   std::string get() { return std::string(_format.begin(), _format.end()); } const
-  void set(const std::wstring format)
+  void set(const std::wstring fileName)
   {
-    if (format.length() > 1)
-      _format = format.substr(1, format.size() - 1);
+    std::wstring format=fileName;
+
+    size_t index = format.find(L"_", 0);
+    if (index != std::wstring::npos) {
+      format=format.substr(index + 1);
+      index = format.find(L"_", 0);
+      if (index != std::wstring::npos) {
+        _format=format.substr(0, index);
+        return;
+      }
+    }
+
+    throw std::invalid_argument("fileName");
   }
 private:
   std::wstring _format = L".notset";

diff --git a/Magick++/fuzz/main.cc b/Magick++/fuzz/main.cc
index 31cf37e3e8b9e34daaa38da43062ba57285f78f6..bfc3e7092de3deb7aa29cbbc5385d0c3fcca4e03 100644 (file)
--- a/Magick++/fuzz/main.cc
+++ b/Magick++/fuzz/main.cc
@@ -35,7 +35,7 @@ public:
     file.read(_data, size);
     file.close();
 
-    encoderFormat.set(wstring(PathFindExtension(fileName.c_str())));
+    encoderFormat.set(fileName);
 
     return(true);
   }