Move diffusion and Hough transform

Move anisotropic diffusion and Hough transform into extension. Adjust tests and cmakelists
boostorg · May 19, 2022 · 085c8c2 · 085c8c2
1 parent f1172f3
commit 085c8c2
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,6 +57,7 @@ option(BOOST_GIL_ENABLE_EXT_IO "Enable IO extension, tests and examples (require
 option(BOOST_GIL_ENABLE_EXT_NUMERIC "Enable Numeric extension, tests and examples" ON)
 option(BOOST_GIL_ENABLE_EXT_TOOLBOX "Enable Toolbox extension, tests and examples" ON)
 option(BOOST_GIL_ENABLE_EXT_RASTERIZATION "Enable Rasterization extension and tests" ON)
+option(BOOST_GIL_ENABLE_EXT_IMAGE_PROCESSING "Enable Image Processing extension (!) and tests" ON)
 option(BOOST_GIL_USE_CONAN "Use Conan to install dependencies" OFF)
 option(BOOST_GIL_USE_CLANG_TIDY "Set CMAKE_CXX_CLANG_TIDY property on targets to enable clang-tidy linting" OFF)
 set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard version to use (default is 11)")

diff --git a/example/anisotropic_diffusion.cpp b/example/anisotropic_diffusion.cpp
@@ -9,7 +9,7 @@
 #include <boost/gil/algorithm.hpp>
 #include <boost/gil/extension/io/png.hpp>
 #include <boost/gil/image.hpp>
-#include <boost/gil/image_processing/diffusion.hpp>
+#include "boost/gil/extension/image_processing/diffusion.hpp"
 #include <boost/gil/image_view.hpp>
 #include <boost/gil/io/typedefs.hpp>
 #include <boost/gil/typedefs.hpp>

diff --git a/include/boost/gil.hpp b/include/boost/gil.hpp
@@ -49,14 +49,14 @@
 #include <boost/gil/utilities.hpp>
 #include <boost/gil/virtual_locator.hpp>
 #include <boost/gil/image_processing/adaptive_histogram_equalization.hpp>
-#include <boost/gil/image_processing/diffusion.hpp>
+#include "boost/gil/extension/image_processing/diffusion.hpp"
 #include <boost/gil/image_processing/filter.hpp>
 #include <boost/gil/image_processing/harris.hpp>
 #include <boost/gil/image_processing/hessian.hpp>
 #include <boost/gil/image_processing/histogram_equalization.hpp>
 #include <boost/gil/image_processing/histogram_matching.hpp>
-#include <boost/gil/image_processing/hough_parameter.hpp>
-#include <boost/gil/image_processing/hough_transform.hpp>
+#include "boost/gil/extension/image_processing/hough_parameter.hpp"
+#include "boost/gil/extension/image_processing/hough_transform.hpp"
 #include <boost/gil/image_processing/morphology.hpp>
 #include <boost/gil/image_processing/numeric.hpp>
 #include <boost/gil/image_processing/scaling.hpp>

diff --git a/.../boost/gil/image_processing/diffusion.hpp → .../extension/image_processing/diffusion.hpp b/.../boost/gil/image_processing/diffusion.hpp → .../extension/image_processing/diffusion.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_GIL_IMAGE_PROCESSING_DIFFUSION_HPP
 #define BOOST_GIL_IMAGE_PROCESSING_DIFFUSION_HPP
 
-#include "boost/gil/detail/math.hpp"
+#include <boost/gil/detail/math.hpp>
 #include <boost/gil/algorithm.hpp>
 #include <boost/gil/color_base_algorithm.hpp>
 #include <boost/gil/image.hpp>

diff --git a/.../gil/image_processing/hough_parameter.hpp → ...sion/image_processing/hough_parameter.hpp b/.../gil/image_processing/hough_parameter.hpp → ...sion/image_processing/hough_parameter.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_GIL_IMAGE_PROCESSING_HOUGH_PARAMETER_HPP
 #define BOOST_GIL_IMAGE_PROCESSING_HOUGH_PARAMETER_HPP
 
-#include <boost/gil/point.hpp>
+#include "boost/gil/point.hpp"
 #include <cmath>
 #include <cstddef>
 

diff --git a/.../gil/image_processing/hough_transform.hpp → ...sion/image_processing/hough_transform.hpp b/.../gil/image_processing/hough_transform.hpp → ...sion/image_processing/hough_transform.hpp
@@ -10,7 +10,7 @@
 #define BOOST_GIL_IMAGE_PROCESSING_HOUGH_TRANSFORM_HPP
 
 #include <algorithm>
-#include <boost/gil/image_processing/hough_parameter.hpp>
+#include <boost/gil/extension/image_processing/hough_parameter.hpp>
 #include <boost/gil/extension/rasterization/circle.hpp>
 #include <cmath>
 #include <cstddef>

diff --git a/test/core/image_processing/CMakeLists.txt b/test/core/image_processing/CMakeLists.txt
@@ -19,10 +19,6 @@ foreach(_name
     box_filter
     median_filter
     sobel_scharr
-    anisotropic_diffusion
-    hough_parameter
-    hough_line_transform
-    hough_circle_transform
     convolve
     convolve_2d
     convolve_cols

diff --git a/test/extension/CMakeLists.txt b/test/extension/CMakeLists.txt
@@ -9,6 +9,10 @@ if(BOOST_GIL_ENABLE_EXT_RASTERIZATION)
   add_subdirectory(rasterization)
 endif()
 
+if(BOOST_GIL_ENABLE_EXT_IMAGE_PROCESSING)
+  add_subdirectory(image_processing)
+endif()
+
 if(BOOST_GIL_ENABLE_EXT_DYNAMIC_IMAGE)
   add_subdirectory(dynamic_image)
 endif()

diff --git a/test/extension/image_processing/CMakeLists.txt b/test/extension/image_processing/CMakeLists.txt
@@ -0,0 +1,22 @@
+foreach(_name
+        anisotropic_diffusion
+        hough_circle_transform
+        hough_line_transform
+        hough_parameter)
+    set(_test t_ext_image_processing_${_name})
+    set(_target test_ext_image_processing_${_name})
+
+    add_executable(${_target} "")
+    target_sources(${_target} PRIVATE ${_name}.cpp)
+    target_link_libraries(${_target}
+            PRIVATE
+            gil_compile_options
+            gil_include_directories
+            gil_dependencies)
+    target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
+    add_test(NAME ${_test} COMMAND ${_target})
+
+    unset(_name)
+    unset(_target)
+    unset(_test)
+endforeach()
diff --git a/...mage_processing/anisotropic_diffusion.cpp → ...mage_processing/anisotropic_diffusion.cpp b/...mage_processing/anisotropic_diffusion.cpp → ...mage_processing/anisotropic_diffusion.cpp
@@ -5,11 +5,11 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "../test_fixture.hpp"
-#include "boost/gil/algorithm.hpp"
+#include <core/test_fixture.hpp>
+#include <boost/gil/algorithm.hpp>
 #include <boost/gil/color_base_algorithm.hpp>
 #include <boost/gil/image.hpp>
-#include <boost/gil/image_processing/diffusion.hpp>
+#include <boost/gil/extension/image_processing/diffusion.hpp>
 #include <boost/gil/image_view.hpp>
 #include <boost/gil/pixel.hpp>
 #include <boost/gil/typedefs.hpp>

diff --git a/...age_processing/hough_circle_transform.cpp → ...age_processing/hough_circle_transform.cpp b/...age_processing/hough_circle_transform.cpp → ...age_processing/hough_circle_transform.cpp
@@ -9,7 +9,7 @@
 #include <boost/core/lightweight_test.hpp>
 
 #include <boost/gil/image.hpp>
-#include <boost/gil/image_processing/hough_transform.hpp>
+#include <boost/gil/extension/image_processing/hough_transform.hpp>
 #include <boost/gil/image_view.hpp>
 #include <boost/gil/typedefs.hpp>
 

diff --git a/...image_processing/hough_line_transform.cpp → ...image_processing/hough_line_transform.cpp b/...image_processing/hough_line_transform.cpp → ...image_processing/hough_line_transform.cpp
@@ -10,10 +10,10 @@
 #include <boost/core/lightweight_test.hpp>
 #include <boost/gil/detail/math.hpp>
 #include <boost/gil/image.hpp>
-#include <boost/gil/image_processing/hough_transform.hpp>
+#include <boost/gil/extension/image_processing/hough_transform.hpp>
 #include <boost/gil/image_view.hpp>
 #include <boost/gil/point.hpp>
-#include <boost/gil/rasterization/line.hpp>
+#include <boost/gil/extension/rasterization/line.hpp>
 #include <boost/gil/typedefs.hpp>
 #include <cmath>
 #include <cstddef>

diff --git a/...core/image_processing/hough_parameter.cpp → ...sion/image_processing/hough_parameter.cpp b/...core/image_processing/hough_parameter.cpp → ...sion/image_processing/hough_parameter.cpp
@@ -7,7 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 #include <boost/core/lightweight_test.hpp>
-#include <boost/gil/image_processing/hough_parameter.hpp>
+#include <boost/gil/extension/image_processing/hough_parameter.hpp>
 
 namespace gil = boost::gil;