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

merge with dev...

Browse Source
This commit is contained in:
Desmis
2017-06-19 12:30:20 +02:00
parent f1a90dad54 a9f769c5d7
commit acd715dd44
90 changed files with 598 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rtengine/rtthumbnail.cc
View File

@@ -1989,21 +1989,25 @@ bool Thumbnail::writeData (const Glib::ustring& fname)
bool Thumbnail::readEmbProfile (const Glib::ustring& fname)
{
FILE* f = g_fopen (fname.c_str (), "rb");
embProfileData = nullptr;
embProfile = nullptr;
embProfileLength = 0;
if (!f) {
embProfileData = nullptr;
embProfile = nullptr;
embProfileLength = 0;
} else {
fseek (f, 0, SEEK_END);
embProfileLength = ftell (f);
fseek (f, 0, SEEK_SET);
embProfileData = new unsigned char[embProfileLength];
fread (embProfileData, 1, embProfileLength, f);
FILE* f = g_fopen (fname.c_str (), "rb");
if (f) {
if(!fseek (f, 0, SEEK_END)) {
int profileLength = ftell (f);
if(profileLength > 0) {
embProfileLength = profileLength;
if(!fseek (f, 0, SEEK_SET)) {
embProfileData = new unsigned char[embProfileLength];
fread (embProfileData, 1, embProfileLength, f);
embProfile = cmsOpenProfileFromMem (embProfileData, embProfileLength);
}
}
}
fclose (f);
embProfile = cmsOpenProfileFromMem (embProfileData, embProfileLength);
return true;
return embProfile != nullptr;
}
return false;