diff --git a/rtdata/iccprofiles/output/RTv4_Acesp0.icc b/rtdata/iccprofiles/output/RTv4_Acesp0.icc index 1cadde0ee..5dbe25a69 100644 Binary files a/rtdata/iccprofiles/output/RTv4_Acesp0.icc and b/rtdata/iccprofiles/output/RTv4_Acesp0.icc differ diff --git a/rtdata/iccprofiles/output/RTv4_Acesp1.icc b/rtdata/iccprofiles/output/RTv4_Acesp1.icc index aa5e5305f..5dfb4cb0d 100644 Binary files a/rtdata/iccprofiles/output/RTv4_Acesp1.icc and b/rtdata/iccprofiles/output/RTv4_Acesp1.icc differ diff --git a/rtdata/iccprofiles/output/RTv4_Best.icc b/rtdata/iccprofiles/output/RTv4_Best.icc index ac4f42e44..c67688686 100644 Binary files a/rtdata/iccprofiles/output/RTv4_Best.icc and b/rtdata/iccprofiles/output/RTv4_Best.icc differ diff --git a/rtdata/iccprofiles/output/RTv4_Beta.icc b/rtdata/iccprofiles/output/RTv4_Beta.icc index d9e7f823d..86825164a 100644 Binary files a/rtdata/iccprofiles/output/RTv4_Beta.icc and b/rtdata/iccprofiles/output/RTv4_Beta.icc differ diff --git a/rtdata/iccprofiles/output/RTv4_Bruce.icc b/rtdata/iccprofiles/output/RTv4_Bruce.icc index b07620f47..c3a01b116 100644 Binary files a/rtdata/iccprofiles/output/RTv4_Bruce.icc and b/rtdata/iccprofiles/output/RTv4_Bruce.icc differ diff --git a/rtdata/iccprofiles/output/RTv4_Large.icc b/rtdata/iccprofiles/output/RTv4_Large.icc index 86fe9ad7a..176bff9a7 100644 Binary files a/rtdata/iccprofiles/output/RTv4_Large.icc and b/rtdata/iccprofiles/output/RTv4_Large.icc differ diff --git a/rtdata/iccprofiles/output/RTv4_Medium.icc b/rtdata/iccprofiles/output/RTv4_Medium.icc index 88b964f61..d63965fa5 100644 Binary files a/rtdata/iccprofiles/output/RTv4_Medium.icc and b/rtdata/iccprofiles/output/RTv4_Medium.icc differ diff --git a/rtdata/iccprofiles/output/RTv4_Rec2020.icc b/rtdata/iccprofiles/output/RTv4_Rec2020.icc index 041e97a7a..27b1f8c49 100644 Binary files a/rtdata/iccprofiles/output/RTv4_Rec2020.icc and b/rtdata/iccprofiles/output/RTv4_Rec2020.icc differ diff --git a/rtdata/iccprofiles/output/RTv4_Wide.icc b/rtdata/iccprofiles/output/RTv4_Wide.icc index 12a0b556e..f95587797 100644 Binary files a/rtdata/iccprofiles/output/RTv4_Wide.icc and b/rtdata/iccprofiles/output/RTv4_Wide.icc differ diff --git a/rtdata/iccprofiles/output/RTv4_sRGB.icc b/rtdata/iccprofiles/output/RTv4_sRGB.icc index 3ff0eb22a..af95e0fd4 100644 Binary files a/rtdata/iccprofiles/output/RTv4_sRGB.icc and b/rtdata/iccprofiles/output/RTv4_sRGB.icc differ diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc index 0727cce59..79c8d7069 100644 --- a/rtengine/iccstore.cc +++ b/rtengine/iccstore.cc @@ -1670,11 +1670,11 @@ cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams: } //write in tag 'dmdd' values of current gamma and slope to retrive after in Output profile - wchar_t *wGammaGS = (wchar_t*)g_utf8_to_utf16 (gammaGS.c_str(), -1, NULL, NULL, NULL); - if (!wGammaGS) { - printf("Error: lab2rgbOut / g_utf8_to_utf16 failed!\n"); - } - /* + wchar_t *wGammaGS = (wchar_t*)g_utf8_to_utf16 (gammaGS.c_str(), -1, NULL, NULL, NULL); + if (!wGammaGS) { + printf("Error: lab2rgbOut / g_utf8_to_utf16 failed!\n"); + } + cmsMLU *description = cmsMLUalloc(NULL, 1); // Language code (3 letters code) : https://www.iso.org/obp/ui/ // Country code (3 letters code) : http://www.loc.gov/standards/iso639-2/php/code_list.php @@ -1683,11 +1683,11 @@ cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams: } else { printf("Error: lab2rgbOut / cmsMLUsetWide failed for \"%s\" !\n", gammaGS.c_str()); } - cmsMLUsetWide(mlu, "en", "US", gammaWs.str().c_str()); + cmsMLUsetWide(mlu, "en", "US", gammaWs.str().c_str()); - cmsMLUfree(description); -*/ + cmsMLUfree(description); + // instruction with //ICC are used to generate ICC profile if (mlu == nullptr) { printf("Description error\n"); @@ -1864,23 +1864,11 @@ cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams: */ cmsMLUfree(mlu); - - cmsMLU *description = cmsMLUalloc(NULL, 1); - // Language code (3 letters code) : https://www.iso.org/obp/ui/ - // Country code (3 letters code) : http://www.loc.gov/standards/iso639-2/php/code_list.php - if (cmsMLUsetWide(description, "eng", "USA", wGammaGS)) { - cmsWriteTag(outputProfile, cmsSigDeviceModelDescTag, description); //save 'dmdd' in description - } else { - printf("Error: lab2rgbOut / cmsMLUsetWide failed for \"%s\" !\n", gammaGS.c_str()); - } - cmsMLUsetWide(mlu, "en", "US", gammaWs.str().c_str()); - cmsMLUfree(description); - cmsMLU *copyright = cmsMLUalloc(NULL, 1); cmsMLUsetASCII(copyright, "en", "US", "Copyright RawTherapee 2018, CC0"); cmsWriteTag(outputProfile, cmsSigCopyrightTag, copyright); cmsMLUfree(copyright); - cmsWriteTag(outputProfile, cmsSigProfileDescriptionTag, mlu);//desc changed + // cmsWriteTag(outputProfile, cmsSigProfileDescriptionTag, mlu);//desc changed cmsMLU *MfgDesc; MfgDesc = cmsMLUalloc(NULL, 1); cmsMLUsetASCII(MfgDesc, "en", "US", "RawTherapee");