Use pov_base::UCS2toSysString instead of own function.

Author: mlsomers

source/parser/ImageCache.cpp

@@ -37,8 +37,6 @@
 
 // C++ variants of C standard header files
 #include <map>
-#include <uchar.h>
-#include <cstring>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -59,6 +57,7 @@
 #include "base/textstream_fwd.h"
 #include "base/textstreambuffer.h"
 #include "base/image/image_fwd.h"
+#include "base/stringutilities.h"
 
 // this must be the last file included
 #include "base/povdebug.h"
@@ -68,9 +67,7 @@ namespace pov_image_cache
 {
 	using namespace pov_base;
 	using namespace std;
-	static inline std::string U16toString(const std::u16string& wstr);
-	static inline char* StrToChar(const std::string str);
-	static inline char* U16toChar(const std::u16string& wstr);
+	//static inline char* StrToChar(const std::string str);
 
 	struct ImageCacheEntry final
 	{
@@ -83,22 +80,20 @@ namespace pov_image_cache
 	// Gets the last modified time from the filesystem
 	__time64_t GetLastModifiedTime(const std::string filename)
 	{
-		char* cstrFilename = StrToChar(filename);
+		const char* cstrFilename = filename.c_str();
 
 		struct stat result;
 		if (stat(cstrFilename, &result) == 0)
 		{
-			delete cstrFilename;
 			return result.st_mtime;
 		}
-		delete cstrFilename;
 		return 0;
 	}
 
 	// Try to get the image from the cache
 	Image* GetCachedImage(const UCS2* filename)
 	{
-		std::string lookupFilename = U16toString(filename);
+		std::string lookupFilename = pov_base::UCS2toSysString(filename);
 
 		std::map<std::string, ImageCacheEntry>::iterator idx = Cache.find(lookupFilename);
 		if (idx != Cache.end()) 
@@ -118,7 +113,7 @@ namespace pov_image_cache
 	// Store a new image into cache
 	void StoreImageInCache(const UCS2* filename, Image* image)
 	{
-		std::string lookupFilename = U16toString(filename);
+		std::string lookupFilename = pov_base::UCS2toSysString(filename);
 		__time64_t lastModified = GetLastModifiedTime(lookupFilename);
 		Cache[lookupFilename] = ImageCacheEntry{ image = image, lastModified = lastModified };
 	}
@@ -136,31 +131,4 @@ namespace pov_image_cache
 			Cache.erase(it);
 		}
 	}
-
-	static inline std::string U16toString(const std::u16string& wstr) 
-	{
-		std::string str = "";
-		char cstr[3] = "\0";
-		mbstate_t mbs;
-		for (const auto& it : wstr) {
-			memset(&mbs, 0, sizeof(mbs));//set shift state to the initial state
-			memmove(cstr, "\0\0\0", 3);
-			c16rtomb(cstr, it, &mbs);
-			str.append(std::string(cstr));
-		}//for
-		return str;
-	}
-
-	static inline char* StrToChar(const std::string str) 
-	{
-		char* cstring = new char[str.length() + 1];
-		strcpy(cstring, str.c_str());
-		return cstring;
-	}
-
-	static inline char* U16toChar(const std::u16string& wstr) 
-	{
-		return StrToChar(U16toString(wstr));
-	}
-
 }