Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build issue in klt module under windows #1542

Merged
merged 2 commits into from
Jan 17, 2025
Merged

Fix build issue in klt module under windows #1542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96a8973
Add missing nlohmann_json dependency
fspindle Jan 17, 2025
ebc2c74
Fix minor typo
fspindle Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions modules/tracker/klt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
set(opt_incs "")
set(opt_libs "")

if(USE_NLOHMANN_JSON AND NOT VISP_HAVE_NLOHMANN_JSON_FROM_VTK)
get_target_property(_inc_dirs "nlohmann_json::nlohmann_json" INTERFACE_INCLUDE_DIRECTORIES)
list(APPEND opt_incs ${_inc_dirs})
endif()

# OpenCV
if(USE_OPENCV)
# On win32 since OpenCV 2.4.7 and on OSX with OpenCV 2.4.10 we cannot use OpenCV_LIBS to set ViSP 3rd party libraries.
Expand Down
2 changes: 1 addition & 1 deletion modules/tracker/klt/include/visp3/klt/vpKltOpencv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ class VISP_EXPORT vpKltOpencv
* However, it must be a positive integer.
*
* \param blockSize : Size of an average block for computing a derivative
* covariation matrix over each pixel neighborhood. Default value is set to 3.
* covariance matrix over each pixel neighborhood. Default value is set to 3.
*/
void setBlockSize(int blockSize) { m_blockSize = blockSize; }

Expand Down
1 change: 1 addition & 0 deletions modules/visual_features/src/visual-feature/vpFeatureMomentGravityCenterNormalized.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include <visp3/visual_features/vpFeatureMomentDatabase.h>
#include <visp3/visual_features/vpFeatureMomentGravityCenter.h>
#include <visp3/visual_features/vpFeatureMomentGravityCenterNormalized.h>

BEGIN_VISP_NAMESPACE
/*!
* Computes interaction matrix for centered and normalized moment. Called
Expand Down
Loading