Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 15142 → Rev 15143

/trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.cpp
7,6 → 7,7
 
#include <iostream>
#include <string>
#include <cstdlib>
#include <QDir>
#include <QFile>
 
83,6 → 84,7
hIn = cmsOpenProfileFromFile(profilePath.data(), "r");
if (hIn == NULL)
continue;
#ifdef _WIN32
cmsUInt32Number descSize = cmsGetProfileInfo(hIn, cmsInfoDescription, "en", "US", NULL, 0);
if (descSize > 0)
{
100,6 → 102,19
free(descData);
}
}
#else
cmsUInt32Number descSize = cmsGetProfileInfoASCII(hIn, cmsInfoDescription, "en", "US", NULL, 0);
if (descSize > 0)
{
char* descData = (char*) malloc(descSize + sizeof(char));
descSize = cmsGetProfileInfoASCII(hIn, cmsInfoDescription, "en", "US", descData, descSize);
if (descSize > 0)
{
profileInfo.description = QString(descData);
free(descData);
}
}
#endif
if (profileInfo.description.isEmpty())
{
cmsCloseProfile(hIn);