mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 22:06:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Remove illegal characters from filenames.
This commit is contained in:
Person
2020-11-30 19:32:02 -08:00
parent 73efd76bdd
commit 2b60d2b87e
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/EmberCommon/EmberCommon.h
View File

@ -309,6 +309,22 @@ static void Rgba32ToRgba32Exr(v4F* rgba, float* r, float* g, float* b, float* a,
}
}
/// <summary>
/// Returns a string with all illegal file path characters removed.
/// </summary>
/// <param name="filename">The path to remove illegal characters from</param>
/// <returns>The cleaned full file path and name.</returns>
static string CleanPath(const string& filename)
{
static string illegalChars = "\\/:*?\"<>|";
auto tempfilename = filename;
for (auto& ch : illegalChars)
tempfilename.erase(remove(tempfilename.begin(), tempfilename.end(), ch), tempfilename.end());
return tempfilename;
}
/// <summary>
/// Make a filename for a single render. This is used in EmberRender.
/// </summary>
@ -340,7 +356,7 @@ static string MakeSingleFilename(const string& path, const string& out, const st
filename = fnstream.str();
}
return filename;
return CleanPath(filename);
}
/// <summary>
@ -356,7 +372,7 @@ static string MakeAnimFilename(const string& path, const string& prefix, const s
{
ostringstream fnstream;
fnstream << path << prefix << setfill('0') << setprecision(0) << fixed << setw(padding) << ftime << suffix << format;
return fnstream.str();
return CleanPath(fnstream.str());
}
/// <summary>