diff --git a/rtdata/iccprofiles/output/RT_sRGB-V2-srgbtrc212.icc b/rtdata/iccprofiles/output/RT_sRGB-V2-srgbtrc212.icc deleted file mode 100644 index dd9bd9ac2..000000000 Binary files a/rtdata/iccprofiles/output/RT_sRGB-V2-srgbtrc212.icc and /dev/null differ diff --git a/rtengine/iplab2rgb.cc b/rtengine/iplab2rgb.cc index cc36d7451..cab77c8ab 100644 --- a/rtengine/iplab2rgb.cc +++ b/rtengine/iplab2rgb.cc @@ -319,10 +319,10 @@ Imagefloat* ImProcFunctions::lab2rgbOut(LabImage* lab, int cx, int cy, int cw, i double slopetag = 12.92310; cmsMLU *modelDescMLU = (cmsMLU*) (cmsReadTag(oprof, cmsSigDeviceModelDescTag)); if (modelDescMLU) { - cmsUInt32Number count = cmsMLUgetWide(modelDescMLU, "eng", "USA", nullptr, 0); // get buffer length first + cmsUInt32Number count = cmsMLUgetWide(modelDescMLU, "en", "US", nullptr, 0); // get buffer length first if (count) { wchar_t *buffer = new wchar_t[count]; - count = cmsMLUgetWide(modelDescMLU, "eng", "USA", buffer, count); // now put the string in the buffer + count = cmsMLUgetWide(modelDescMLU, "en", "US", buffer, count); // now put the string in the buffer Glib::ustring modelDesc; #if __SIZEOF_WCHAR_T__ == 2 char* cModelDesc = g_utf16_to_utf8((unsigned short int*)buffer, -1, nullptr, nullptr, nullptr); // convert to utf-8 in a buffer allocated by glib diff --git a/rtgui/iccprofilecreator.cc b/rtgui/iccprofilecreator.cc index 8dd983d55..608b4e666 100644 --- a/rtgui/iccprofilecreator.cc +++ b/rtgui/iccprofilecreator.cc @@ -935,7 +935,7 @@ void ICCProfileCreator::savePressed() cmsMLU *dmnd; dmnd = cmsMLUalloc(nullptr, 1); - cmsMLUsetASCII(dmnd, "eng", "USA", "RawTherapee"); + cmsMLUsetASCII(dmnd, "en", "US", "RawTherapee"); cmsWriteTag(newProfile, cmsSigDeviceMfgDescTag, dmnd); cmsMLUfree(dmnd); @@ -949,7 +949,7 @@ void ICCProfileCreator::savePressed() cmsMLU *dmdd = cmsMLUalloc(nullptr, 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(dmdd, "eng", "USA", wParameters.str().c_str())) { + if (cmsMLUsetWide(dmdd, "en", "US", wParameters.str().c_str())) { if (!cmsWriteTag(newProfile, cmsSigDeviceModelDescTag, dmdd)) { printf("Error: Can't write cmsSigDeviceModelDescTag!\n"); } @@ -983,7 +983,7 @@ void ICCProfileCreator::savePressed() cmsMLU *descMLU = cmsMLUalloc(nullptr, 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(descMLU, "eng", "USA", wDescription.str().c_str())) { + if (cmsMLUsetWide(descMLU, "en", "US", wDescription.str().c_str())) { if (!cmsWriteTag(newProfile, cmsSigProfileDescriptionTag, descMLU)) { printf("Error: Can't write cmsSigProfileDescriptionTag!\n"); } @@ -998,7 +998,7 @@ void ICCProfileCreator::savePressed() wCopyright << copyright; cmsMLU *copyMLU = cmsMLUalloc(nullptr, 1); - if (cmsMLUsetWide(copyMLU, "eng", "USA", wCopyright.str().c_str())) { + if (cmsMLUsetWide(copyMLU, "en", "US", wCopyright.str().c_str())) { if (!cmsWriteTag(newProfile, cmsSigCopyrightTag, copyMLU)) { printf("Error: Can't write cmsSigCopyrightTag!\n"); }