liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6889 from Lawrence37/wprof-crash-fix

Browse Source 
Fix for segfault due to wprof being null
This commit is contained in:
Lawrence37
2024-01-27 21:47:55 -08:00
committed by GitHub
parent 8f1f532fe6 a95a58a8a3
commit 2c51b822a3
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtengine/iccstore.cc
View File

@@ -18,6 +18,7 @@
*/ */
#include <cstring> #include <cstring>
#include <map> #include <map>
#include <string>
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <glibmm/fileutils.h> #include <glibmm/fileutils.h>
@@ -51,9 +52,9 @@ namespace
// Not recursive // Not recursive
void loadProfiles( void loadProfiles(
const Glib::ustring& dirName, const Glib::ustring& dirName,
std::map<Glib::ustring, cmsHPROFILE>* profiles, std::map<std::string, cmsHPROFILE>* profiles,
std::map<Glib::ustring, rtengine::ProfileContent>* profileContents, std::map<std::string, rtengine::ProfileContent>* profileContents,
std::map<Glib::ustring, Glib::ustring>* profileNames, std::map<std::string, Glib::ustring>* profileNames,
bool nameUpper bool nameUpper
) )
{ {
@@ -114,8 +115,8 @@ void loadProfiles(
bool loadProfile( bool loadProfile(
const Glib::ustring& profile, const Glib::ustring& profile,
const Glib::ustring& dirName, const Glib::ustring& dirName,
std::map<Glib::ustring, cmsHPROFILE>* profiles, std::map<std::string, cmsHPROFILE>* profiles,
std::map<Glib::ustring, rtengine::ProfileContent>* profileContents std::map<std::string, rtengine::ProfileContent>* profileContents
) )
{ {
if (dirName.empty() || profiles == nullptr) { if (dirName.empty() || profiles == nullptr) {
@@ -996,10 +997,10 @@ parse_error:
return false; return false;
} }
using ProfileMap = std::map<Glib::ustring, cmsHPROFILE>; using ProfileMap = std::map<std::string, cmsHPROFILE>;
using MatrixMap = std::map<Glib::ustring, TMatrix>; using MatrixMap = std::map<std::string, TMatrix>;
using ContentMap = std::map<Glib::ustring, ProfileContent>; using ContentMap = std::map<std::string, ProfileContent>;
using NameMap = std::map<Glib::ustring, Glib::ustring>; using NameMap = std::map<std::string, Glib::ustring>;
ProfileMap wProfiles; ProfileMap wProfiles;
// ProfileMap wProfilesGamma; // ProfileMap wProfilesGamma;