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

Replace 3 letters language/country code by 2 letters one

Browse Source 
+ remove a useless output profile
This commit is contained in:
Hombre 2018-07-13 22:39:13 +02:00
parent 8862f0fb28
commit ef8ea277d7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
rtdata/iccprofiles/output/RT_sRGB-V2-srgbtrc212.icc
View File

Binary file not shown.

4
rtengine/iplab2rgb.cc
View File

@ -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

8
rtgui/iccprofilecreator.cc
View File

@ -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");
}