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/crop.cc
+++ b/rtgui/crop.cc
@@ -38,7 +38,7 @@ public:
 Crop::Crop (): FoldableToolPanel(this, "crop", M("TP_CROP_LABEL"), false, true)
 {

-    clistener = NULL;
+    clistener = nullptr;

    maxw = 3000;
    maxh = 2000;
@@ -1281,7 +1281,7 @@ double Crop::getRatio ()

    double r = -1.0;

-    if (fixr->get_active() == false) {
+    if (!fixr->get_active()) {
        return r;
    }