MMVII: GDAL: Driver choice for new image

MMVII/include/MMVII_util.h

@@ -89,7 +89,7 @@ std::string Postfix(const std::string & aStr,char aSep='.',bool SVP=false,bool P
 std::string LastPostfix(const std::string & aStr,char aSep='.'); ///< No error:  a=> ""  a.b.c => "c"
 
 bool starts_with(const std::string & aFullStr,const std::string & aBegining); /// as c++20  std::string.starts_with
-bool ends_with(const std::string & aFullStr,const std::string & aEnding); /// as c++20  std::string.starts_with TO IMPLEMENT
+bool ends_with(const std::string & aFullStr,const std::string & aEnding); /// as c++20  std::string.ends_with
 bool contains(const std::string & aFullStr,const std::string & aEnding); /// as c++23  std::string.contains TO IMPLEMENT
 
 // Direcytory and files names, Rely on std::filesystem

MMVII/src/ImagesBase/FileImages.cpp

@@ -60,25 +60,15 @@ namespace{ // Private
 
    std::string ExtToGdalDriver( std::string aName )
    {
-         // Return gdal driver in function of extension of aName
-
-         std::vector<string> strings;
-         std::string s;  
-         char delimiter = '.';
-         std::istringstream iss(aName);
-
-         while (std::getline(iss, s, delimiter)) {
-            strings.push_back(s);
-         }
-
-         // Add other gdal driver here
-         std::string aDriver ;
-         if (strings.back() == "tif")
-         {
-            aDriver = "GTiff";
-         }
-
-         return aDriver;
+        auto aLowerName = ToLower(aName);
+        if (ends_with(aLowerName,".tif") || ends_with(aLowerName,".tiff"))
+            return "GTiff";
+        if (ends_with(aLowerName,".jpg") || ends_with(aLowerName,".jpeg"))
+            return "JPEG";
+        if (ends_with(aLowerName,".png"))
+            return "PNG";
+        MMVII_INTERNAL_ERROR("MMVIITOGDal: Unsupported image format for " + aName);
+         return "";
    }
 
 

MMVII/src/Utils/uti_string.cpp

@@ -660,6 +660,16 @@ bool starts_with(const std::string & aFullStr,const std::string & aPrefix)
     return anItPref==aPrefix.end();
 }
 
+bool ends_with(const std::string & aFullStr,const std::string & aEnding)
+{
+    if (aFullStr.size() < aEnding.size())
+        return false;
+    auto it = aEnding.begin();
+    return std::all_of(std::next(aFullStr.begin(),aFullStr.size()-aEnding.size()), aFullStr.end(),
+                       [&it](const char& c) { return c == *(it++);});
+
+}
+
 bool IsPrefixed(const std::string & aStr,char aSep)
 {
 	return aStr.find(aSep) != std::string::npos;