Fix wrong assertion error in 2D fixed kernel

boostorg · Aug 20, 2021 · c16c5b7 · c16c5b7
1 parent 723499d
commit c16c5b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/include/boost/gil/extension/numeric/kernel.hpp b/include/boost/gil/extension/numeric/kernel.hpp
@@ -167,10 +167,7 @@ class kernel_2d_adaptor : public Core
     explicit kernel_2d_adaptor(std::size_t center_y, std::size_t center_x)
         : center_(center_x, center_y)
     {
-        Core c;
-        BOOST_ASSERT(center_.y < c.size() && center_.x < c.size());
-        // std::cout << this->size() << " " << center_.y << " " << center_.x << "\n";
-        // BOOST_ASSERT(center_.y < this->size() && center_.x < this->size());
+        BOOST_ASSERT(center_.y < this->size() && center_.x < this->size());
     }
 
     kernel_2d_adaptor(std::size_t size, std::size_t center_y, std::size_t center_x)
@@ -246,7 +243,7 @@ class kernel_2d_adaptor : public Core
 
     std::size_t size() const
     {
-        return square_size;
+        return square_size ? square_size : std::sqrt((Core ()).size());
     }
 
     typename Core::value_type at(std::size_t x, std::size_t y) const

diff --git a/test/extension/numeric/kernel_fixed.cpp b/test/extension/numeric/kernel_fixed.cpp
@@ -6,7 +6,6 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#define BOOST_DISABLE_ASSERTS 1 // kernel_1d_adaptor assertions are too strict
 #include <boost/gil.hpp>
 #include <boost/gil/extension/numeric/kernel.hpp>