Skip to content

Commit

Permalink
Merge pull request #1517 from fspindle/fix_windows_nlohmann
Browse files Browse the repository at this point in the history
Fix build when nlohmann is not detected (reported by cdash ci on wind…
  • Loading branch information
fspindle authored Dec 4, 2024
2 parents 412c791 + be5071b commit 40ff3a5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions modules/core/src/image/vpCannyEdgeDetection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ vpCannyEdgeDetection::vpCannyEdgeDetection(const int &gaussianKernelSize, const

using json = nlohmann::json;

vpCannyEdgeDetection::vpCannyEdgeDetection(const std::string &jsonPath) :
vpCannyEdgeDetection::vpCannyEdgeDetection(const std::string &jsonPath)
#if !defined(_WIN32) && (defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))) // UNIX
m_minStackSize(0) // Deactivated by default
: m_minStackSize(0) // Deactivated by default
#endif
{
initFromJSON(jsonPath);
Expand Down

0 comments on commit 40ff3a5

Please sign in to comment.