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

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Morgan Hardwood
2016-12-18 17:49:03 +01:00
parent e1c5e76c10 e5dba2e890
commit 76314b9422
8 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtdata/languages/default
View File

@@ -1784,7 +1784,6 @@ TP_SHARPENING_RLD_AMOUNT;Amount
TP_SHARPENING_RLD_DAMPING;Damping
TP_SHARPENING_RLD_ITERATIONS;Iterations
TP_SHARPENING_THRESHOLD;Threshold
TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
TP_SHARPENING_USM;Unsharp Mask
TP_SHARPENMICRO_AMOUNT;Quantity
TP_SHARPENMICRO_LABEL;Microcontrast

4
rtengine/dcrop.cc
View File

@@ -678,7 +678,7 @@ void Crop::update (int todo)
createBuffer(cropw, croph);
// transform
if (needstransform || ((todo & (M_TRANSFORM)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) {
if (needstransform || ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) {
if (!transCrop) {
transCrop = new Imagefloat (cropw, croph);
}
@@ -701,7 +701,7 @@ void Crop::update (int todo)
transCrop = nullptr;
}
if ((todo & (M_TRANSFORM)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
if ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
const int W = baseCrop->getWidth();
const int H = baseCrop->getHeight();

6
rtengine/improccoordinator.cc
View File

@@ -372,12 +372,12 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
// Remove transformation if unneeded
bool needstransform = ipf.needsTransform();
if (!needstransform && !((todo & (M_TRANSFORM)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) && orig_prev != oprevi) {
if (!needstransform && !((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) && orig_prev != oprevi) {
delete oprevi;
oprevi = orig_prev;
}
if ((needstransform || ((todo & (M_TRANSFORM)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) ) {
if ((needstransform || ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) ) {
if(!oprevi || oprevi == orig_prev)
oprevi = new Imagefloat (pW, pH);
if (needstransform)
@@ -387,7 +387,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
orig_prev->copyData(oprevi);
}
if ((todo & (M_TRANSFORM)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
if ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
const int W = oprevi->getWidth();
const int H = oprevi->getHeight();
LabImage labcbdl(W, H);

2
rtengine/rawimage.cc
View File

@@ -534,7 +534,7 @@ int RawImage::loadRaw (bool loadData, bool closeFile, ProgressListener *plistene
free (raw_image);
raw_image = nullptr;
} else {
if (cc && cc->has_rawCrop()) { // foveon images
if (is_foveon && cc && cc->has_rawCrop()) { // foveon images
int lm, tm, w, h;
cc->get_rawCrop(lm, tm, w, h);
left_margin = lm;

2
rtgui/defringe.cc
View File

@@ -35,8 +35,6 @@ Defringe::Defringe () : FoldableToolPanel(this, "defringe", M("TP_DEFRINGE_LABEL
bottomMilestones.push_back( GradientMilestone(double(x), double(R), double(G), double(B)) );
}
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
curveEditorPF = new CurveEditorGroup (options.lastPFCurvesDir);
curveEditorPF->setCurveListener (this);
chshape = static_cast<FlatCurveEditor*>(curveEditorPF->addCurve(CT_Flat, M("TP_PFCURVE_CURVEEDITOR_CH")));

2
rtgui/dirpyrequalizer.cc
View File

@@ -69,8 +69,6 @@ DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer",
cbVBox->pack_start(*cdbox);
pack_start(*cbVBox);
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
Gtk::HBox * buttonBox1 = Gtk::manage (new Gtk::HBox(true, 10));
pack_start(*buttonBox1);

2
rtgui/sharpening.cc
View File

@@ -25,8 +25,6 @@ using namespace rtengine::procparams;
Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENING_LABEL"), true, true)
{
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
hb->show ();
Gtk::Label* ml = Gtk::manage (new Gtk::Label (M("TP_SHARPENING_METHOD") + ":"));

2
rtgui/sharpenmicro.cc
View File

@@ -28,8 +28,6 @@ using namespace rtengine::procparams;
SharpenMicro::SharpenMicro () : FoldableToolPanel(this, "sharpenmicro", M("TP_SHARPENMICRO_LABEL"), true, true)
{
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
amount = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"), 0, 100, 1, 20));
amount->setAdjusterListener (this);