Beep6581 / RawTherapee

A powerful cross-platform raw photo processing program
https://rawtherapee.com
GNU General Public License v3.0
2.81k stars 318 forks source link

Build fails for openSUSE Factory PPC and openSUSE Leap 42.1 #4307

Closed mbajor closed 6 years ago

mbajor commented 6 years ago

RT version : git.20180114.474.g3c50e8ff. Latest success build: git.20180113.462.g0498048c Sample logs: https://build.opensuse.org/public/build/home:rawtherapee/openSUSE_Factory_PowerPC/ppc/rawtherapee-unstable/_log https://build.opensuse.org/public/build/home:rawtherapee/openSUSE_Leap_42.1/x86_64/rawtherapee-unstable/_log

Floessie commented 6 years ago

@mbajor Marcin, here's a patch:

diff --git a/rtgui/colortoning.cc b/rtgui/colortoning.cc
index 2ca099769..3d3d21d66 100644
--- a/rtgui/colortoning.cc
+++ b/rtgui/colortoning.cc
@@ -331,7 +331,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
     labgridReset->get_style_context()->add_class(GTK_STYLE_CLASS_FLAT);
     labgridReset->set_can_focus(false);
     labgridReset->set_size_request(-1, 20);
-    labgridReset->signal_button_release_event().connect([=](GdkEventButton* release_event) { labgrid->reset(release_event->state & GDK_CONTROL_MASK ? true : false); return false; });
+    labgridReset->signal_button_release_event().connect(sigc::mem_fun(*this, &ColorToning::resetPressed));
     labgridBox->pack_start(*labgridReset, false, false);
     pack_start(*labgridBox, Gtk::PACK_EXPAND_WIDGET, 4);
     //------------------------------------------------------------------------
@@ -1165,3 +1165,9 @@ void ColorToning::setBatchMode (bool batchMode)
     cl2CurveEditorG->setBatchMode (batchMode);

 }
+
+bool ColorToning::resetPressed(GdkEventButton* event)
+{
+    labgrid->reset(event->state & GDK_CONTROL_MASK);
+    return false;
+}
diff --git a/rtgui/colortoning.h b/rtgui/colortoning.h
index 588e6ee3b..73ac1dff2 100644
--- a/rtgui/colortoning.h
+++ b/rtgui/colortoning.h
@@ -53,6 +53,8 @@ public:
     void setListener(ToolPanelListener *tpl);

 private:
+    bool resetPressed(GdkEventButton* event);
+
     //Gtk::HSeparator* satLimiterSep;
     Gtk::HSeparator* colorSep;
     CurveEditorGroup* colorCurveEditorG;

HTH, Flössie

mbajor commented 6 years ago

@Floessie Patch tested. Fix confirmed. Thank you!

Floessie commented 6 years ago

You're welcome. Thanks for reporting and testing! 👍