Merge pull request #444 from lsst/tickets/DM-18678-afw

DM-18678: Support boost 1.69 removal of gil_all.hpp
lsst · Mar 28, 2019 · 81fa8e0 · 81fa8e0
2 parents 41c8d5d + 9b2577a
commit 81fa8e0
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 13 deletions.
diff --git a/examples/timePixelAccessGil.cc b/examples/timePixelAccessGil.cc
@@ -25,7 +25,13 @@
 #include <ctime>
 
 #include "boost/format.hpp"
+
+#include "boost/version.hpp"
+#if BOOST_VERSION < 106900
 #include "boost/gil/gil_all.hpp"
+#else
+#include "boost/gil.hpp"
+#endif
 
 template <class ImageT>
 void timePixelAccess(ImageT const &image, float const pix, int nIter) {

diff --git a/include/lsst/afw/fits.h b/include/lsst/afw/fits.h
@@ -15,6 +15,7 @@
 
 #include <climits>
 #include <string>
+#include <set>
 
 #include <boost/format.hpp>
 

diff --git a/include/lsst/afw/image/lsstGil.h b/include/lsst/afw/image/lsstGil.h
@@ -48,7 +48,12 @@
 #pragma warning(disable : 304)
 #endif
 
+#include "boost/version.hpp"
+#if BOOST_VERSION < 106900
 #include "boost/gil/gil_all.hpp"
+#else
+#include "boost/gil.hpp"
+#endif
 
 #if defined(__ICC)
 #pragma warning(pop)

diff --git a/python/lsst/afw/cameraGeom/camera/camera.cc b/python/lsst/afw/cameraGeom/camera/camera.cc
@@ -51,7 +51,7 @@ PYBIND11_MODULE(camera, mod){
                 py::object pupilFactoryClass
             ) {
                 std::string pupilFactoryName = "lsst.afw.cameraGeom.pupil.PupilFactory";
-                if (pupilFactoryClass != py::none()) {
+                if (!pupilFactoryClass.is(py::none())) {
                     pupilFactoryName = py::str("{}.{}").format(
                         pupilFactoryClass.attr("__module__"),
                         pupilFactoryClass.attr("__name__")

diff --git a/python/lsst/afw/image/readers.cc b/python/lsst/afw/image/readers.cc
@@ -76,7 +76,7 @@ void declareSinglePlaneMethods(py::class_<Class, Args...> & cls) {
         "readArray",
         [](Class & self, lsst::geom::Box2I const & bbox, ImageOrigin origin, bool allowUnsafe,
            py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readDType());
             }
             return utils::python::TemplateInvoker().apply(
@@ -101,7 +101,7 @@ void declareMultiPlaneMethods(py::class_<Class, Args...> & cls) {
         "readImage",
         [](Class & self, lsst::geom::Box2I const & bbox, ImageOrigin origin, bool allowUnsafe,
            py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readImageDType());
             }
             return utils::python::TemplateInvoker().apply(
@@ -118,7 +118,7 @@ void declareMultiPlaneMethods(py::class_<Class, Args...> & cls) {
         "readImageArray",
         [](Class & self, lsst::geom::Box2I const & bbox, ImageOrigin origin, bool allowUnsafe,
            py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readImageDType());
             }
             return utils::python::TemplateInvoker().apply(
@@ -135,7 +135,7 @@ void declareMultiPlaneMethods(py::class_<Class, Args...> & cls) {
         "readMask",
         [](Class & self, lsst::geom::Box2I const & bbox, ImageOrigin origin, bool conformMasks,
            bool allowUnsafe, py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readMaskDType());
             }
             return utils::python::TemplateInvoker().apply(
@@ -153,7 +153,7 @@ void declareMultiPlaneMethods(py::class_<Class, Args...> & cls) {
         "readMaskArray",
         [](Class & self, lsst::geom::Box2I const & bbox, ImageOrigin origin, bool allowUnsafe,
            py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readMaskDType());
             }
             return utils::python::TemplateInvoker().apply(
@@ -170,7 +170,7 @@ void declareMultiPlaneMethods(py::class_<Class, Args...> & cls) {
         "readVariance",
         [](Class & self, lsst::geom::Box2I const & bbox, ImageOrigin origin, bool allowUnsafe,
            py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readVarianceDType());
             }
             return utils::python::TemplateInvoker().apply(
@@ -187,7 +187,7 @@ void declareMultiPlaneMethods(py::class_<Class, Args...> & cls) {
         "readVarianceArray",
         [](Class & self, lsst::geom::Box2I const & bbox, ImageOrigin origin, bool allowUnsafe,
            py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readVarianceDType());
             }
             return utils::python::TemplateInvoker().apply(
@@ -210,7 +210,7 @@ void declareImageFitsReader(py::module & mod) {
         "read",
         [](ImageFitsReader & self, lsst::geom::Box2I const & bbox, ImageOrigin origin, bool allowUnsafe,
            py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readDType());
             }
             return utils::python::TemplateInvoker().apply(
@@ -233,7 +233,7 @@ void declareMaskFitsReader(py::module & mod) {
         "read",
         [](MaskFitsReader & self, lsst::geom::Box2I const & bbox, ImageOrigin origin,
            bool conformMasks, bool allowUnsafe, py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readDType());
             }
             return utils::python::TemplateInvoker().apply(
@@ -264,7 +264,7 @@ void declareMaskedImageFitsReader(py::module & mod) {
         "read",
         [](MaskedImageFitsReader & self, lsst::geom::Box2I const & bbox, ImageOrigin origin,
            bool conformMasks, bool needAllHdus, bool allowUnsafe, py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readImageDType());
             }
             return utils::python::TemplateInvoker().apply(
@@ -302,7 +302,7 @@ void declareExposureFitsReader(py::module & mod) {
         "readMaskedImage",
         [](ExposureFitsReader & self, lsst::geom::Box2I const & bbox, ImageOrigin origin,
            bool conformMasks, bool allowUnsafe, py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readImageDType());
             }
             return utils::python::TemplateInvoker().apply(
@@ -320,7 +320,7 @@ void declareExposureFitsReader(py::module & mod) {
         "read",
         [](ExposureFitsReader & self, lsst::geom::Box2I const & bbox, ImageOrigin origin,
            bool conformMasks, bool allowUnsafe, py::object dtype) {
-            if (dtype == py::none()) {
+            if (dtype.is(py::none())) {
                 dtype = py::dtype(self.readImageDType());
             }
             return utils::python::TemplateInvoker().apply(

diff --git a/src/image/DecoratedImage.cc b/src/image/DecoratedImage.cc
@@ -28,7 +28,13 @@
 
 #include "boost/format.hpp"
 #include "boost/mpl/vector.hpp"
+
+#include "boost/version.hpp"
+#if BOOST_VERSION < 106900
 #include "boost/gil/gil_all.hpp"
+#else
+#include "boost/gil.hpp"
+#endif
 
 #include "lsst/pex/exceptions.h"
 #include "lsst/afw/fits.h"

diff --git a/src/image/Image.cc b/src/image/Image.cc
@@ -35,7 +35,13 @@
 #pragma clang diagnostic pop
 #include "boost/format.hpp"
 #include "boost/filesystem/path.hpp"
+
+#include "boost/version.hpp"
+#if BOOST_VERSION < 106900
 #include "boost/gil/gil_all.hpp"
+#else
+#include "boost/gil.hpp"
+#endif
 
 #include "lsst/pex/exceptions.h"
 #include "lsst/afw/geom/wcsUtils.h"