Speed up image loading (#6035)

Currently ofLoadImage spends a large percentage of its time on ofToDataPath when loading lots of small images from disk. These changes help speed this up when absolute paths are already known.
openframeworks · Aug 12, 2018 · 4b03c10 · 4b03c10
1 parent e8ad683
commit 4b03c10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/libs/openFrameworks/graphics/ofImage.cpp b/libs/openFrameworks/graphics/ofImage.cpp
@@ -207,7 +207,7 @@ static bool loadImage(ofPixels_<PixelType> & pix, const std::filesystem::path& _
 		return ofLoadImage(pix, ofLoadURL(_fileName.string()).data);
 	}
 
-	std::string fileName = ofToDataPath(_fileName);
+	std::string fileName = ofToDataPath(_fileName, true);
 	bool bLoaded = false;
 	FIBITMAP * bmp = nullptr;
 

diff --git a/libs/openFrameworks/utils/ofUtils.cpp b/libs/openFrameworks/utils/ofUtils.cpp
@@ -520,6 +520,9 @@ void ofSetDataPathRoot(const std::filesystem::path& newRoot){
 
 //--------------------------------------------------
 string ofToDataPath(const std::filesystem::path & path, bool makeAbsolute){
+    if (makeAbsolute && path.is_absolute())
+        return path.string();
+
 	if (!enableDataPath)
         return path.string();