diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 33cce1842..9eb7043d1 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -2408,7 +2408,7 @@ bool ImProcCoordinator::getAutoWB(double& temp, double& green, double equal, dou if (lastAwbEqual != equal || lastAwbTempBias != tempBias || lastAwbauto != params->wb.method) { // Issue 2500 MyMutex::MyLock lock(minit); // Also used in crop window double rm, gm, bm; - params->wb.method = "autold";//same result as before muliple Auto WB + params->wb.method = "autold";//same result as before multiple Auto WB // imgsrc->getAutoWBMultipliers(rm, gm, bm); double tempitc = 5000.; diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index e3256d1ce..9272c2c69 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -3201,7 +3201,7 @@ void ImProcFunctions::ciecamloc_02float(const struct local_params& lp, int sp, L avgm + (1. - avgm) * (0.6 - contreal / 250.0), avgm + (1. - avgm) * (0.6 + contreal / 250.0), 1, 1 }); - //all calculs in double to best results...but slow + //all calculations in double for best results...but slow double lightreal = 0.2 * params->locallab.spots.at(sp).lightjzcie; double chromz = params->locallab.spots.at(sp).chromjzcie; double saturz = params->locallab.spots.at(sp).saturjzcie; @@ -4244,7 +4244,7 @@ if(mocam == 3) {//Zcam not use but keep in case off 1, 1 }); - //all calculs in double to best results...but slow + //all calculations in double for best results...but slow double lqz = 0.4 * params->locallab.spots.at(sp).lightqzcam; if(params->locallab.spots.at(sp).lightqzcam < 0) { lqz = 0.2 * params->locallab.spots.at(sp).lightqzcam; //0.4 less effect, no need 1. @@ -15565,7 +15565,7 @@ void ImProcFunctions::Lab_Local( //vibrance float vibg = params->locallab.spots.at(sp).vibgam; - if (lp.expvib && (lp.past != 0.f || lp.satur != 0.f || lp.strvib != 0.f || vibg != 1.f || lp.war != 0 || lp.strvibab != 0.f || lp.strvibh != 0.f || lp.showmaskvibmet == 2 || lp.enavibMask || lp.showmaskvibmet == 3 || lp.showmaskvibmet == 4 || lp.prevdE) && lp.vibena) { //interior ellipse renforced lightness and chroma //locallutili + if (lp.expvib && (lp.past != 0.f || lp.satur != 0.f || lp.strvib != 0.f || vibg != 1.f || lp.war != 0 || lp.strvibab != 0.f || lp.strvibh != 0.f || lp.showmaskvibmet == 2 || lp.enavibMask || lp.showmaskvibmet == 3 || lp.showmaskvibmet == 4 || lp.prevdE) && lp.vibena) { //interior ellipse reinforced lightness and chroma //locallutili if (call <= 3) { //simpleprocess, dcrop, improccoordinator const int ystart = rtengine::max(static_cast(lp.yc - lp.lyT) - cy, 0); const int yend = rtengine::min(static_cast(lp.yc + lp.ly) - cy, original->H); @@ -17292,7 +17292,7 @@ void ImProcFunctions::Lab_Local( evnoise *= 0.4f; } - //soft denoise, user must use Local Denoise to best result + //soft denoise, user must use Local Denoise for best result Median med; if (evnoise < -18000.f) { med = Median::TYPE_5X5_STRONG; @@ -17545,7 +17545,7 @@ void ImProcFunctions::Lab_Local( const float a_scalemerg = (lp.highAmerg - lp.lowAmerg) / factor / scaling; const float b_scalemerg = (lp.highBmerg - lp.lowBmerg) / factor / scaling; - if (!lp.inv && (lp.chro != 0 || lp.ligh != 0.f || lp.cont != 0 || ctoning || lp.mergemet > 0 || lp.strcol != 0.f || lp.strcolab != 0.f || lp.qualcurvemet != 0 || lp.showmaskcolmet == 2 || lp.enaColorMask || lp.showmaskcolmet == 3 || lp.showmaskcolmet == 4 || lp.showmaskcolmet == 5 || lp.prevdE) && lp.colorena) { // || lllocalcurve)) { //interior ellipse renforced lightness and chroma //locallutili + if (!lp.inv && (lp.chro != 0 || lp.ligh != 0.f || lp.cont != 0 || ctoning || lp.mergemet > 0 || lp.strcol != 0.f || lp.strcolab != 0.f || lp.qualcurvemet != 0 || lp.showmaskcolmet == 2 || lp.enaColorMask || lp.showmaskcolmet == 3 || lp.showmaskcolmet == 4 || lp.showmaskcolmet == 5 || lp.prevdE) && lp.colorena) { // || lllocalcurve)) { //interior ellipse reinforced lightness and chroma //locallutili int ystart = rtengine::max(static_cast(lp.yc - lp.lyT) - cy, 0); int yend = rtengine::min(static_cast(lp.yc + lp.ly) - cy, original->H); int xstart = rtengine::max(static_cast(lp.xc - lp.lxL) - cx, 0); diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc index 5ced9dbdd..18ee72b80 100644 --- a/rtengine/ipwavelet.cc +++ b/rtengine/ipwavelet.cc @@ -2032,7 +2032,7 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const } a = 327.68f * Chprov * sincosv.y; // apply Munsell - b = 327.68f * Chprov * sincosv.x; //aply Munsell + b = 327.68f * Chprov * sincosv.x; // apply Munsell } else {//general case L = labco->L[i1][j1]; const float Lin = std::max(0.f, L); diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc index a2f96cac3..2beb429a8 100644 --- a/rtgui/adjuster.cc +++ b/rtgui/adjuster.cc @@ -198,7 +198,7 @@ void Adjuster::addAutoButton (const Glib::ustring &tooltip) autoChange = automatic->signal_toggled().connect( sigc::mem_fun(*this, &Adjuster::autoToggled) ); if (grid) { - // Hombre, adding the checbox next to the reset button because adding it next to the spin button (as before) + // Hombre, adding the checkbox next to the reset button because adding it next to the spin button (as before) // would diminish the available size for the label and would require a much heavier reorganization of the grid ! grid->attach_next_to(*automatic, *reset, Gtk::POS_RIGHT, 1, 1); } else { diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh index 9b7042f1f..d0cbf4d6b 100644 --- a/tools/osx/macosx_bundle.sh +++ b/tools/osx/macosx_bundle.sh @@ -124,7 +124,7 @@ LOCAL_PREFIX="$(cmake .. -L -N | grep LOCAL_PREFIX)"; LOCAL_PREFIX="${LOCAL_PREF #Out: https:// etc. UNIVERSAL_URL="$(cmake .. -L -N | grep OSX_UNIVERSAL_URL)"; UNIVERSAL_URL="${UNIVERSAL_URL#*=}" if [[ -n $UNIVERSAL_URL ]]; then - echo "Univeral app is ON. The URL is ${UNIVERSAL_URL}" + echo "Universal app is ON. The URL is ${UNIVERSAL_URL}" fi #In: pkgcfg_lib_EXPAT_expat:FILEPATH=/opt/local/lib/libexpat.dylib @@ -313,7 +313,7 @@ install_name_tool -delete_rpath RawTherapee.app/Contents/Frameworks "${EXECUTABL install_name_tool -add_rpath /Applications/"${LIB}" "${EXECUTABLE}"-cli 2>/dev/null ditto "${EXECUTABLE}"-cli "${APP}"/.. -# Merge the app with the other archictecture to create the Universal app. +# Merge the app with the other architecture to create the Universal app. if [[ -n $UNIVERSAL_URL ]]; then msg "Getting Universal countercomponent." curl -L ${UNIVERSAL_URL} -o univ.zip