Merge master into gtk3

2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
--- a/rtgui/previewwindow.cc
+++ b/rtgui/previewwindow.cc
@@ -21,8 +21,9 @@
 #include "imagearea.h"
 #include "cursormanager.h"

-PreviewWindow::PreviewWindow () : previewHandler(NULL), mainCropWin(NULL), imageArea(NULL), imgX(0), imgY(0), imgW(0), imgH(0),
+PreviewWindow::PreviewWindow () : previewHandler(nullptr), mainCropWin(nullptr), imageArea(nullptr), imgX(0), imgY(0), imgW(0), imgH(0),
    zoom(0.0), isMoving(false), needsUpdate(false), cursor_type(CSUndefined)
+
 {
    set_name("PreviewWindow");
    rconn = signal_size_allocate().connect( sigc::mem_fun(*this, &PreviewWindow::on_resized) );