Merge branch 'master' into gtk3

2016-11-11 23:05:29 +01:00
parent a961325397 7cb8781910
commit 024905a8ca
15 changed files with 1903 additions and 46 deletions
--- a/rtgui/imagearea.h
+++ b/rtgui/imagearea.h
@@ -41,9 +41,8 @@ class ImageArea : public Gtk::DrawingArea, public CropWindowListener, public Edi
 protected:

    Glib::ustring infotext;
-    Glib::RefPtr<Pango::Layout> ilayout;
    Glib::RefPtr<Pango::Layout> deglayout;
-    Glib::RefPtr<Gdk::Pixbuf>   ipixbuf;
+    BackBuffer iBackBuffer;
    bool showClippedH, showClippedS;

    ImageAreaPanel* parent;