Call RawImageData::isAllocated() where appropriate

darktable-org · Oct 19, 2022 · 0471890 · 0471890
1 parent 1b81eb8
commit 0471890
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/librawspeed/common/RawImage.cpp b/src/librawspeed/common/RawImage.cpp
@@ -71,7 +71,7 @@ void RawImageData::createData() {
     ThrowRDE("Dimensions too large for allocation.");
   if (dim.x <= 0 || dim.y <= 0)
     ThrowRDE("Dimension of one sides is less than 1 - cannot allocate image.");
-  if (data)
+  if (isAllocated())
     ThrowRDE("Duplicate data allocation in createData.");
 
   // want each line to start at 16-byte aligned address
@@ -191,7 +191,7 @@ void RawImageData::destroyData() {
 }
 
 void RawImageData::setCpp(uint32_t val) {
-  if (data)
+  if (isAllocated())
     ThrowRDE("Attempted to set Components per pixel after data allocation");
   if (val > 4) {
     ThrowRDE(
@@ -205,7 +205,7 @@ void RawImageData::setCpp(uint32_t val) {
 }
 
 uint8_t* RawImageData::getData() const {
-  if (!data)
+  if (!isAllocated())
     ThrowRDE("Data not yet allocated.");
   return &data[mOffset.y*pitch+mOffset.x*bpp];
 }
@@ -219,7 +219,7 @@ uint8_t* RawImageData::getData(uint32_t x, uint32_t y) {
   if (y >= static_cast<unsigned>(uncropped_dim.y))
     ThrowRDE("Y Position outside image requested.");
 
-  if (!data)
+  if (!isAllocated())
     ThrowRDE("Data not yet allocated.");
 
   return &data[static_cast<size_t>(y) * pitch + x * bpp];
@@ -231,7 +231,7 @@ uint8_t* RawImageData::getDataUncropped(uint32_t x, uint32_t y) const {
   if (y >= static_cast<unsigned>(uncropped_dim.y))
     ThrowRDE("Y Position outside image requested.");
 
-  if (!data)
+  if (!isAllocated())
     ThrowRDE("Data not yet allocated.");
 
   return &data[static_cast<size_t>(y) * pitch + x * bpp];