merge with dev

This commit is contained in:
Desmis
2019-09-23 11:40:25 +02:00
17 changed files with 120 additions and 64 deletions

View File

@@ -4248,11 +4248,9 @@ void ImProcFunctions::chromiLuminanceCurve (PipetteBuffer *pipetteBuffer, int pW
if (params->labCurve.chromaticity > -100) {
chCurve = new FlatCurve (params->labCurve.chcurve);
if (!chCurve || chCurve->isIdentity()) {
if (chCurve) {
delete chCurve;
chCurve = nullptr;
}
if (chCurve->isIdentity()) {
delete chCurve;
chCurve = nullptr;
}//do not use "Munsell" if Chcurve not used
else {
chutili = true;
@@ -4265,11 +4263,9 @@ void ImProcFunctions::chromiLuminanceCurve (PipetteBuffer *pipetteBuffer, int pW
if (params->labCurve.chromaticity > -100) {
lhCurve = new FlatCurve (params->labCurve.lhcurve);
if (!lhCurve || lhCurve->isIdentity()) {
if (lhCurve) {
delete lhCurve;
lhCurve = nullptr;
}
if (lhCurve->isIdentity()) {
delete lhCurve;
lhCurve = nullptr;
}//do not use "Munsell" if Chcurve not used
else {
lhutili = true;
@@ -4282,11 +4278,9 @@ void ImProcFunctions::chromiLuminanceCurve (PipetteBuffer *pipetteBuffer, int pW
if (params->labCurve.chromaticity > -100) {
hhCurve = new FlatCurve (params->labCurve.hhcurve);
if (!hhCurve || hhCurve->isIdentity()) {
if (hhCurve) {
delete hhCurve;
hhCurve = nullptr;
}
if (hhCurve->isIdentity()) {
delete hhCurve;
hhCurve = nullptr;
}//do not use "Munsell" if Chcurve not used
else {
hhutili = true;