Fix various typos (#6332)

* Fix various typos

Found via `codespell -q 3 -S ./rtdata/languages -L ba,bord,childs,hist,fo,reall,bloc,alph,dof,inout,thre,makro,chang,currentry,preserv,portugues,struc,trough,vektor`

* Fix source typo

* Added requested revisions
This commit is contained in:
luzpaz 2021-08-13 08:37:29 -04:00 committed by GitHub
parent 1c4e1216d2
commit 22f89bc752
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 27 additions and 27 deletions

View File

@ -2942,7 +2942,7 @@ TP_LOCALLAB_MASKHIGTHRESWAV_TOOLTIP;Lighter-tone limit above which the parameter
TP_LOCALLAB_MASKHIGTHRESE_TOOLTIP;Lighter-tone limit above which the parameters will be restored progressively to their original values prior to being modified by the 'Dynamic range and Exposure' settings.\n You can use certain tools in Mask and modifications to change the gray levels: Smooth radius, Gamma and Slope, Contrast curve.\n Use a lockable colorpicker on the mask to see which areas will be affected. Make sure you set Background color mask = 0 in Settings.
TP_LOCALLAB_MASKHIGTHRESL_TOOLTIP;Lighter-tone limit above which the parameters will be restored progressively to their original values prior to being modified by the Log encoding settings.\n You can use certain tools in Mask and modifications to change the gray levels:Smooth radius, Contrast curve.\n Use a lockable color picker on the mask to see which areas will be affected. Make sure you set Background color mask = 0 in Settings.
TP_LOCALLAB_MASKHIGTHRESD_TOOLTIP; The denoise is progressively decreased from 100% at the threshold setting to 0% at the maximum white value (as determined by the mask).\n You can use certain tools in Mask and modifications to change the gray levels: Structure mask, Smooth radius, Gamma and Slope, Contrast curve, Local contrast (wavelets).\n Use a lockable color picker on the mask to see which areas will be affected. Make sure you set Background color mask'=0 in Settings.
TP_LOCALLAB_MASKHIGTHRES_TOOLTIP; The Guided Filter is progressively decreased from 100% at the threshold setting to 0% at the maximum white value (as determined by the mask).\n You can use certain tools in Mask and modifications to change the gray levels: structure mask, Smooth radius, Gamma and slope, Contrast curve, Local contrast wavelet.\n Use a lockable color picker on the mask to see which areas will be affected. Be carefull in 'settings' to Background color mask = 0
TP_LOCALLAB_MASKHIGTHRES_TOOLTIP; The Guided Filter is progressively decreased from 100% at the threshold setting to 0% at the maximum white value (as determined by the mask).\n You can use certain tools in Mask and modifications to change the gray levels: structure mask, Smooth radius, Gamma and slope, Contrast curve, Local contrast wavelet.\n Use a lockable color picker on the mask to see which areas will be affected. Be careful in 'settings' to Background color mask = 0
TP_LOCALLAB_MASKLCTHR;Light area luminance threshold
TP_LOCALLAB_MASKLCTHR2;Light area luma threshold
TP_LOCALLAB_MASKLCTHRLOW;Dark area luminance threshold
@ -3095,7 +3095,7 @@ TP_LOCALLAB_RETIFRA;Retinex
TP_LOCALLAB_RETIFRAME_TOOLTIP;Retinex can be useful for processing images: \nthat are blurred, foggy or hazy (in addition to Dehaze).\nthat contain large differences in luminance.\nIt can also be used for special effects (tone mapping).
TP_LOCALLAB_RETIM;Original Retinex
TP_LOCALLAB_RETITOOLFRA;Retinex Tools
TP_LOCALLAB_RETI_FFTW_TOOLTIP;FFT improve quality and allow big radius, but increases the treatment time.\nThe treatment time depends on the surface to be treated\nThe treatment time depends on the value of scale (be carefull to high values).\nTo be used preferably for large radius.\n\nDimensions can be reduced by a few pixels to optimize FFTW.\nThis optimization can reduce the treatment time by a factor of 1.5 to 10.\nOptimization not used in Preview
TP_LOCALLAB_RETI_FFTW_TOOLTIP;FFT improve quality and allow big radius, but increases the treatment time.\nThe treatment time depends on the surface to be treated\nThe treatment time depends on the value of scale (be careful of high values).\nTo be used preferably for large radius.\n\nDimensions can be reduced by a few pixels to optimize FFTW.\nThis optimization can reduce the treatment time by a factor of 1.5 to 10.\nOptimization not used in Preview
TP_LOCALLAB_RETI_LIGHTDARK_TOOLTIP;Has no effect when the value of "Lightness = 1" or "Darkness =2".\nFor other values, the last step of a "Multiple scale Retinex" algorithm (similar to "local contrast") is applied. These 2 cursors, associated with "Strength" allow you to make adjustments upstream of local contrast
TP_LOCALLAB_RETI_LIMDOFFS_TOOLTIP;Adjusts the internal parameters to optimize the response.\nPreferable to keep the "Restored data" values close to Min=0 and Max=32768 (log mode), but other values are possible.
TP_LOCALLAB_RETI_LOGLIN_TOOLTIP;Logarithm mode introduces more contrast but will also generate more halos.
@ -3156,7 +3156,7 @@ TP_LOCALLAB_SHOWMASKSOFT_TOOLTIP;Allows you to visualize the different stages of
TP_LOCALLAB_SHOWMASKTYP1;Blur & Noise
TP_LOCALLAB_SHOWMASKTYP2;Denoise
TP_LOCALLAB_SHOWMASKTYP3;Blur & Noise + Denoise
//TP_LOCALLAB_SHOWMASKTYP_TOOLTIP;Mask and modifications can be chosen.\nBlur and noise : in this case it is not used for 'denoise'.\nDenoise : in this case it is not used for 'blur and noise'.\n\nBlur and noise + denoise : mask is shared, be carefull to 'show modifications' and 'scope'
//TP_LOCALLAB_SHOWMASKTYP_TOOLTIP;Mask and modifications can be chosen.\nBlur and noise : in this case it is not used for 'denoise'.\nDenoise : in this case it is not used for 'blur and noise'.\n\nBlur and noise + denoise : mask is shared, be careful to 'show modifications' and 'scope'
TP_LOCALLAB_SHOWMASKTYP_TOOLTIP;Can be used with Mask and modifications.\nIf Blur and noise is selected, the mask cannot be used for Denoise.\nIf Denoise is selected, the mask cannot be used for Blur and noise.\nIf Blur and noise + Denoise is selected, the mask is shared. Note that in this case, the Scope sliders for both Blur and noise and Denoise will be active so it is advisable to use the option Show modifications with mask when making any adjustments.
TP_LOCALLAB_SHOWMNONE;Show modified image
TP_LOCALLAB_SHOWMODIF;Show modified areas without mask

View File

@ -569,7 +569,7 @@ Camera constants:
{ // Quality B, taken from 6D Mark II because identical sensor (different matrix)
"make_model": "Canon EOS RP",
"dcraw_matrix": [ 8608,-2097,-1178,-5425,13265,2383,-1149,2238,5680 ], // DNG v13.2
// Let dcraw handle crop, because camconst shouldn't override for diferent crop factors. See #6255
// Let dcraw handle crop, because camconst shouldn't override for different crop factors. See #6255
"masked_areas": [ 44, 4, 4220, 116 ], // Potential problem for different crop factor as well
"ranges": {
"white": [

View File

@ -3683,7 +3683,7 @@ void ImProcFunctions::secondeg_begin(float reducac, float vend, float &aam, floa
* @param RedHigh [-1..1] value after transformations of sliders [-100..100] for highlights
* @param GreenHigh [-1..1] value after transformations of sliders [-100..100] for highlights
* @param BlueHigh [-1..1] value after transformations of sliders [-100..100] for highlights
* @param reducac value of the reduction in the middle of the range for second degree increse or decrease action
* @param reducac value of the reduction in the middle of the range for second degree increase or decrease action
* @param mode 0 = colour, 1 = Black and White
* @param strProtect ?
**/

View File

@ -128,7 +128,7 @@ public:
for (int i = 0; i < W; ++i) {
double wx = ox + i;
double x = wx / wddf;
double noise = simplex_2d_noise(x, y, octaves, 1.0, zoom) / s;
double noise = simplex_2d_noise(x, y, octaves, zoom) / s;
lab_L[j][i] += lut_lookup(noise * strength * GRAIN_LIGHTNESS_STRENGTH_SCALE, lab_L[j][i] / 32768.f);
}
}
@ -290,7 +290,7 @@ private:
return 32.0 * (n0 + n1 + n2 + n3);
}
double simplex_2d_noise(double x, double y, uint32_t octaves, double persistance, double z)
double simplex_2d_noise(double x, double y, uint32_t octaves, double z)
{
double total = 0;

View File

@ -465,7 +465,7 @@ void ImProcFunctions::workingtrc(const Imagefloat* src, Imagefloat* dst, int cw,
}
if (mul == 1 ||(params->icm.wprim == ColorManagementParams::Primaries::DEFAULT && params->icm.will == ColorManagementParams::Illuminant::DEFAULT)) {//shortcut and speedup when no call primaries and illuminant - no gamut control...in this case be carefull
if (mul == 1 ||(params->icm.wprim == ColorManagementParams::Primaries::DEFAULT && params->icm.will == ColorManagementParams::Illuminant::DEFAULT)) {//shortcut and speedup when no call primaries and illuminant - no gamut control...in this case be careful
GammaValues g_a; //gamma parameters
double pwr = 1.0 / static_cast<double>(gampos);
Color::calcGamma(pwr, slpos, g_a); // call to calcGamma with selected gamma and slope

View File

@ -154,7 +154,7 @@ constexpr float exclusion(float a, float b)
void calcdif(float lmr, float &lmrc)
{ //approximative change between gamma sRGB g=2.4 s=12.92 and gamma LAB g=3.0 s=9.03
//useful to calculate action with dark and light area mask
//differences in 3 parts linear...very small diffrences with real...
//differences in 3 parts linear...very small differences with real...
float a0 = 7.6f / 11.6f;//11.6 sRGB - 7.6 Lab...11.6 max difference
float a01 = 62.f - 7.6f; //60 sRGB 62 Lab 60 max difference
float a11 = 60.f - 11.6f;
@ -6083,7 +6083,7 @@ void ImProcFunctions::InverseColorLight_Local(bool tonequ, bool tonecurv, int sp
cmsHTRANSFORM dummy = nullptr;
workingtrc(tmpImage.get(), tmpImage.get(), GW, GH, -5, prof, 2.4, 12.92310, ill, 0, dummy, true, false, false);
// workingtrc(tmpImage.get(), tmpImage.get(), GW, GH, 5, prof, gamtone, slotone, illum, 0, dummy, false, true, true);//to keep if we want improve with illuminant and primaries
workingtrc(tmpImage.get(), tmpImage.get(), GW, GH, 1, prof, gamtone, slotone, ill, 0, dummy, false, true, true);//be carefull no gamut control
workingtrc(tmpImage.get(), tmpImage.get(), GW, GH, 1, prof, gamtone, slotone, ill, 0, dummy, false, true, true);//be careful no gamut control
}
@ -6412,7 +6412,7 @@ void ImProcFunctions::calc_ref(int sp, LabImage * original, LabImage * transform
// single precision for the result
float avA, avB, avL;
int spotSize = 0.88623f * rtengine::max(1, lp.cir / sk); //18
//O.88623 = std::sqrt(PI / 4) ==> sqare equal to circle
//O.88623 = std::sqrt(PI / 4) ==> square equal to circle
int spotSise2; // = 0.88623f * max (1, lp.cir / sk); //18
// very small region, don't use omp here
@ -9027,7 +9027,7 @@ void ImProcFunctions::DeNoise(int call, float * slidL, float * slida, float * sl
//local denoise
//all these variables are to prevent use of denoise when non necessary
// but with qualmet = 2 (default for best quality) we must denoise chroma with little values to prevent artifacts due to variations of Hue
// but if user select voluntary denoise, it is that choice the good (prioritary)
// but if user select voluntary denoise, it is that choice the good (priority)
bool execcolor = (lp.chro != 0.f || lp.ligh != 0.f || lp.cont != 0); // only if one slider or more is engaged
bool execbdl = (lp.mulloc[0] != 1.f || lp.mulloc[1] != 1.f || lp.mulloc[2] != 1.f || lp.mulloc[3] != 1.f || lp.mulloc[4] != 1.f || lp.mulloc[5] != 1.f) ;//only if user want cbdl
bool execdenoi = noiscfactiv && ((lp.colorena && execcolor) || (lp.tonemapena && lp.strengt != 0.f) || (lp.cbdlena && execbdl) || (lp.sfena && lp.strng > 0.f) || (lp.lcena && lp.lcamount > 0.f) || (lp.sharpena && lp.shrad > 0.42) || (lp.retiena && lp.str > 0.f) || (lp.exposena && lp.expcomp != 0.f) || (lp.expvib && lp.past != 0.f));
@ -11006,7 +11006,7 @@ void ImProcFunctions::NLMeans(float **img, int strength, int detail_thresh, int
float gamma = gam;
rtengine::GammaValues g_a; //gamma parameters
double pwr = 1.0 / static_cast<double>(gam);//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
//first change Lab L to pseudo linear with gamma = 3.f slope 9.032...and in range 0...65536, or with gamma slope Lab
@ -11049,7 +11049,7 @@ void ImProcFunctions::NLMeans(float **img, int strength, int detail_thresh, int
// laplacian filter with additional averaging and smoothing. The
// detail_thresh parameter controls the degree of detail preservation: the
// (averaged, smoothed) laplacian is first normalized to [0,1], and then
// modified by compression and offseting depending on the detail_thresh
// modified by compression and offsetting depending on the detail_thresh
// parameter, i.e. mask[y][x] = mask[y][x] * (1 - f) + f,
// where f = detail_thresh / 100
float amount = LIM(float(detail_thresh)/100.f, 0.f, 0.99f);
@ -13959,7 +13959,7 @@ void ImProcFunctions::Lab_Local(
int ill =0;
workingtrc(tmpImage, tmpImage, bfw, bfh, -5, prof, 2.4, 12.92310, ill, 0, dummy, true, false, false);
// workingtrc(tmpImage, tmpImage, bfw, bfh, 5, prof, gamtone, slotone, 0, 0, dummy, false, true, true); //to keep if we want improve with illuminant and primaries
workingtrc(tmpImage, tmpImage, bfw, bfh, 1, prof, gamtone, slotone, ill, 0, dummy, false, true, true);//be carefull no gamut control
workingtrc(tmpImage, tmpImage, bfw, bfh, 1, prof, gamtone, slotone, ill, 0, dummy, false, true, true);//be careful no gamut control
}
if (tonequ) {
@ -14903,7 +14903,7 @@ void ImProcFunctions::Lab_Local(
if (lp.expcomp != 0.f ) { // || lp.laplacexp > 0.1f
if(lp.laplacexp <= 0.1f) {
lp.laplacexp = 0.2f; //force to use Laplacian wth very small values
lp.laplacexp = 0.2f; //force to use Laplacian with very small values
}
ImProcFunctions::exlabLocal(lp, 1.f, bfh, bfw, bfhr, bfwr, bufexporig.get(), bufexpfin.get(), hltonecurveloc, shtonecurveloc, tonecurveloc, hueref, lumaref, chromaref);
}

View File

@ -2122,7 +2122,7 @@ struct HSVEqualizerParams {
};
/**
* Film simualtion params
* Film simulation params
*/
struct FilmSimulationParams {
bool enabled;

View File

@ -566,7 +566,7 @@ public:
* Since the ProcParams can be tweaked by a GUI to operate on the image at a specific stage or with disabled tool,
* you'll have to specify if you want the tweaked version for the current special mode, or the untweaked one.
* @param dst is the location where the image processing parameters are copied (it is assumed that the memory is allocated by the caller)
* @param tweaked is used to chose betwen the tweaked ProcParams (if there is one) or the untweaked one */
* @param tweaked is used to choose between the tweaked ProcParams (if there is one) or the untweaked one */
virtual void getParams (procparams::ProcParams* dst, bool tweaked=false) = 0;
/** An essential member function. Call this when a setting has been changed. This function returns a pointer to the
* processing parameters, that you have to update to reflect the changed situation. When ready, call the paramsUpdateReady

View File

@ -493,7 +493,7 @@ void ImProcFunctions::removeSpots (Imagefloat* img, ImageSource* imgsrc, const s
}
// Construct list of upstream dependancies
// Construct list of upstream dependencies
std::unordered_set<int> requiredSpotsSet = calcSpotDependencies(visibleSpots, srcSpotBoxs, dstSpotBoxs);
std::vector<int> requiredSpots(requiredSpotsSet.size());

View File

@ -38,7 +38,7 @@ class TweakOperator
public:
virtual ~TweakOperator() {}
/** Callback that will alter the ProcParams before hte image is computed. */
/** Callback that will alter the ProcParams before the image is computed. */
virtual void tweakParams(procparams::ProcParams& pparams) = 0;
};

View File

@ -342,7 +342,7 @@ public:
choices[26] = "Museum";
choices[27] = "Shoot & Select";
choices[28] = "Beach & Snow";
choices[29] = "Self Protrait+Timer";
choices[29] = "Self Portrait+Timer";
choices[30] = "Candle";
choices[31] = "Available Light";
choices[32] = "Behind Glass";

View File

@ -1003,7 +1003,7 @@ MyScrolledToolbar::MyScrolledToolbar ()
set_policy (Gtk::POLICY_EXTERNAL, Gtk::POLICY_NEVER);
get_style_context()->add_class("scrollableToolbar");
// Works fine with Gtk 3.22, but a a custom made get_preferred_height had to be created as a workaround
// Works fine with Gtk 3.22, but a custom made get_preferred_height had to be created as a workaround
// taken from the official Gtk3.22 source code
//set_propagate_natural_height(true);
}
@ -1213,7 +1213,7 @@ bool MySpinButton::on_key_press_event (GdkEventKey* event)
} else {
if (event->keyval == GDK_KEY_comma || event->keyval == GDK_KEY_KP_Decimal) {
set_text(get_text() + ".");
set_position(get_text().length()); // When setting text, cursor position is reseted at text start. Avoiding this with this code
set_position(get_text().length()); // When setting text, cursor position is reset at text start. Avoiding this with this code
return true; // Event is not propagated further
}

View File

@ -232,7 +232,7 @@ public:
*/
MyExpander(bool useEnabled, Glib::ustring titleLabel);
/** Create a custom expander with a a custom - and responsive - widget
/** Create a custom expander with a custom - and responsive - widget
* @param useEnabled Set whether to handle an enabled/disabled toggle button and display the appropriate image
* @param titleWidget A widget to display in the header. Warning: you won't be able to switch to a string label.
*/

View File

@ -270,7 +270,7 @@ bool LabGridArea::on_draw(const ::Cairo::RefPtr<Cairo::Context> &crf)
// this graph is not accurate...I replace curve by polygon or parabolic
float xa = 0.2653f / (0.7347f - 0.17f);
float xb = -0.17f * xa;
//linaer values
//linear values
// float ax = (0.1f - 0.6f) / 0.08f;
// float bx = 0.6f;
// float ax0 = -0.1f / (0.17f - 0.08f);

View File

@ -1275,7 +1275,7 @@ Gtk::Widget* Preferences::getGeneralPanel()
vb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
vb->pack_start(*hb);
hb = Gtk::manage(new Gtk::Box());
//I disabled these 2 functionnalities...easy to enable
//I disabled these 2 functionalities...easy to enable
// hb->pack_start(*editor_float32, Gtk::PACK_SHRINK);
// hb->pack_start(*editor_bypass_output_profile, Gtk::PACK_SHRINK, 4);
vb->pack_start(*hb, Gtk::PACK_SHRINK, 4);

View File

@ -446,7 +446,7 @@ void ThumbBrowserEntryBase::getTextSizes (int& infow, int& infoh)
Glib::RefPtr<Pango::Layout> fn = w->create_pango_layout(dispname);
fn->get_pixel_size (fnlabw, fnlabh);
// calculate cummulated height of all info fields
// calculate cumulated height of all info fields
infoh = fnlabh;
infow = 0;