Create empty image when ctor is called with None

lsst · Oct 15, 2024 · b0e6a9e · b0e6a9e
1 parent b167e1a
commit b0e6a9e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/image/MaskedImage.cc b/src/image/MaskedImage.cc
@@ -26,6 +26,7 @@
  * Implementation for MaskedImage
  */
 #include <cstdint>
+#include <stdexcept>
 
 #include "boost/format.hpp"
 #include "lsst/log/Log.h"
@@ -148,7 +149,8 @@ MaskedImage<ImagePixelT, MaskPixelT, VariancePixelT>::MaskedImage(
 template <typename ImagePixelT, typename MaskPixelT, typename VariancePixelT>
 MaskedImage<ImagePixelT, MaskPixelT, VariancePixelT>::MaskedImage(ImagePtr image, MaskPtr mask,
                                                                   VariancePtr variance)
-        : _image(image), _mask(mask), _variance(variance) {
+        : _image(image != nullptr ? image : std::make_shared<Image>()),
+          _mask(mask), _variance(variance) {
     conformSizes();
 }
 

diff --git a/tests/test_maskedImage.py b/tests/test_maskedImage.py
@@ -745,6 +745,12 @@ def testTicket653(self):
         mi = afwImage.MaskedImageF(im)
         afwImage.ExposureF(mi)
 
+    def testTicket41478(self):
+        """Test for DM-41478 fix"""
+        masked_image = afwImage.MaskedImageF(None)
+        image = afwImage.ImageF(None)
+        self.assertEqual(masked_image.getBBox(), image.getBBox())
+
     def testMaskedImageInitialisation(self):
         dims = self.mimage.getDimensions()
         factory = self.mimage.Factory