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

Fix various typos (#6529)

Browse Source
This commit is contained in:
luzpaz 2022-08-18 10:49:26 -04:00 committed by GitHub
parent f56f0358c1
commit 65db39b9f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/ciecam02.cc
View File

@ -738,7 +738,7 @@ void Ciecam02::jzczhzxyz (double &x, double &y, double &z, double jz, double az,
Lp = Iz + 0.138605043271539 * az + 0.0580473161561189 * bz;
Mp = Iz - 0.138605043271539 * az - 0.0580473161561189 * bz;
Sp = Iz - 0.0960192420263189 * az - 0.811891896056039 * bz;
//I change optionnaly 10000 for pl function of la(absolute luminance) default 10000
//I change optionally 10000 for pl function of la(absolute luminance) default 10000
tmp = pow(Lp, Jzazbz_pi);
if(std::isnan(tmp)) {//to avoid crash

41
rtengine/iplocallab.cc
View File

@ -3325,7 +3325,7 @@ void ImProcFunctions::ciecamloc_02float(const struct local_params& lp, int sp, L
}
}
}
//others "Lab" threatment...to adapt
//others "Lab" treatment...to adapt
if(wavcurvejz || mjjz != 0.f || lp.mCjz != 0.f) {//local contrast wavelet and clarity
#ifdef _OPENMP
@ -3689,7 +3689,7 @@ void ImProcFunctions::ciecamloc_02float(const struct local_params& lp, int sp, L
if(mocam == 0 || mocam == 1 || call == 1 || call == 2 || call == 10) {//call=2 vibrance warm-cool - call = 10 take into account "mean luminance Yb for Jz
//begin ciecam
if (settings->verbose && (mocam == 0 || mocam == 1 || call == 1)) {//display only if choice cam16
//informations on Cam16 scene conditions - allows user to see choices's incidences
//information on Cam16 scene conditions - allows user to see choices's incidences
float maxicam = -1000.f;
float maxicamq = -1000.f;
float maxisat = -1000.f;
@ -8098,7 +8098,8 @@ void ImProcFunctions::InverseColorLight_Local(bool tonequ, bool tonecurv, int sp
void ImProcFunctions::calc_ref(int sp, LabImage * original, LabImage * transformed, int cx, int cy, int oW, int oH, int sk, double & huerefblur, double & chromarefblur, double & lumarefblur, double & hueref, double & chromaref, double & lumaref, double & sobelref, float & avg, const LocwavCurve & locwavCurveden, bool locwavdenutili)
{
if (params->locallab.enabled) {
//always calculate hueref, chromaref, lumaref before others operations use in normal mode for all modules exceprt denoise
// always calculate hueref, chromaref, lumaref before others operations
// use in normal mode for all modules except denoise
struct local_params lp;
calcLocalParams(sp, oW, oH, params->locallab, lp, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, locwavCurveden, locwavdenutili);
int begy = lp.yc - lp.lyT;
@ -10538,7 +10539,7 @@ void ImProcFunctions::wavcontrast4(struct local_params& lp, float ** tmp, float
}
//gamma and slope residual image - be carefull memory
//gamma and slope residual image - be careful memory
bool tonecur = false;
const Glib::ustring profile = params->icm.workingProfile;
bool isworking = (profile == "sRGB" || profile == "Adobe RGB" || profile == "ProPhoto" || profile == "WideGamut" || profile == "BruceRGB" || profile == "Beta RGB" || profile == "BestRGB" || profile == "Rec2020" || profile == "ACESp0" || profile == "ACESp1");
@ -10585,7 +10586,7 @@ void ImProcFunctions::wavcontrast4(struct local_params& lp, float ** tmp, float
cmsHTRANSFORM dummy = nullptr;
int ill =0;
workingtrc(tmpImage, tmpImage, W_Level, H_Level, -5, prof, 2.4, 12.92310, ill, 0, dummy, true, false, false);
workingtrc(tmpImage, tmpImage, W_Level, H_Level, 1, prof, lp.residgam, lp.residslop, ill, 0, dummy, false, true, true);//be carefull no gamut control
workingtrc(tmpImage, tmpImage, W_Level, H_Level, 1, prof, lp.residgam, lp.residslop, ill, 0, dummy, false, true, true);//be careful no gamut control
rgb2lab(*tmpImage, *labresid, params->icm.workingProfile);
delete tmpImage;
@ -10968,7 +10969,7 @@ void ImProcFunctions::DeNoise(int call, float * slidL, float * slida, float * sl
float gamma = lp.noisegam;
rtengine::GammaValues g_a; //gamma parameters
double pwr = 1.0 / (double) lp.noisegam;//default 3.0 - gamma Lab
double ts = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr, ts, g_a); // call to calcGamma with selected gamma and slope
if(gamma > 1.f) {
@ -11683,7 +11684,7 @@ void ImProcFunctions::DeNoise(int call, float * slidL, float * slida, float * sl
float gamma = lp.noisegam;
rtengine::GammaValues g_a; //gamma parameters
double pwr = 1.0 / (double) lp.noisegam;//default 3.0 - gamma Lab
double ts = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr, ts, g_a); // call to calcGamma with selected gamma and slope
if(gamma > 1.f) {
#ifdef _OPENMP
@ -15775,7 +15776,7 @@ void ImProcFunctions::Lab_Local(
float gamma1 = params->locallab.spots.at(sp).vibgam;
rtengine::GammaValues g_a; //gamma parameters
double pwr1 = 1.0 / (double) gamma1;//default 3.0 - gamma Lab
double ts1 = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts1 = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr1, ts1, g_a); // call to calcGamma with selected gamma and slope
if(gamma1 != 1.f) {
#ifdef _OPENMP
@ -15800,7 +15801,7 @@ void ImProcFunctions::Lab_Local(
// float gamma = params->locallab.spots.at(sp).vibgam;
// rtengine::GammaValues g_a; //gamma parameters
// double pwr = 1.0 / (double) gamma;//default 3.0 - gamma Lab
// double ts = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
// double ts = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
// rtengine::Color::calcGamma(pwr, ts, g_a); // call to calcGamma with selected gamma and slope
if(gamma1 != 1.f) {
@ -16526,7 +16527,7 @@ void ImProcFunctions::Lab_Local(
float gamma = lp.gamlc;
rtengine::GammaValues g_a; //gamma parameters
double pwr = 1.0 / (double) lp.gamlc;//default 3.0 - gamma Lab
double ts = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr, ts, g_a); // call to calcGamma with selected gamma and slope
if(gamma != 1.f) {
@ -16825,7 +16826,7 @@ void ImProcFunctions::Lab_Local(
float gamma1 = params->locallab.spots.at(sp).shargam;
rtengine::GammaValues g_a; //gamma parameters
double pwr1 = 1.0 / (double) gamma1;//default 3.0 - gamma Lab
double ts1 = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts1 = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr1, ts1, g_a); // call to calcGamma with selected gamma and slope
if(gamma1 != 1.f) {
#ifdef _OPENMP
@ -16851,7 +16852,7 @@ void ImProcFunctions::Lab_Local(
/*
float gamma = params->locallab.spots.at(sp).shargam;
double pwr = 1.0 / (double) gamma;//default 3.0 - gamma Lab
double ts = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr, ts, g_a); // call to calcGamma with selected gamma and slope
*/
if(gamma1 != 1.f) {
@ -16880,7 +16881,7 @@ void ImProcFunctions::Lab_Local(
float gamma1 = params->locallab.spots.at(sp).shargam;
rtengine::GammaValues g_a; //gamma parameters
double pwr1 = 1.0 / (double) gamma1;//default 3.0 - gamma Lab
double ts1 = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts1 = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr1, ts1, g_a); // call to calcGamma with selected gamma and slope
if(gamma1 != 1.f) {
#ifdef _OPENMP
@ -16904,7 +16905,7 @@ void ImProcFunctions::Lab_Local(
/*
float gamma = params->locallab.spots.at(sp).shargam;
double pwr = 1.0 / (double) gamma;//default 3.0 - gamma Lab
double ts = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr, ts, g_a); // call to calcGamma with selected gamma and slope
*/
if(gamma1 != 1.f) {
@ -16946,7 +16947,7 @@ void ImProcFunctions::Lab_Local(
float gamma1 = params->locallab.spots.at(sp).shargam;
rtengine::GammaValues g_a; //gamma parameters
double pwr1 = 1.0 / (double) gamma1;//default 3.0 - gamma Lab
double ts1 = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts1 = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr1, ts1, g_a); // call to calcGamma with selected gamma and slope
if(gamma1 != 1.f) {
#ifdef _OPENMP
@ -16971,7 +16972,7 @@ void ImProcFunctions::Lab_Local(
/*
float gamma = params->locallab.spots.at(sp).shargam;
double pwr = 1.0 / (double) gamma;//default 3.0 - gamma Lab
double ts = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr, ts, g_a); // call to calcGamma with selected gamma and slope
*/
if(gamma1 != 1.f) {
@ -17057,7 +17058,7 @@ void ImProcFunctions::Lab_Local(
float gamma1 = lp.gamex;
rtengine::GammaValues g_a; //gamma parameters
double pwr1 = 1.0 / (double) lp.gamex;//default 3.0 - gamma Lab
double ts1 = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts1 = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr1, ts1, g_a); // call to calcGamma with selected gamma and slope
if(gamma1 != 1.f) {
@ -17377,7 +17378,7 @@ void ImProcFunctions::Lab_Local(
float gamma = lp.gamex;
rtengine::GammaValues g_a; //gamma parameters
double pwr = 1.0 / (double) lp.gamex;//default 3.0 - gamma Lab
double ts = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr, ts, g_a); // call to calcGamma with selected gamma and slope
*/
if(gamma1 != 1.f) {
@ -17616,7 +17617,7 @@ void ImProcFunctions::Lab_Local(
float gamma1 = lp.gamc;
rtengine::GammaValues g_a; //gamma parameters
double pwr1 = 1.0 / (double) lp.gamc;//default 3.0 - gamma Lab
double ts1 = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts1 = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr1, ts1, g_a); // call to calcGamma with selected gamma and slope
if(gamma1 != 1.f) {
@ -18644,7 +18645,7 @@ void ImProcFunctions::Lab_Local(
float gamma = lp.gamc;
rtengine::GammaValues g_a; //gamma parameters
double pwr = 1.0 / (double) lp.gamc;//default 3.0 - gamma Lab
double ts = 9.03296;//always the same 'slope' in the extrem shadows - slope Lab
double ts = 9.03296;//always the same 'slope' in the extreme shadows - slope Lab
rtengine::Color::calcGamma(pwr, ts, g_a); // call to calcGamma with selected gamma and slope
*/
if(gamma1 != 1.f) {

4
rtengine/ipwavelet.cc
View File

@ -658,7 +658,7 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
maxlevelcrop = 10;
}
// adap maximum level wavelet to size of crop
// adapt maximum level wavelet to size of crop
if (minwin * skip < 1024) {
maxlevelcrop = 9; //sampling wavelet 512
}
@ -694,7 +694,7 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
levwav = rtengine::min(maxlevelcrop, levwav);
// I suppress this fonctionality ==> crash for level < 3
// I suppress this functionality ==> crash for level < 3
if (levwav < 1) {
return; // nothing to do
}

2
rtgui/filepanel.cc
View File

@ -305,7 +305,7 @@ bool FilePanel::imageLoaded( Thumbnail* thm, ProgressConnector<rtengine::Initial
#ifdef WIN32
int winGdiHandles = GetGuiResources( GetCurrentProcess(), GR_GDIOBJECTS);
if(winGdiHandles > 0 && winGdiHandles <= 6500) //(old settings 8500) 0 means we don't have the rights to access the function, 8500 because the limit is 10000 and we need about 1500 free handles
//J.Desmis october 2021 I change 8500 to 6500..Why ? because whitout while increasing size GUI system crash in multieditor
//J.Desmis october 2021 I change 8500 to 6500..Why ? because without while increasing size GUI system crash in multieditor
#endif
{
GThreadLock lock; // Acquiring the GUI... not sure that it's necessary, but it shouldn't harm