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

Raw CA correction created an artifact, fixes #4116

Browse Source
This commit is contained in:
heckflosse 2017-10-08 15:36:31 +02:00
parent 55172ee7ac
commit 2f32afa841
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/CA_correct_RT.cc
View File

@ -824,7 +824,7 @@ void RawImageSource::CA_correct_RT(const bool autoCA, const double cared, const
}
if (rrmax < rr1) {
for (int rr = 0; rr < border; rr++)
for (int rr = 0; rr < std::min(border, rr1 - rrmax); rr++)
for (int cc = ccmin; cc < ccmax; cc++) {
int c = FC(rr, cc);
rgb[c][((rrmax + rr)*ts + cc) >> ((c & 1) ^ 1)] = (rawData[(height - rr - 2)][left + cc]) / 65535.f;
@ -845,7 +845,7 @@ void RawImageSource::CA_correct_RT(const bool autoCA, const double cared, const
if (ccmax < cc1) {
for (int rr = rrmin; rr < rrmax; rr++)
for (int cc = 0; cc < border; cc++) {
for (int cc = 0; cc < std::min(border, cc1 - ccmax); cc++) {
int c = FC(rr, cc);
rgb[c][(rr * ts + ccmax + cc) >> ((c & 1) ^ 1)] = (rawData[(top + rr)][(width - cc - 2)]) / 65535.f;
if ((c & 1) == 0) {
@ -867,8 +867,8 @@ void RawImageSource::CA_correct_RT(const bool autoCA, const double cared, const
}
if (rrmax < rr1 && ccmax < cc1) {
for (int rr = 0; rr < border; rr++)
for (int cc = 0; cc < border; cc++) {
for (int rr = 0; rr < std::min(border, rr1 - rrmax); rr++)
for (int cc = 0; cc < std::min(border, cc1 - ccmax); cc++) {
int c = FC(rr, cc);
rgb[c][((rrmax + rr)*ts + ccmax + cc) >> ((c & 1) ^ 1)] = (rawData[(height - rr - 2)][(width - cc - 2)]) / 65535.f;
if ((c & 1) == 0) {
@ -879,7 +879,7 @@ void RawImageSource::CA_correct_RT(const bool autoCA, const double cared, const
if (rrmin > 0 && ccmax < cc1) {
for (int rr = 0; rr < border; rr++)
for (int cc = 0; cc < border; cc++) {
for (int cc = 0; cc < std::min(border, cc1 - ccmax); cc++) {
int c = FC(rr, cc);
rgb[c][(rr * ts + ccmax + cc) >> ((c & 1) ^ 1)] = (rawData[(border2 - rr)][(width - cc - 2)]) / 65535.f;
if ((c & 1) == 0) {
@ -889,7 +889,7 @@ void RawImageSource::CA_correct_RT(const bool autoCA, const double cared, const
}
if (rrmax < rr1 && ccmin > 0) {
for (int rr = 0; rr < border; rr++)
for (int rr = 0; rr < std::min(border, rr1 - rrmax); rr++)
for (int cc = 0; cc < border; cc++) {
int c = FC(rr, cc);
rgb[c][((rrmax + rr)*ts + cc) >> ((c & 1) ^ 1)] = (rawData[(height - rr - 2)][(border2 - cc)]) / 65535.f;