liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into spot-removal-tool

Browse Source
This commit is contained in:
Hombre
2016-12-28 01:57:46 +01:00
parent 6b22cbd831 cc8dae26ff
commit 3eeeb151ec
383 changed files with 30405 additions and 10838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rtengine/iimage.h
View File

@@ -144,7 +144,7 @@ public:
#if CHECK_BOUNDS
PlanarPtr() : width_(0), height_(0), ptrs (NULL) {}
#else
PlanarPtr() : ptrs (NULL) {}
PlanarPtr() : ptrs (nullptr) {}
#endif
bool resize(int newSize)
@@ -153,7 +153,7 @@ public:
ptrs = ab.data;
return true;
} else {
ptrs = NULL;
ptrs = nullptr;
return false;
}
}
@@ -219,8 +219,8 @@ public:
T* data;
PlanarPtr<T> v; // v stands for "value", whatever it represent
PlanarWhateverData() : rowstride(0), data (NULL) {}
PlanarWhateverData(int w, int h) : rowstride(0), data (NULL)
PlanarWhateverData() : rowstride(0), data (nullptr) {}
PlanarWhateverData(int w, int h) : rowstride(0), data (nullptr)
{
allocate(w, h);
}
@@ -291,7 +291,7 @@ public:
} else {
// asking for a new size of 0 is safe and will free memory, if any!
abData.resize(0);
data = NULL;
data = nullptr;
v.resize(0);
width = height = -1;
#if CHECK_BOUNDS
@@ -609,8 +609,8 @@ public:
PlanarPtr<T> g;
PlanarPtr<T> b;
PlanarRGBData() : rowstride(0), planestride(0), data (NULL) {}
PlanarRGBData(int w, int h) : rowstride(0), planestride(0), data (NULL)
PlanarRGBData() : rowstride(0), planestride(0), data (nullptr) {}
PlanarRGBData(int w, int h) : rowstride(0), planestride(0), data (nullptr)
{
allocate(w, h);
}
@@ -700,7 +700,7 @@ public:
} else {
// asking for a new size of 0 is safe and will free memory, if any!
abData.resize(0);
data = NULL;
data = nullptr;
r.resize(0);
g.resize(0);
b.resize(0);
@@ -728,7 +728,7 @@ public:
/** Copy the data to another PlanarRGBData */
void copyData(PlanarRGBData<T> *dest)
{
assert (dest != NULL);
assert (dest != nullptr);
// Make sure that the size is the same, reallocate if necessary
dest->allocate(width, height);
@@ -1201,7 +1201,7 @@ public:
#if CHECK_BOUNDS
ChunkyPtr() : ptr (NULL), width(-1), width_(0), height_(0) {}
#else
ChunkyPtr() : ptr (NULL), width(-1) {}
ChunkyPtr() : ptr (nullptr), width(-1) {}
#endif
void init(T* base, int w = -1)
{
@@ -1267,8 +1267,8 @@ public:
ChunkyPtr<T> g;
ChunkyPtr<T> b;
ChunkyRGBData() : data (NULL) {}
ChunkyRGBData(int w, int h) : data (NULL)
ChunkyRGBData() : data (nullptr) {}
ChunkyRGBData(int w, int h) : data (nullptr)
{
allocate(w, h);
}
@@ -1335,10 +1335,10 @@ public:
g.init(data + 1, width);
b.init(data + 2, width);
} else {
data = NULL;
r.init(NULL);
g.init(NULL);
b.init(NULL);
data = nullptr;
r.init(nullptr);
g.init(nullptr);
b.init(nullptr);
width = height = -1;
#if CHECK_BOUNDS
r.width_ = r.height_ = -1;
@@ -1351,7 +1351,7 @@ public:
/** Copy the data to another ChunkyRGBData */
void copyData(ChunkyRGBData<T> *dest)
{
assert (dest != NULL);
assert (dest != nullptr);
// Make sure that the size is the same, reallocate if necessary
dest->allocate(width, height);