Merge branch 'master' into spot-removal-tool

2016-12-28 01:57:46 +01:00
parent 6b22cbd831 cc8dae26ff
commit 3eeeb151ec
383 changed files with 30405 additions and 10838 deletions
--- a/rtengine/imagefloat.cc
+++ b/rtengine/imagefloat.cc
@@ -47,7 +47,7 @@ Imagefloat::~Imagefloat ()
 void Imagefloat::setScanline (int row, unsigned char* buffer, int bps, float *minValue, float *maxValue)
 {

-    if (data == NULL) {
+    if (data == nullptr) {
        return;
    }

@@ -146,7 +146,7 @@ void Imagefloat::setScanline (int row, unsigned char* buffer, int bps, float *mi
 void Imagefloat::getScanline (int row, unsigned char* buffer, int bps)
 {

-    if (data == NULL) {
+    if (data == nullptr) {
        return;
    }