merge upstream changes and resolve conflicts

lagadic · Oct 26, 2023 · 0051acc · 0051acc
2 parents 9eff5ed + 1ea95ea
commit 0051acc
Show file tree

Hide file tree

Showing 31 changed files with 150 additions and 248 deletions.
diff --git a/core/sample-vpColor.cpp b/core/sample-vpColor.cpp
@@ -20,7 +20,7 @@ int main()
   d = new vpDisplayGDI;
 #elif defined(VISP_HAVE_D3D9)
   d = new vpDisplayD3D;
-#elif defined(VISP_HAVE_OPENCV)
+#elif defined(HAVE_OPENCV_HIGHGUI)
   d = new vpDisplayOpenCV;
 #endif
 

diff --git a/core/sample-vpImageConvert-3.cpp b/core/sample-vpImageConvert-3.cpp
diff --git a/core/sample-vpImageConvert-4.cpp b/core/sample-vpImageConvert-4.cpp
diff --git a/core/sample-vpImageConvert-6.cpp b/core/sample-vpImageConvert-6.cpp
@@ -8,13 +8,13 @@
 
 int main()
 {
-#if defined(VISP_HAVE_OPENCV) && (VISP_HAVE_OPENCV_VERSION >= 0x020100) && defined(HAVE_OPENCV_IMGCODECS)
-  vpImage<unsigned char> Ig; // A greyscale image
+#if defined(VISP_HAVE_OPENCV) && defined(HAVE_OPENCV_IMGPROC) && defined(HAVE_OPENCV_IMGCODECS)
+  vpImage<unsigned char> Ig; // A grayscale image
   cv::Mat Ip;
 
   // Read an image on a disk
   vpImageIo::readPGM(Ig, "image.pgm");
-  // Convert the vpImage<unsigned char> in to greyscale cv::Mat
+  // Convert the vpImage<unsigned char> in to grayscale cv::Mat
   vpImageConvert::convert(Ig, Ip);
   // Treatments on cv::Mat Ip
   //...

diff --git a/core/sample-vpImageConvert-7.cpp b/core/sample-vpImageConvert-7.cpp
diff --git a/core/sample-vpImageConvert-8.cpp b/core/sample-vpImageConvert-8.cpp
@@ -8,7 +8,7 @@
 
 int main()
 {
-#if defined(VISP_HAVE_OPENCV) && (VISP_HAVE_OPENCV_VERSION >= 0x020100) && defined(HAVE_OPENCV_IMGCODECS)
+#if defined(VISP_HAVE_OPENCV) && defined(HAVE_OPENCV_IMGPROC) && defined(HAVE_OPENCV_IMGCODECS)
   vpImage<unsigned char> Ig; // A grayscale image
   cv::Mat Ip;
 

diff --git a/core/sample-vpImageConvert-9.cpp b/core/sample-vpImageConvert-9.cpp
@@ -9,7 +9,7 @@
 
 int main()
 {
-#if defined(VISP_HAVE_OPENCV) && (VISP_HAVE_OPENCV_VERSION >= 0x020100) && defined(HAVE_OPENCV_IMGCODECS)
+#if defined(VISP_HAVE_OPENCV) && defined(HAVE_OPENCV_IMGPROC) && defined(HAVE_OPENCV_IMGCODECS)
   vpImage<vpRGBa> Ic; // A color image
   cv::Mat Ip;
 

diff --git a/core/sample-vpImageConvert.cpp b/core/sample-vpImageConvert.cpp
diff --git a/core/sample-vpImageFilter.cpp b/core/sample-vpImageFilter.cpp
@@ -3,7 +3,7 @@
 
 int main()
 {
-#if (VISP_HAVE_OPENCV_VERSION >= 0x020100) && (VISP_HAVE_OPENCV_VERSION < 0x030000) // Cany uses OpenCV >=2.1.0 and < 3.0.0
+#if defined(VISP_HAVE_OPENCV) && defined(HAVE_OPENCV_IMGPROC)
   // Constants for the Canny operator.
   const unsigned int gaussianFilterSize = 5;
   const double thresholdCanny = 15;
@@ -13,9 +13,9 @@ int main()
   vpImage<unsigned char> Isrc;
   vpImage<unsigned char> Icanny;
 
-  //First grab the source image Isrc.
+  // First grab the source image Isrc.
 
-  //Apply the Canny edge operator and set the Icanny image.
+  // Apply the Canny edge operator and set the Icanny image.
   vpImageFilter::canny(Isrc, Icanny, gaussianFilterSize, thresholdCanny, apertureSobel);
 #endif
   return (0);

diff --git a/detection/sample-vpDetectorFace.cpp b/detection/sample-vpDetectorFace.cpp
@@ -2,13 +2,13 @@
 
 int main()
 {
-#if (VISP_HAVE_OPENCV_VERSION >= 0x020200)
+#if defined(VISP_HAVE_OPENCV) && defined(HAVE_OPENCV_OBJDETECT)
   vpImage<unsigned char> I;
   vpDetectorFace face_detector;
   face_detector.setCascadeClassifierFile("haarcascade_frontalface_alt.xml");
 
-  while(1) {
-    // acquire a new image in I
+  while (1) {
+    // Acquire a new image in I
     bool face_found = face_detector.detect(I);
     if (face_found) {
       vpRect face_bbox = face_detector.getBBox(0); // largest face has index 0

diff --git a/gui/sample-vpDisplay-2.cpp b/gui/sample-vpDisplay-2.cpp
@@ -23,7 +23,7 @@ int main()
   d = new vpDisplayGDI;
 #elif defined(VISP_HAVE_D3D9)
   d = new vpDisplayD3D;
-#elif defined(VISP_HAVE_OPENCV)
+#elif defined(HAVE_OPENCV_HIGHGUI)
   d = new vpDisplayOpenCV;
 #endif
 
@@ -43,11 +43,11 @@ int main()
   vpDisplay::flush(I);
 
   // Updates the color image with the original loaded image and the overlay
-  vpDisplay::getImage(I, Ioverlay) ;
+  vpDisplay::getImage(I, Ioverlay);
 
   // Write the color image on the disk
   std::string ofilename("overlay.ppm");
-  vpImageIo::writePPM(Ioverlay, ofilename) ;
+  vpImageIo::writePPM(Ioverlay, ofilename);
 
   // Wait for a click in the display window
   vpDisplay::getClick(I);

diff --git a/gui/sample-vpDisplay-3.cpp b/gui/sample-vpDisplay-3.cpp
@@ -23,7 +23,7 @@ int main()
   d = new vpDisplayGDI;
 #elif defined(VISP_HAVE_D3D9)
   d = new vpDisplayD3D;
-#elif defined(VISP_HAVE_OPENCV)
+#elif defined(HAVE_OPENCV_HIGHGUI)
   d = new vpDisplayOpenCV;
 #endif
 
@@ -42,11 +42,11 @@ int main()
   vpDisplay::flush(I);
 
   // Updates the color image with the original loaded image and the overlay
-  vpDisplay::getImage(I, Ioverlay) ;
+  vpDisplay::getImage(I, Ioverlay);
 
   // Write the color image on the disk
   std::string ofilename("overlay.ppm");
-  vpImageIo::writePPM(Ioverlay, ofilename) ;
+  vpImageIo::writePPM(Ioverlay, ofilename);
 
   // Wait for a click in the display window
   vpDisplay::getClick(I);

diff --git a/gui/sample-vpDisplay-4.cpp b/gui/sample-vpDisplay-4.cpp
@@ -20,7 +20,7 @@ int main()
   d = new vpDisplayGDI;
 #elif defined(VISP_HAVE_D3D9)
   d = new vpDisplayD3D;
-#elif defined(VISP_HAVE_OPENCV)
+#elif defined(HAVE_OPENCV_HIGHGUI)
   d = new vpDisplayOpenCV;
 #else
   std::cout << "Sorry, no video device is available" << std::endl;
@@ -52,11 +52,11 @@ int main()
     event = vpDisplay::getKeyboardEvent(I, &key[0], false);
     if (event) {
       std::cout << "Key detected: " << key << std::endl;
-      cpt_event ++;
+      cpt_event++;
     }
 
     vpTime::wait(5); // wait 5 ms
-  } while(cpt_event < 5);
+  } while (cpt_event < 5);
 
 #ifdef VISP_HAVE_DISPLAY
   delete d;

diff --git a/gui/sample-vpDisplay-5.cpp b/gui/sample-vpDisplay-5.cpp
@@ -18,7 +18,7 @@ int main()
   d = new vpDisplayGDI;
 #elif defined(VISP_HAVE_D3D9)
   d = new vpDisplayD3D;
-#elif defined(VISP_HAVE_OPENCV)
+#elif defined(HAVE_OPENCV_HIGHGUI)
   d = new vpDisplayOpenCV;
 #else
   std::cout << "Sorry, no video device is available" << std::endl;
@@ -50,11 +50,11 @@ int main()
     event = vpDisplay::getKeyboardEvent(I, &key[0], false);
     if (event) {
       std::cout << "Key detected: " << key << std::endl;
-      cpt_event ++;
+      cpt_event++;
     }
 
     vpTime::wait(5); // wait 5 ms
-  } while(cpt_event < 5);
+  } while (cpt_event < 5);
 
 #ifdef VISP_HAVE_DISPLAY
   delete d;

diff --git a/gui/sample-vpDisplay-6.cpp b/gui/sample-vpDisplay-6.cpp
@@ -18,7 +18,7 @@ int main()
   d = new vpDisplayGDI;
 #elif defined(VISP_HAVE_D3D9)
   d = new vpDisplayD3D;
-#elif defined(VISP_HAVE_OPENCV)
+#elif defined(HAVE_OPENCV_HIGHGUI)
   d = new vpDisplayOpenCV;
 #else
   std::cout << "Sorry, no video device is available" << std::endl;
@@ -50,11 +50,11 @@ int main()
     event = vpDisplay::getKeyboardEvent(I, &key[0], false);
     if (event) {
       std::cout << "Key detected: " << key << std::endl;
-      cpt_event ++;
+      cpt_event++;
     }
 
     vpTime::wait(5); // wait 5 ms
-  } while(cpt_event < 5);
+  } while (cpt_event < 5);
 
 #ifdef VISP_HAVE_DISPLAY
   delete d;

diff --git a/gui/sample-vpDisplay-7.cpp b/gui/sample-vpDisplay-7.cpp
@@ -21,7 +21,7 @@ int main()
   d = new vpDisplayGDI;
 #elif defined(VISP_HAVE_D3D9)
   d = new vpDisplayD3D;
-#elif defined(VISP_HAVE_OPENCV)
+#elif defined(HAVE_OPENCV_HIGHGUI)
   d = new vpDisplayOpenCV;
 #else
   std::cout << "Sorry, no video device is available" << std::endl;