Further cleaned up imagesOverlap

lsst · May 11, 2018 · bda3f5e · bda3f5e
1 parent 23141bd
commit bda3f5e
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/src/image/Image.cc b/src/image/Image.cc
@@ -699,17 +699,6 @@ geom::Box2I bboxFromMetadata(daf::base::PropertySet & metadata)
     return geom::Box2I(xy0, dims);
 }
 
-namespace {
-
-template <typename PtrLess = std::less<void const* const>>
-bool ptrsOverlap(void const* const beg1Addr, void const* const end1Addr, void const* const beg2Addr,
-                 void const* const end2Addr, PtrLess ptrLess = PtrLess()) {
-    // std::less is safer than < for generic pointers
-    return ptrLess(beg1Addr, end2Addr) && ptrLess(beg2Addr, end1Addr);
-}
-
-}  // namespace
-
 template <typename T1, typename T2>
 bool imagesOverlap(ImageBase<T1> const& image1, ImageBase<T2> const& image2) {
     auto arr1 = image1.getArray();
@@ -722,7 +711,8 @@ bool imagesOverlap(ImageBase<T1> const& image1, ImageBase<T2> const& image2) {
     auto beg2Addr = arr2.front().begin();
     auto end2Addr = arr2.back().end();
 
-    return ptrsOverlap(beg1Addr, end1Addr, beg2Addr, end2Addr);
+    auto ptrLess = std::less<void const* const>();
+    return ptrLess(beg1Addr, end2Addr) && ptrLess(beg2Addr, end1Addr);
 }
 
 //