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

Merge pull request #5804 from luzpaz/typos

Browse Source 
Fix various typos
This commit is contained in:
Thanatomanic
2020-06-19 18:05:17 +02:00
committed by GitHub
parent e89a3041fa a41aa73124
commit 421f868921
17 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtengine/rawimagesource.cc
View File

@@ -4424,17 +4424,17 @@ void RawImageSource::ItcWB(bool extra, double &tempref, double &greenref, double
1) for the current raw file we create a table for each temp of RGB multipliers
2) then, I choose the "camera temp" to initialize calculation (why not)
3) for this temp, I calculated XYZ values for the 201 spectral datas
3) for this temp, I calculated XYZ values for the 201 spectral data
4) then I create for the image an "histogram", but for xyY (CIE 1931 color space or CIE 1964 (default))
5) for each pixel (in fact to accelerate only 1/5 for and 1/5 for y), I determine for each couple xy, the number of occurences, can be change by Itcwb_precis to 3 or 9
5) for each pixel (in fact to accelerate only 1/5 for and 1/5 for y), I determine for each couple xy, the number of occurrences, can be change by Itcwb_precis to 3 or 9
6) I sort this result in ascending order
7) in option we can sort in another manner to take into account chroma : chromax = x - white point x, chromay = y - white point y
8) then I compare this result, with spectral datas found above in 3) with deltaE (limited to chroma)
9) at this point we have xyY values that match Camera temp, and spectral datas associated
8) then I compare this result, with spectral data found above in 3) with deltaE (limited to chroma)
9) at this point we have xyY values that match Camera temp, and spectral data associated
10) then I recalculate RGB values from xyY histogram
11) after, I vary temp, between 2000K to 12000K
12) RGB values are recalculated from 10) with RGB multipliers, and then xyY are calculated for each temp
13) spectral datas choose are recalculated with temp between 2000K to 12000K with matrix spectral calculation, that leads to xyY values
13) spectral data choose are recalculated with temp between 2000K to 12000K with matrix spectral calculation, that leads to xyY values
14) I calculated for each couple xy, Student correlation (without Snedecor test)
15) the good result, is the best correlation
16) we have found the best temperature where color image and color references are correlate
@@ -4991,7 +4991,7 @@ void RawImageSource::ItcWB(bool extra, double &tempref, double &greenref, double
chrom wbchro[sizcu4];
const float swpr = Txyz[repref].XX + Txyz[repref].ZZ + 1.f;
const float xwpr = Txyz[repref].XX / swpr;//white point for tt in xy coordiantes
const float xwpr = Txyz[repref].XX / swpr;//white point for tt in xy coordinates
const float ywpr = 1.f / swpr;
for (int i = 0; i < sizcu4; ++i) { //take the max values
@@ -5022,7 +5022,7 @@ void RawImageSource::ItcWB(bool extra, double &tempref, double &greenref, double
std::sort(wbchro, wbchro + sizcu4, wbchro[0]);
}
const int maxval = rtengine::LIM(settings->itcwb_thres, 10, 55);//max values of color to find correllation
const int maxval = rtengine::LIM(settings->itcwb_thres, 10, 55);//max values of color to find correlation
sizcurr2ref = rtengine::min(sizcurr2ref, maxval); //keep about the biggest values,
@@ -5036,7 +5036,7 @@ void RawImageSource::ItcWB(bool extra, double &tempref, double &greenref, double
}
}
//calculate deltaE xx to find best values of spectrals datas - limited to chroma values
//calculate deltaE xx to find best values of spectrals data - limited to chroma values
int maxnb = rtengine::LIM(settings->itcwb_sizereference, 1, 5);
if (settings->itcwb_thres > 55) {
@@ -5204,8 +5204,8 @@ void RawImageSource::ItcWB(bool extra, double &tempref, double &greenref, double
reff_spect_xxyy[2 * kkg + 1][tt] = reff_spect_xxyy_prov[2 * i + 1][tt];
}
}
//now we have good spectral datas
//claculate student correlation
//now we have good spectral data
//calculate student correlation
const float abstudgr = std::fabs(studentXY(xxyycurr_reduc, reff_spect_xxyy, 2 * w, 2 * kkg, tt));
if (abstudgr < minstudgr) { // find the minimum Student