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

merge with dev and fixed some bugs

Browse Source
This commit is contained in:
Desmis
2019-10-27 17:09:53 +01:00
parent 82439e9a77 f3adbd9fd7
commit 94e3ce3e07
19 changed files with 1088 additions and 1607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/ipsharpen.cc
View File

@@ -207,13 +207,13 @@ BENCHFUN
for (int k = 0; k < sharpenParam.deconviter; k++) {
if (!needdamp) {
// apply gaussian blur and divide luminance by result of gaussian blur
gaussianBlur(tmpI, tmp, W, H, sigma, nullptr, GAUSS_DIV, luminance);
gaussianBlur(tmpI, tmp, W, H, sigma, false, GAUSS_DIV, luminance);
} else {
// apply gaussian blur + damping
gaussianBlur(tmpI, tmp, W, H, sigma);
dcdamping(tmp, luminance, damping, W, H);
}
gaussianBlur(tmp, tmpI, W, H, sigma, nullptr, GAUSS_MULT);
gaussianBlur(tmp, tmpI, W, H, sigma, false, GAUSS_MULT);
} // end for
#ifdef _OPENMP
@@ -304,14 +304,15 @@ void ImProcFunctions::deconvsharpeningloc (float** luminance, float** tmp, int W
for (int k = 0; k < itera; k++) {
if (!needdamp) {
// apply gaussian blur and divide luminance by result of gaussian blur
gaussianBlur (tmpI, tmp, W, H, sigma, nullptr, GAUSS_DIV, luminance);
// gaussianBlur (tmpI, tmp, W, H, sigma, nullptr, GAUSS_DIV, luminance);
gaussianBlur(tmpI, tmp, W, H, sigma, false, GAUSS_DIV, luminance);
} else {
// apply gaussian blur + damping
gaussianBlur (tmpI, tmp, W, H, sigma);
dcdamping (tmp, luminance, damping, W, H);
}
gaussianBlur (tmp, tmpI, W, H, sigma, nullptr, GAUSS_MULT);
gaussianBlur (tmp, tmpI, W, H, sigma, false, GAUSS_MULT);
} // end for