ofPathToString to try / catch errors if wstring has impossible characters (#7799)

#changelog #filesystem

Author: dimitre

apps/projectGenerator

@@ -1377,7 +1377,7 @@ void ofAppGLFWWindow::drop_cb(GLFWwindow * windowP_, int numFiles, const char **
 	drag.position = { instance->events().getMouseX(), instance->events().getMouseY() };
 	drag.files.resize(numFiles);
 	for (int i = 0; i < (int)drag.files.size(); i++) {
-		drag.files[i] = of::filesystem::path(dropString[i]).string();
+		drag.files[i] = dropString[i];
 	}
 	instance->events().notifyDragEvent(drag);
 }

libs/openFrameworks/app/ofAppGLFWWindow.cpp

@@ -107,7 +107,7 @@ enum ofKey{
 //-----------------------------------------------
 class ofDragInfo {
 public:
-	std::vector<std::string> files;
+	std::vector<of::filesystem::path> files;
 	glm::vec2 position;
 };
 

libs/openFrameworks/events/ofEvents.h

@@ -198,7 +198,12 @@ ofShader & ofShader::operator=(ofShader && mom) {
 
 //--------------------------------------------------------------
 bool ofShader::load(const of::filesystem::path & shaderName) {
-    return load(shaderName.string() + ".vert", shaderName.string() + ".frag");
+	auto vertFile = shaderName;
+	auto fragFile = shaderName;
+	vertFile += ".vert";
+	fragFile += ".frag";
+//    return load(shaderName + ".vert", shaderName + ".frag");
+	return load(vertFile, fragFile);
 }
 
 //--------------------------------------------------------------

libs/openFrameworks/gl/ofShader.cpp

@@ -199,7 +199,7 @@ template<typename PixelType>
 static bool loadImage(ofPixels_<PixelType> & pix, const of::filesystem::path & _fileName, const ofImageLoadSettings & settings){
 	ofInitFreeImage();
 
-	auto uriStr = _fileName.string();
+	auto uriStr = ofPathToString(_fileName);
 	UriUriA uri;
 	UriParserStateA state;
 	state.uri = &uri;
@@ -222,7 +222,7 @@ static bool loadImage(ofPixels_<PixelType> & pix, const of::filesystem::path & _
 	uriFreeUriMembersA(&uri);
 
 	if(scheme == "http" || scheme == "https"){
-		return ofLoadImage(pix, ofLoadURL(_fileName.string()).data);
+		return ofLoadImage(pix, ofLoadURL(ofPathToString(_fileName)).data);
 	}
 
 	auto fileName = ofToDataPathFS(_fileName, true);

libs/openFrameworks/graphics/ofImage.cpp

@@ -370,10 +370,10 @@ static string linuxFontPathByName(const string & fontname){
 #endif
 
 //-----------------------------------------------------------
-// FIXME: it makes no sense to have _fontname and filename if filename will be rewritten inside this function
-static bool loadFontFace(const of::filesystem::path& _fontname, FT_Face & face, of::filesystem::path & filename, int index){
+// FIXME: it seems first parameter is string because it represents the font name only
+static bool loadFontFace(const of::filesystem::path & _fontname, FT_Face & face, of::filesystem::path & filename, int index){
 	auto fontname = _fontname;
-	filename = ofToDataPathFS(_fontname,true);
+	filename = ofToDataPathFS(_fontname, true);
 	int fontID = index;
 	if(!of::filesystem::exists(filename)){
 #ifdef TARGET_LINUX
@@ -403,7 +403,7 @@ static bool loadFontFace(const of::filesystem::path& _fontname, FT_Face & face,
 			fontname = "Courier New";
 		}
 		// FIXME: fs::path in input and output
-		filename = winFontPathByName(fontname.string());
+		filename = winFontPathByName(ofPathToString(fontname));
 #endif
 		if(filename == "" ){
 			ofLogError("ofTrueTypeFont") << "loadFontFace(): couldn't find font " << fontname;
@@ -412,7 +412,7 @@ static bool loadFontFace(const of::filesystem::path& _fontname, FT_Face & face,
 		ofLogVerbose("ofTrueTypeFont") << "loadFontFace(): " << fontname << " not a file in data loading system font from " << filename;
 	}
 	FT_Error err;
-	err = FT_New_Face( library, filename.string().c_str(), fontID, &face );
+	err = FT_New_Face( library, ofPathToString(filename).c_str(), fontID, &face );
 	if (err) {
 		// simple error table in lieu of full table (see fterrors.h)
 		string errorString = "unknown freetype";

libs/openFrameworks/graphics/ofTrueTypeFont.cpp

@@ -189,7 +189,7 @@ ofMediaFoundationSoundPlayer::~ofMediaFoundationSoundPlayer() {
 bool ofMediaFoundationSoundPlayer::load(const of::filesystem::path& fileName, bool stream) {
     unload();
 
-    std::string fileStr = fileName.string();
+    std::string fileStr = ofPathToString(fileName);
     bool bStream = false;
     bStream = bStream || ofIsStringInString(fileStr, "http://");
     bStream = bStream || ofIsStringInString(fileStr, "https://");