ICC spelling

Renamed "Prophoto" and "Acespx" to ProPhoto and ACES P0 and P1,
hyphenated as needed.

rtengine/iccstore.cc

@@ -1318,9 +1318,8 @@ cmsHPROFILE rtengine::ICCStore::createGammaProfile(const procparams::ColorManage
 
     enum class ColorTemp {
         D50 = 5003,  // for Widegamut, Prophoto Best, Beta -> D50
-        D65 = 6504,   // for sRGB, AdobeRGB, Bruce Rec2020  -> D65
-        D60 = 6005        //for ACESP0 and AcesP1
-
+        D65 = 6504,  // for sRGB, AdobeRGB, Bruce Rec2020  -> D65
+        D60 = 6005   // for ACES AP0 and ACES AP1
     };
     ColorTemp temp = ColorTemp::D50;
 
@@ -1378,23 +1377,23 @@ cmsHPROFILE rtengine::ICCStore::createGammaProfile(const procparams::ColorManage
         p[4] = 0.1310;
         p[5] = 0.0460;
         temp = ColorTemp::D65;
-    } else if (icm.outputPimariesPreset == "Acesp0") {
-        p[0] = 0.7347;    // ACES P0 primaries
+    } else if (icm.outputPimariesPreset == "ACES-AP0") {
+        p[0] = 0.7347;    // ACES AP0 primaries
         p[1] = 0.2653;
         p[2] = 0.0000;
         p[3] = 1.0;
         p[4] = 0.0001;
         p[5] = -0.0770;
         temp = ColorTemp::D60;
-    } else if (icm.outputPimariesPreset == "Acesp1") {
-        p[0] = 0.713;    // ACES P1 primaries
+    } else if (icm.outputPimariesPreset == "ACES-AP1") {
+        p[0] = 0.713;    // ACES AP1 primaries
         p[1] = 0.293;
         p[2] = 0.165;
         p[3] = 0.830;
         p[4] = 0.128;
         p[5] = 0.044;
         temp = ColorTemp::D60;
-    } else if (icm.outputPimariesPreset == "Prophoto") {
+    } else if (icm.outputPimariesPreset == "ProPhoto") {
         p[0] = 0.7347;    //ProPhoto and default primaries
         p[1] = 0.2653;
         p[2] = 0.1596;
@@ -1524,21 +1523,21 @@ cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams:
     } else if (icm.outputPimariesPreset == "sRGB"      && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.srgb10)     &&  pro) {
         outProfile = options.rtSettings.srgb10;
         outPr = "sRGB_";
-    } else if (icm.outputPimariesPreset == "Prophoto"  && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.prophoto10) &&  pro) {
+    } else if (icm.outputPimariesPreset == "ProPhoto"  && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.prophoto10) &&  pro) {
         outProfile = options.rtSettings.prophoto10;
         outPr = "Large_";
     } else if (icm.outputPimariesPreset == "Rec2020"   && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.rec2020)) {
         outProfile = options.rtSettings.rec2020;
         outPr = "Rec2020_";
-    } else if (icm.outputPimariesPreset == "Acesp0"   && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.ACESp0)) {
+    } else if (icm.outputPimariesPreset == "ACES-AP0"   && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.ACESp0)) {
         outProfile = options.rtSettings.ACESp0;
-        outPr = "Acesp0_";
-    } else if (icm.outputPimariesPreset == "Acesp1"   && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.ACESp1)) {
+        outPr = "ACES-AP0_";
+    } else if (icm.outputPimariesPreset == "ACES-AP1"   && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.ACESp1)) {
         outProfile = options.rtSettings.ACESp1;
-        outPr = "Acesp1_";
+        outPr = "ACES-AP1_";
     } else if (icm.outputPimariesPreset == "pfree") {
         outProfile = options.rtSettings.srgb;
-        printf("PFRRE\n");
+        printf("PFREE\n");
         outPr = "pfree_";
 
     } else {
@@ -1764,7 +1763,7 @@ cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams:
             p[4] = 0.1310;
             p[5] = 0.0460;
             temp = ColorTemp::D65;
-        } else if (icm.outputPimariesPreset == "Acesp0") {
+        } else if (icm.outputPimariesPreset == "ACES-AP0") {
             p[0] = 0.7347;    // ACES P0 primaries
             p[1] = 0.2653;
             p[2] = 0.0000;
@@ -1772,7 +1771,7 @@ cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams:
             p[4] = 0.0001;
             p[5] = -0.0770;
             temp = ColorTemp::D60;
-        } else if (icm.outputPimariesPreset == "Acesp1") {
+        } else if (icm.outputPimariesPreset == "ACES-AP1") {
             p[0] = 0.713;    // ACES P1 primaries
             p[1] = 0.293;
             p[2] = 0.165;
@@ -1780,8 +1779,8 @@ cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams:
             p[4] = 0.128;
             p[5] = 0.044;
             temp = ColorTemp::D60;
-        } else if (icm.outputPimariesPreset == "Prophoto") {
-            p[0] = 0.7347;    //ProPhoto and default primaries
+        } else if (icm.outputPimariesPreset == "ProPhoto") {
+            p[0] = 0.7347;    // ProPhoto and default primaries
             p[1] = 0.2653;
             p[2] = 0.1596;
             p[3] = 0.8404;

rtengine/iplab2rgb.cc

@@ -480,9 +480,9 @@ Imagefloat* ImProcFunctions::workingtrc(Imagefloat* working, int cw, int ch, int
     const double eps = 0.000000001; // not divide by zero
 
     enum class ColorTemp {
-        D50 = 5003,  // for Widegamut, Prophoto Best, Beta -> D50
-        D65 = 6504,   // for sRGB, AdobeRGB, Bruce Rec2020  -> D65
-        D60 = 6005        //for ACESP0 and AcesP1
+        D50 = 5003, // for Widegamut, ProPhoto Best, Beta -> D50
+        D65 = 6504, // for sRGB, AdobeRGB, Bruce Rec2020  -> D65
+        D60 = 6005  // for ACES AP0 and AP1
 
     };
     ColorTemp temp = ColorTemp::D50;

rtgui/icmpanel.cc

@@ -706,13 +706,13 @@ void ICMPanel::read(const ProcParams* pp, const ParamsEdited* pedited)
     oTRCPresets->set_active_text(pp->icm.outputGammaPreset);
 
 
-    if (pp->icm.outputPimariesPreset == "Acesp0") {
+    if (pp->icm.outputPimariesPreset == "ACES-AP0") {
         primaries->set_active(0);
-    } else if (pp->icm.outputPimariesPreset == "Acesp1") {
+    } else if (pp->icm.outputPimariesPreset == "ACES-AP1") {
         primaries->set_active(1);
     } else if (pp->icm.outputPimariesPreset == "Adobe") {
         primaries->set_active(2);
-    } else if (pp->icm.outputPimariesPreset == "Prophoto") {
+    } else if (pp->icm.outputPimariesPreset == "ProPhoto") {
         primaries->set_active(3);
     } else if (pp->icm.outputPimariesPreset == "Rec2020") {
         primaries->set_active(4);
@@ -949,13 +949,13 @@ void ICMPanel::write(ProcParams* pp, ParamsEdited* pedited)
     }
 
     if (primaries->get_active_row_number() == 0) {
-        pp->icm.outputPimariesPreset = "Acesp0";
+        pp->icm.outputPimariesPreset = "ACES-AP0";
     } else if (primaries->get_active_row_number() == 1) {
-        pp->icm.outputPimariesPreset = "Acesp1";
+        pp->icm.outputPimariesPreset = "ACES-AP1";
     } else if (primaries->get_active_row_number() == 2) {
         pp->icm.outputPimariesPreset = "Adobe";
     } else if (primaries->get_active_row_number() == 3) {
-        pp->icm.outputPimariesPreset = "Prophoto";
+        pp->icm.outputPimariesPreset = "ProPhoto";
     } else if (primaries->get_active_row_number() == 4) {
         pp->icm.outputPimariesPreset = "Rec2020";
     } else if (primaries->get_active_row_number() == 5) {

rtgui/options.cc

@@ -540,8 +540,8 @@ void Options::setDefaults()
     rtSettings.beta = "RTv4_Beta";
     rtSettings.best = "RTv4_Best";
     rtSettings.rec2020 = "RTv4_Rec2020";
-    rtSettings.ACESp0 = "RTv4_Acesp0";
-    rtSettings.ACESp1 = "RTv4_Acesp1";
+    rtSettings.ACESp0 = "RTv4_ACES_AP0";
+    rtSettings.ACESp1 = "RTv4_ACES_AP1";
     rtSettings.verbose = false;
     rtSettings.gamutICC = true;
     rtSettings.gamutLch = true;