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

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-11-20 17:50:33 +01:00
parent 333ac99532 aa286a32f9
commit 721972ee72
81 changed files with 2596 additions and 1853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtengine/improccoordinator.cc
View File

@@ -682,10 +682,6 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
}
if (params.colorToning.enabled && params.colorToning.autosat && actListener) {
if (settings->verbose) {
printf("ImProcCoordinator / Auto CT: indi=%d satH=%d satPR=%d\n", indi, (int)colourToningSatLimit, (int) colourToningSatLimitOpacity);
}
actListener->autoColorTonChanged(indi, (int) colourToningSatLimit, (int)colourToningSatLimitOpacity); //change sliders autosat
}
@@ -1091,10 +1087,6 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
void ImProcCoordinator::freeAll()
{
if (settings->verbose) {
printf("freeall starts %d\n", (int)allocated);
}
if (allocated) {
if (orig_prev != oprevi) {
delete oprevi;
@@ -1138,10 +1130,6 @@ void ImProcCoordinator::freeAll()
void ImProcCoordinator::setScale(int prevscale)
{
if (settings->verbose) {
printf("setscale before lock\n");
}
tr = getCoarseBitMask(params.coarse);
int nW, nH;
@@ -1155,10 +1143,6 @@ void ImProcCoordinator::setScale(int prevscale)
imgsrc->getSize(pp, nW, nH);
} while (nH < 400 && prevscale > 1 && (nW * nH < 1000000)); // sctually hardcoded values, perhaps a better choice is possible
if (settings->verbose) {
printf("setscale starts (%d, %d)\n", nW, nH);
}
if (nW != pW || nH != pH) {
freeAll();
@@ -1185,19 +1169,10 @@ void ImProcCoordinator::setScale(int prevscale)
fullw = fw;
fullh = fh;
if (settings->verbose) {
printf("setscale ends\n");
}
if (!sizeListeners.empty())
for (size_t i = 0; i < sizeListeners.size(); i++) {
sizeListeners[i]->sizeChanged(fullw, fullh, fw, fh);
}
if (settings->verbose) {
printf("setscale ends2\n");
}
}