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

Improvments to mip

Browse Source
This commit is contained in:
Desmis
2017-09-19 19:48:14 +02:00
parent 41e796821f
commit d7d5f1dc39
1 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
rtengine/improccoordinator.cc
View File

@@ -1533,51 +1533,53 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
ns = std::stoi (str3.c_str()); ns = std::stoi (str3.c_str());
} }
if (cont >= 2 && cont < 16) { if (ns < maxspot) {
dataspot[cont][ns] = std::stoi (str3.c_str()); if (cont >= 2 && cont < 16) {
} dataspot[cont][ns] = std::stoi (str3.c_str());
}
if (spotline.substr (0, pos) == "Currentspot") { if (spotline.substr (0, pos) == "Currentspot") {
dataspot[16][0] = std::stoi (str3.c_str()); dataspot[16][0] = std::stoi (str3.c_str());
} }
if (cont > 16 && cont < maxind) { if (cont > 16 && cont < maxind) {
dataspot[cont][ns] = std::stoi (str3.c_str()); dataspot[cont][ns] = std::stoi (str3.c_str());
} }
if (excurvret && spotline.substr (0, pos) == "curveReti") { if (excurvret && spotline.substr (0, pos) == "curveReti") {
retistr[ns] = str3; retistr[ns] = str3;
} }
if (excurvll && spotline.substr (0, pos) == "curveLL") { if (excurvll && spotline.substr (0, pos) == "curveLL") {
llstr[ns] = str3; llstr[ns] = str3;
} }
if (excurvlh && spotline.substr (0, pos) == "curveLH") { if (excurvlh && spotline.substr (0, pos) == "curveLH") {
lhstr[ns] = str3; lhstr[ns] = str3;
} }
if (excurvcc && spotline.substr (0, pos) == "curveCC") { if (excurvcc && spotline.substr (0, pos) == "curveCC") {
ccstr[ns] = str3; ccstr[ns] = str3;
} }
if (excurvhh && spotline.substr (0, pos) == "curveHH") { if (excurvhh && spotline.substr (0, pos) == "curveHH") {
hhstr[ns] = str3; hhstr[ns] = str3;
} }
if (excurvsk && spotline.substr (0, pos) == "curveskin") { if (excurvsk && spotline.substr (0, pos) == "curveskin") {
skinstr[ns] = str3; skinstr[ns] = str3;
} }
if (excpth && spotline.substr (0, pos) == "pthres") { if (excpth && spotline.substr (0, pos) == "pthres") {
pthstr[ns] = str3; pthstr[ns] = str3;
} }
if (excurvex && spotline.substr (0, pos) == "curveex") { if (excurvex && spotline.substr (0, pos) == "curveex") {
exstr[ns] = str3; exstr[ns] = str3;
}
} }
} }
@@ -1929,7 +1931,6 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
llstr[ns2] = str32; llstr[ns2] = str32;
} }
if (spotline2.substr (0, pos2) == "curveLH") { if (spotline2.substr (0, pos2) == "curveLH") {
lhstr[ns2] = str32; lhstr[ns2] = str32;
} }
@@ -1939,17 +1940,13 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
} }
if (spotline2.substr (0, pos2) == "curveHH") { if (spotline2.substr (0, pos2) == "curveHH") {
hhstr[ns2] = str32; hhstr[ns2] = str32;
} }
if (spotline2.substr (0, pos2) == "curveskin") { if (spotline2.substr (0, pos2) == "curveskin") {
skinstr[ns2] = str32; skinstr[ns2] = str32;
} }
if (spotline2.substr (0, pos2) == "pthres") { if (spotline2.substr (0, pos2) == "pthres") {
pthstr[ns2] = str32; pthstr[ns2] = str32;
} }
@@ -2391,11 +2388,9 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
} }
int sp ; int sp ;
sp = realspot; sp = realspot;
int maxreal = 1;//do nothing..in case of int maxreal = 1;//do nothing..in case of
if (aloListener && realspot != dataspot[16][0]) { if (aloListener && realspot != dataspot[16][0]) {
@@ -2649,9 +2644,6 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
params.locallab.localTgaincurve.clear(); params.locallab.localTgaincurve.clear();
params.locallab.localTgaincurve = cretiend; params.locallab.localTgaincurve = cretiend;
// int lenc = params.locallab.localTgaincurve.size();
delete [] s_datc; delete [] s_datc;
int *s_datcl; int *s_datcl;