Merge pull request #1574 from fspindle/feat_image_tools_warp_optional

Introduce ENABLE_IMAGE_TOOLS_WARP macro to enable/disable usage of vpImageTools::warp() functions
lagadic · Feb 5, 2025 · 291de3a · 291de3a
2 parents c1f96df + f142d60
commit 291de3a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -553,6 +553,8 @@ VP_OPTION(ENABLE_FULL_DOC      "" "" "Build doc with internal classes that are b
 VP_OPTION(ENABLE_VISP_NAMESPACE "" "" "Enable visp namespace" "" OFF)
 # Allow introduction of "explicit" keyword. By default disabled to keep compat with previous versions
 VP_OPTION(ENABLE_EXPLICIT_KEYWORD "" "" "Enable c++ explicit keyword" "" OFF)
+# Enable the vpImageTools::warp() methods
+VP_OPTION(ENABLE_IMAGE_TOOLS_WARP "" "" "Enable vpImageTools::warp() methods" "" ON)
 
 if(ENABLE_SOLUTION_FOLDERS)
   set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -1056,8 +1058,6 @@ if(BUILD_JAVA)
   endif()
 endif()
 
-
-
 if(ANDROID AND ANDROID_EXECUTABLE AND ANT_EXECUTABLE AND (ANT_VERSION VERSION_GREATER 1.7) AND (ANDROID_TOOLS_Pkg_Revision GREATER 13))
   SET(CAN_BUILD_ANDROID_PROJECTS TRUE)
 else()

diff --git a/cmake/templates/VISPConfig.cmake.in b/cmake/templates/VISPConfig.cmake.in
@@ -191,6 +191,7 @@ set(VISP_BIN_INSTALL_PATH "@VISP_BIN_INSTALL_PATH@")
 #----------------------------------------------------------------------
 set(ENABLE_VISP_NAMESPACE    "@ENABLE_VISP_NAMESPACE@")
 set(ENABLE_EXPLICIT_KEYWORD  "@ENABLE_EXPLICIT_KEYWORD@")
+set(ENABLE_IMAGE_TOOLS_WARP  "@ENABLE_IMAGE_TOOLS_WARP@")
 set(VISP_HAVE_AFMA4          "@VISP_HAVE_AFMA4@")
 set(VISP_HAVE_AFMA6          "@VISP_HAVE_AFMA6@")
 set(VISP_HAVE_APRILTAG       "@VISP_HAVE_APRILTAG@")

diff --git a/cmake/templates/vpConfig.h.in b/cmake/templates/vpConfig.h.in
@@ -128,6 +128,9 @@ namespace vp = VISP_NAMESPACE_NAME;
 #define END_VISP_NAMESPACE
 #endif
 
+// Defined if the warp() methods of vpImageTools are enabled
+#cmakedefine ENABLE_IMAGE_TOOLS_WARP
+
 // Enable debug and trace printings
 #cmakedefine VP_TRACE
 #cmakedefine VP_DEBUG

diff --git a/modules/core/include/visp3/core/vpImageTools.h b/modules/core/include/visp3/core/vpImageTools.h
@@ -1249,7 +1249,9 @@ inline void vpImageTools::resize(const vpImage<vpRGBa> &I, vpImage<vpRGBa> &Ires
 }
 #endif
 
+#ifdef ENABLE_IMAGE_TOOLS_WARP
 #include <visp3/core/vpImageTools_warp.h>
+#endif
 
 END_VISP_NAMESPACE
 #endif