From eb7632707ac7912098becc7aceb756d6802a4a80 Mon Sep 17 00:00:00 2001 From: LAGNEAU Romain Date: Wed, 11 Sep 2024 08:47:50 +0200 Subject: [PATCH] [TUTO][FIX] Fix compilation errors when ViSP namespace is activated --- .../tutorial-pf-curve-fitting-all.cpp | 2 +- .../tutorial-pf-curve-fitting-lms.cpp | 2 +- .../tutorial-pf-curve-fitting-pf.cpp | 2 +- .../vpTutoCommonData.h | 30 +++++++++---------- .../vpTutoMeanSquareFitting.cpp | 2 +- .../vpTutoSegmentation.cpp | 13 +++----- 6 files changed, 23 insertions(+), 28 deletions(-) diff --git a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-all.cpp b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-all.cpp index d1524fd8c4..892c7afdbf 100644 --- a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-all.cpp +++ b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-all.cpp @@ -57,7 +57,7 @@ #include "vpTutoSegmentation.h" #ifdef ENABLE_VISP_NAMESPACE -using VISP_NAMESPACE_NAME; +using namespace VISP_NAMESPACE_NAME; #endif #if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11) && defined(VISP_HAVE_DISPLAY) diff --git a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-lms.cpp b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-lms.cpp index 81154256f5..8920ebba45 100644 --- a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-lms.cpp +++ b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-lms.cpp @@ -48,7 +48,7 @@ #include "vpTutoSegmentation.h" #ifdef ENABLE_VISP_NAMESPACE -using VISP_NAMESPACE_NAME; +using namespace VISP_NAMESPACE_NAME; #endif #if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11) && defined(VISP_HAVE_DISPLAY) diff --git a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-pf.cpp b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-pf.cpp index 5abe7e13b2..0cd5e36329 100644 --- a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-pf.cpp +++ b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-pf.cpp @@ -53,7 +53,7 @@ #include "vpTutoSegmentation.h" #ifdef ENABLE_VISP_NAMESPACE -using VISP_NAMESPACE_NAME; +using namespace VISP_NAMESPACE_NAME; #endif #if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11) && defined(VISP_HAVE_DISPLAY) diff --git a/tutorial/particle-filter-curve-fitting/vpTutoCommonData.h b/tutorial/particle-filter-curve-fitting/vpTutoCommonData.h index 929657ffc6..dae7a131e4 100644 --- a/tutorial/particle-filter-curve-fitting/vpTutoCommonData.h +++ b/tutorial/particle-filter-curve-fitting/vpTutoCommonData.h @@ -44,7 +44,7 @@ #ifndef DOXYGEN_SHOULD_SKIP_THIS namespace tutorial { -inline void log(std::ostream &os, const std::string &filename, const std::string &funName, const std::string &arrayName, const vpArray2D &array, const unsigned int &level = 0) +inline void log(std::ostream &os, const std::string &filename, const std::string &funName, const std::string &arrayName, const VISP_NAMESPACE_ADDRESSING vpArray2D &array, const unsigned int &level = 0) { os << "[" << filename << "::" << funName << "] "; for (unsigned int i = 0; i < level; ++i) { @@ -267,7 +267,7 @@ typedef struct vpTutoCommonData m_pfRatiosAmpliMax.resize(m_degree, m_pfRatiosAmpliMax[0]); // Load the HSV thresholds - if (vpColVector::loadYAML(m_hsvFilename, m_hsv_values)) { + if (VISP_NAMESPACE_ADDRESSING vpColVector::loadYAML(m_hsvFilename, m_hsv_values)) { std::cout << "Load HSV threshold values from " << m_hsvFilename << std::endl; std::cout << "HSV low/high values: " << m_hsv_values.t() << std::endl; } @@ -281,7 +281,7 @@ typedef struct vpTutoCommonData m_grabber.setFileName(m_seqFilename); m_grabber.open(m_I_orig); } - catch (const vpException &e) { + catch (const VISP_NAMESPACE_ADDRESSING vpException &e) { std::cout << e.getStringMessage() << std::endl; return EXIT_FAILURE; } @@ -310,27 +310,27 @@ typedef struct vpTutoCommonData #ifdef VISP_HAVE_DISPLAY template - void displayLegend(const vpImage &I) + void displayLegend(const VISP_NAMESPACE_ADDRESSING vpImage &I) { - vpImagePoint ip(20, 20); - vpImagePoint offset(20, 0); + VISP_NAMESPACE_ADDRESSING vpImagePoint ip(20, 20); + VISP_NAMESPACE_ADDRESSING vpImagePoint offset(20, 0); if (m_stepbystep) { - vpDisplay::displayText(I, ip, std::string("Left click to switch to next image"), vpColor::red); + VISP_NAMESPACE_ADDRESSING vpDisplay::displayText(I, ip, std::string("Left click to switch to next image"), VISP_NAMESPACE_ADDRESSING vpColor::red); } - vpDisplay::displayText(I, ip + offset, std::string("Middle click to switch to ") + (m_stepbystep ? std::string("video mode") : std::string("step-by-step mode")), vpColor::red); - vpDisplay::displayText(I, ip + offset + offset, std::string("Right click to quit"), vpColor::red); + VISP_NAMESPACE_ADDRESSING vpDisplay::displayText(I, ip + offset, std::string("Middle click to switch to ") + (m_stepbystep ? std::string("video mode") : std::string("step-by-step mode")), VISP_NAMESPACE_ADDRESSING vpColor::red); + VISP_NAMESPACE_ADDRESSING vpDisplay::displayText(I, ip + offset + offset, std::string("Right click to quit"), VISP_NAMESPACE_ADDRESSING vpColor::red); } template - bool manageClicks(const vpImage &I, bool &stepbystep) + bool manageClicks(const VISP_NAMESPACE_ADDRESSING vpImage &I, bool &stepbystep) { - vpImagePoint ip; - vpMouseButton::vpMouseButtonType button; - vpDisplay::getClick(I, ip, button, stepbystep); - if (button == vpMouseButton::vpMouseButtonType::button3) { + VISP_NAMESPACE_ADDRESSING vpImagePoint ip; + VISP_NAMESPACE_ADDRESSING vpMouseButton::vpMouseButtonType button; + VISP_NAMESPACE_ADDRESSING vpDisplay::getClick(I, ip, button, stepbystep); + if (button == VISP_NAMESPACE_ADDRESSING vpMouseButton::vpMouseButtonType::button3) { return false; } - if (button == vpMouseButton::vpMouseButtonType::button2) { + if (button == VISP_NAMESPACE_ADDRESSING vpMouseButton::vpMouseButtonType::button2) { stepbystep = stepbystep ^ true; } return true; diff --git a/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.cpp b/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.cpp index a27994d200..440ef676fc 100644 --- a/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.cpp +++ b/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.cpp @@ -36,7 +36,7 @@ namespace tutorial { #ifdef ENABLE_VISP_NAMESPACE -using VISP_NAMESPACE_NAME; +using namespace VISP_NAMESPACE_NAME; #endif vpTutoMeanSquareFitting::vpTutoMeanSquareFitting(const unsigned int °ree, const unsigned int &height, const unsigned int &width) diff --git a/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.cpp b/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.cpp index c090ac5b4c..bbf480addf 100644 --- a/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.cpp +++ b/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.cpp @@ -37,11 +37,12 @@ #ifndef DOXYGEN_SHOULD_SKIP_THIS namespace tutorial { -void performSegmentationHSV(vpTutoCommonData &data) -{ #ifdef ENABLE_VISP_NAMESPACE - using namespace VISP_NAMESPACE_NAME; +using namespace VISP_NAMESPACE_NAME; #endif + +void performSegmentationHSV(vpTutoCommonData &data) +{ const unsigned int height = data.m_I_orig.getHeight(), width = data.m_I_orig.getWidth(); vpImage H(height, width); vpImage S(height, width); @@ -64,9 +65,6 @@ void performSegmentationHSV(vpTutoCommonData &data) std::vector< VISP_NAMESPACE_ADDRESSING vpImagePoint > extractSkeleton(vpTutoCommonData &data) { -#ifdef ENABLE_VISP_NAMESPACE - using namespace VISP_NAMESPACE_NAME; -#endif const int height = data.m_mask.getHeight(); const int width = data.m_mask.getWidth(); data.m_Iskeleton.resize(height, width, 0); @@ -122,9 +120,6 @@ std::vector< VISP_NAMESPACE_ADDRESSING vpImagePoint > extractSkeleton(vpTutoComm std::vector< vpImagePoint > addSaltAndPepperNoise(const std::vector< vpImagePoint > &noisefreePts, vpTutoCommonData &data) { -#ifdef ENABLE_VISP_NAMESPACE - using namespace VISP_NAMESPACE_NAME; -#endif const unsigned int nbNoiseFreePts = noisefreePts.size(); const unsigned int nbPtsToAdd = data.m_ratioSaltPepperNoise * nbNoiseFreePts; const double width = data.m_Iskeleton.getWidth();