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

flatfield: code review

Browse Source
This commit is contained in:
Ingo Weyrich 2019-10-23 23:14:08 +02:00
parent 37e7a705ab
commit ccf4b4c843
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/rawflatfield.cc
View File

@ -15,7 +15,8 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <cmath> #include <cmath>
#include <new> #include <new>
@ -73,7 +74,7 @@ void cfaboxblur(float** riFlatFile, float* cfablur, int boxH, int boxW, int H, i
#pragma omp for #pragma omp for
#endif #endif
for (int row = 0; row < H; row++) { for (int row = 0; row < H; ++row) {
int len = boxW / 2 + 1; int len = boxW / 2 + 1;
cfatmp[row * W + 0] = riFlatFile[row][0] / len; cfatmp[row * W + 0] = riFlatFile[row][0] / len;
cfatmp[row * W + 1] = riFlatFile[row][1] / len; cfatmp[row * W + 1] = riFlatFile[row][1] / len;
@ -199,7 +200,7 @@ void cfaboxblur(float** riFlatFile, float* cfablur, int boxH, int boxW, int H, i
#pragma omp single #pragma omp single
#endif #endif
for (int col = W - (W % 8); col < W; col++) { for (int col = W - (W % 8); col < W; ++col) {
int len = boxH / 2 + 1; int len = boxH / 2 + 1;
cfablur[0 * W + col] = srcVertical[0 * W + col] / len; cfablur[0 * W + col] = srcVertical[0 * W + col] / len;
cfablur[1 * W + col] = srcVertical[1 * W + col] / len; cfablur[1 * W + col] = srcVertical[1 * W + col] / len;
@ -215,7 +216,7 @@ void cfaboxblur(float** riFlatFile, float* cfablur, int boxH, int boxW, int H, i
len ++; len ++;
} }
for (int row = boxH + 2; row < H - boxH; row++) { for (int row = boxH + 2; row < H - boxH; ++row) {
cfablur[row * W + col] = cfablur[(row - 2) * W + col] + (srcVertical[(row + boxH) * W + col] - srcVertical[(row - boxH - 2) * W + col]) / len; cfablur[row * W + col] = cfablur[(row - 2) * W + col] + (srcVertical[(row + boxH) * W + col] - srcVertical[(row - boxH - 2) * W + col]) / len;
} }
@ -235,7 +236,7 @@ void cfaboxblur(float** riFlatFile, float* cfablur, int boxH, int boxW, int H, i
#pragma omp for #pragma omp for
#endif #endif
for (int col = 0; col < W; col++) { for (int col = 0; col < W; ++col) {
int len = boxH / 2 + 1; int len = boxH / 2 + 1;
cfablur[0 * W + col] = srcVertical[0 * W + col] / len; cfablur[0 * W + col] = srcVertical[0 * W + col] / len;
cfablur[1 * W + col] = srcVertical[1 * W + col] / len; cfablur[1 * W + col] = srcVertical[1 * W + col] / len;
@ -251,7 +252,7 @@ void cfaboxblur(float** riFlatFile, float* cfablur, int boxH, int boxW, int H, i
len ++; len ++;
} }
for (int row = boxH + 2; row < H - boxH; row++) { for (int row = boxH + 2; row < H - boxH; ++row) {
cfablur[row * W + col] = cfablur[(row - 2) * W + col] + (srcVertical[(row + boxH) * W + col] - srcVertical[(row - boxH - 2) * W + col]) / len; cfablur[row * W + col] = cfablur[(row - 2) * W + col] + (srcVertical[(row + boxH) * W + col] - srcVertical[(row - boxH - 2) * W + col]) / len;
} }