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

RT crashes when a CMYK profile is selected as output profile, Issue 2764

Browse Source
This commit is contained in:
Ingo
2015-05-05 00:49:42 +02:00
parent 5f827fcc34
commit 530ecc8356
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rtengine/iccstore.cc
View File

@@ -81,7 +81,6 @@ cmsHPROFILE
ICCStore::makeStdGammaProfile(cmsHPROFILE iprof) ICCStore::makeStdGammaProfile(cmsHPROFILE iprof)
{ {
// forgive me for the messy code, quick hack to change gamma of an ICC profile to the RT standard gamma // forgive me for the messy code, quick hack to change gamma of an ICC profile to the RT standard gamma
void *buf = NULL;
if (!iprof) { if (!iprof) {
return NULL; return NULL;
} }
@@ -92,7 +91,6 @@ ICCStore::makeStdGammaProfile(cmsHPROFILE iprof)
} }
uint8_t *data = new uint8_t[bytesNeeded+1]; uint8_t *data = new uint8_t[bytesNeeded+1];
cmsSaveProfileToMem(iprof, data, &bytesNeeded); cmsSaveProfileToMem(iprof, data, &bytesNeeded);
const size_t len = (int)bytesNeeded;
const uint8_t *p = &data[128]; // skip 128 byte header const uint8_t *p = &data[128]; // skip 128 byte header
uint32_t tag_count; uint32_t tag_count;
memcpy(&tag_count, p, 4); memcpy(&tag_count, p, 4);
@@ -108,7 +106,7 @@ ICCStore::makeStdGammaProfile(cmsHPROFILE iprof)
const uint32_t gamma = 0x239; const uint32_t gamma = 0x239;
int gamma_size = (gamma == 0 || gamma == 256) ? 12 : 14; int gamma_size = (gamma == 0 || gamma == 256) ? 12 : 14;
int data_size = (gamma_size + 3) & ~3; int data_size = (gamma_size + 3) & ~3;
for (int i = 0; i < tag_count; i++) { for (uint32_t i = 0; i < tag_count; i++) {
memcpy(&tags[i], p, 12); memcpy(&tags[i], p, 12);
tags[i].sig = ntohl(tags[i].sig); tags[i].sig = ntohl(tags[i].sig);
tags[i].offset = ntohl(tags[i].offset); tags[i].offset = ntohl(tags[i].offset);
@@ -130,7 +128,7 @@ ICCStore::makeStdGammaProfile(cmsHPROFILE iprof)
memcpy(nd, &sz, 4); memcpy(nd, &sz, 4);
uint32_t offset = 128 + 4 + tag_count * 12; uint32_t offset = 128 + 4 + tag_count * 12;
uint32_t gamma_offset = 0; uint32_t gamma_offset = 0;
for (int i = 0; i < tag_count; i++) { for (uint32_t i = 0; i < tag_count; i++) {
struct icctag tag; struct icctag tag;
tag.sig = htonl(tags[i].sig); tag.sig = htonl(tags[i].sig);
if (tags[i].sig == 0x62545243 || // bTRC if (tags[i].sig == 0x62545243 || // bTRC
@@ -289,8 +287,8 @@ void ICCStore::init (Glib::ustring usrICCDir, Glib::ustring rtICCDir) {
fileProfiles.clear(); fileProfiles.clear();
fileProfileContents.clear(); fileProfileContents.clear();
// RawTherapee's profiles take precedence if a user's profile of the same name exists // RawTherapee's profiles take precedence if a user's profile of the same name exists
loadICCs(Glib::build_filename(rtICCDir, "output"), false, fileProfiles, fileProfileContents); loadICCs(Glib::build_filename(rtICCDir, "output"), false, fileProfiles, fileProfileContents, true);
loadICCs(usrICCDir, false, fileProfiles, fileProfileContents); loadICCs(usrICCDir, false, fileProfiles, fileProfileContents, true);
// Input profiles // Input profiles
// Load these to different areas, since the short name (e.g. "NIKON D700" may overlap between system/user and RT dir) // Load these to different areas, since the short name (e.g. "NIKON D700" may overlap between system/user and RT dir)
@@ -299,7 +297,7 @@ void ICCStore::init (Glib::ustring usrICCDir, Glib::ustring rtICCDir) {
loadICCs(Glib::build_filename(rtICCDir, "input"), true, fileStdProfiles, fileStdProfileContents); loadICCs(Glib::build_filename(rtICCDir, "input"), true, fileStdProfiles, fileStdProfileContents);
} }
void ICCStore::loadICCs(Glib::ustring rootDirName, bool nameUpper, std::map<Glib::ustring, cmsHPROFILE>& resultProfiles, std::map<Glib::ustring, ProfileContent> &resultProfileContents) { void ICCStore::loadICCs(Glib::ustring rootDirName, bool nameUpper, std::map<Glib::ustring, cmsHPROFILE>& resultProfiles, std::map<Glib::ustring, ProfileContent> &resultProfileContents, bool onlyRgb) {
if (rootDirName!="") { if (rootDirName!="") {
std::deque<Glib::ustring> qDirs; std::deque<Glib::ustring> qDirs;
@@ -330,7 +328,7 @@ void ICCStore::loadICCs(Glib::ustring rootDirName, bool nameUpper, std::map<Glib
ProfileContent pc (fname); ProfileContent pc (fname);
if (pc.data) { if (pc.data) {
cmsHPROFILE profile = pc.toProfile (); cmsHPROFILE profile = pc.toProfile ();
if (profile) { if (profile && (!onlyRgb || cmsGetColorSpace(profile) == cmsSigRgbData)) {
resultProfiles[name] = profile; resultProfiles[name] = profile;
resultProfileContents[name] = pc; resultProfileContents[name] = pc;
} }

2
rtengine/iccstore.h
View File

@@ -65,7 +65,7 @@ class ICCStore {
MyMutex mutex_; MyMutex mutex_;
ICCStore (); ICCStore ();
void loadICCs(Glib::ustring rootDirName, bool nameUpper, std::map<Glib::ustring, cmsHPROFILE>& resultProfiles, std::map<Glib::ustring, ProfileContent> &resultProfileContents); void loadICCs(Glib::ustring rootDirName, bool nameUpper, std::map<Glib::ustring, cmsHPROFILE>& resultProfiles, std::map<Glib::ustring, ProfileContent> &resultProfileContents, bool onlyRgb = false);
public: public: