Merge branch 'master' into retinex

rtdata/languages/default

@@ -1337,7 +1337,7 @@ TP_DIRPYRDENOISE_C2TYPE_TOOLTIP;Manual\nActs on the full image.\nYou control the
 TP_DIRPYRDENOISE_CCCURVE;Chrominance curve
 TP_DIRPYRDENOISE_CHROMAFR;Chrominance
 TP_DIRPYRDENOISE_CHROMA;Chrominance - Master
-TP_DIRPYRDENOISE_CTYPE;Auto method
+TP_DIRPYRDENOISE_CTYPE;Method
 TP_DIRPYRDENOISE_CTYPE_TOOLTIP;Manual\nActs on the full image.\nYou control the noise reduction settings manually.\n\nAutomatic global\nActs on the full image.\n9 zones are used to calculate a global chrominance noise reduction setting.\n\nAutomatic multi-zones\nNo preview - works only during saving, but using the "Preview" method by matching the tile size and center to the preview size and center you can get an idea of the expected results.\nThe image is divided into tiles (about 10 to 70 depending on image size) and each tile receives its own chrominance noise reduction settings.\n\nPreview\nActs on the whole image.\nThe part of the image visible in the preview is used to calculate global chrominance noise reduction settings.
 TP_DIRPYRDENOISE_CURVEEDITOR_CC;Chroma
 TP_DIRPYRDENOISE_CURVEEDITOR_CC_TOOLTIP;Increase (multiply) the value of all chrominance sliders.\nThis curve lets you adjust the strength of chromatic noise reduction as a function of chromaticity, for instance to increase the action in areas of low saturation and to decrease it in those of high saturation.

rtengine/ipwavelet.cc

@@ -3249,7 +3249,7 @@ void ImProcFunctions::ContAllL (float *koeLi[12], float *maxkoeLi, bool lipschit
             */
             float alpha = (1024.f + 15.f * (float) cpMul * scale * scale2 * beta * diagacc) / 1024.f ;
 
-            if(cp.HSmet  && cp.chromena) {
+            if(cp.HSmet  && cp.contena) {
                 float aaal = (1.f - alpha) / ((cp.b_lhl - cp.t_lhl) * kH[level]);
                 float bbal = 1.f - aaal * cp.b_lhl * kH[level];
                 float aaar = (alpha - 1.f) / (cp.t_rhl - cp.b_rhl) * kH[level];

rtgui/editorpanel.cc

@@ -567,6 +567,7 @@ void EditorPanel::open (Thumbnail* tmb, rtengine::InitialImage* isrc)
         Gtk::Allocation alloc;
         iareapanel->imageArea->on_resized(alloc);
     }
+    history->resetSnapShotNumber();
 }
 
 void EditorPanel::close ()

rtgui/history.h

@@ -126,6 +126,7 @@ public:
     void redo ();
 
     bool blistenerLock;
+    void resetSnapShotNumber() {bmnum = 1;};
 };
 
 #endif

rtgui/sharpening.cc

@@ -25,10 +25,6 @@ using namespace rtengine::procparams;
 Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENING_LABEL"), true, true)
 {
 
-    std::vector<GradientMilestone> milestones;
-    milestones.push_back( GradientMilestone(0.0, 0.0, 0.0, 0.0) );
-    milestones.push_back( GradientMilestone(1.0, 1.0, 1.0, 1.0) );
-
     setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
 
     Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
@@ -68,18 +64,17 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI
     radius = Gtk::manage (new Adjuster (M("TP_SHARPENING_RADIUS"), 0.3, 3, 0.01, 0.5));
     threshold = Gtk::manage (new ThresholdAdjuster (M("TP_SHARPENING_THRESHOLD"), 0., 2000., 20., 80., 2000., 1200., 0, false));
     threshold->setAdjusterListener (this);
-    threshold->setBgGradient(milestones);
     pack_start(*hsep6a, Gtk::PACK_SHRINK, 2);
 
     pack_start (*usm);
 
     usm->pack_start(*radius);
-    usm->pack_start(*amount);
     usm->pack_start(*threshold);
+    usm->pack_start(*amount);
     hsep6a->show ();
     radius->show ();
-    amount->show ();
     threshold->show ();
+    amount->show ();
 
     Gtk::HSeparator *hsep6 = Gtk::manage (new  Gtk::HSeparator());
     edgesonly = Gtk::manage (new Gtk::CheckButton (M("TP_SHARPENING_ONLYEDGES")));