From ef8ea277d7ecfe8d4286a1437c83b9b28992f09a Mon Sep 17 00:00:00 2001
From: Hombre <natureh.510@gmail.com>
Date: Fri, 13 Jul 2018 22:39:13 +0200
Subject: [PATCH] Replace 3 letters language/country code by 2 letters one

+ remove a useless output profile
---
 .../iccprofiles/output/RT_sRGB-V2-srgbtrc212.icc | Bin 2540 -> 0 bytes
 rtengine/iplab2rgb.cc                            |   4 ++--
 rtgui/iccprofilecreator.cc                       |   8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 rtdata/iccprofiles/output/RT_sRGB-V2-srgbtrc212.icc

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 dd9bd9ac2551e613dc50200b17c13e5e1245ea28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2540
zcmeHJe^3-v9RJ=O2OK{R6htV|7Xew_-QFEo{0LKy1nMNXBTA9MWpD3p^L}i*3r7y+
zWEN9e64MxCQ<l+~<}eMAidI@<nZ-C6gjv~;lQF~8STb6Xj(v9zJpQPuX{P_!H}AdA
z`@YZne82nM-S-wi_oI*Ti)sSk4@iQeyp%k!YBh;D3sG2NVF{RMM&wsISJVPtWa^S}
z<hnEhDtR<yl(i!Ee}xhmUXTD(1lhSEiI;H&;?$;f3SJ{)0fRz2FJn&_Z&Em6+@)}8
z9X90b#oF&tux71{n-r`~m9fhoZ~;Vr44~dr?Uw`qogLR^*{dt75X<^H7b`N@wISvu
zwiV+6s0tEWkbhX<JYI=7=#b=P1)67BVl`U|a9+-t%mbLHQF5V58;sb(GjbcT1z!Ou
zxCo%>h}fE50NCFSkbXL1%iaNyg!j7dDAO#oOeqaxpAKfIfVI#H9q<MmfzvRdN>UkA
zc9mb%p?X{OjasWVs~gl?)bFZ)*5qg!G}|<vM<qv9M|DP>(k|3`w0+U4=$h#6=-*>%
zV)n$w#JXdT=?uC~-5+tDxRLl3@dp#k340QA61(-;`rS!X(m--q^6(sX&g9(ZQVc1_
zQ@MEw^Lo?j=f}+7m+sBT%=qHEt=CsA&@ULu+`iDY$U@X)<c7UjPu}RtF3VY*tIz%I
zrXLoM-2BNc@89~4VZeCMbeQ_ce9|&%y^tTXWYKMR++JVsXkmBJiQ>y8hNbkKUCV|`
zQ*8H@y?EETa%;uL%2W4H_NP~l-)pb#b7VR<*Iup@?jK*}Sv|JK*D%qzfz~(ebQQ8g
z9)U}J@Q{xU%ncrWXuX&x{nFCg+PZ#OoBok+H}pUD%;Ve>cehhdrEk`5x%BLK$M>D1
z&wsaVtn2*tD=+DHWWQSSTK(&7yLRp#d~>qL_!iUqa{rnAWWaN%?>+UAx(|9jj6b&S
z_-BKKCw84oAKE&i`?CG(_%ofOnP+>>m5zNi-uhF<`NJ2ui|N09I=S)6(yLczpV{m)
zoBhuI|L-ikXDhqo0Z~507_SiY(-OyU632?fjU%$0I3+sZq6HTzW8HMKPr^;z7Ziw-
zrx}*G5#hd0DgzQL1Xzg}i7aIxUP<DMC@K^RnL>G{px~j(ar5_bj7TZ#DVbJGXrCA)
zBAy8|_>8QtED?E@;oKa9F$DuurOjq($<J%V<HKyUSWUdkJ+-yN0T96f<xmO)81RAs
zLGS|&5^y-?l%7Qn0r%7#f#o=I;tUM|aA7N8OP~x`<j~LzKAa<9LnR+pL1FVa!yrS}
z3EL#}CXXvoMM5NC&nhd8Xq}GAfY^&x33w<13QI^SCT#P-q-c52T8`^!<am|1MYKfx
zQ`gjrQH{o^L|iBPV3i2|TAx8qIR1zi5k0U<UfhbGaGrt~IfeIO!(xFJ$j8VU!HOrQ
z1*;KTD@Mv=mae6JI{p8>pZ-^{)1u_0TUb&;vdnpuIiHe$60#EGP<ompdztahra5XG
c<(J4<XElm~r%4hRtHnAalz$}5;Qk%_6F*w)2mk;8

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