Changeset 147 in pacpussensors for trunk/CameraViewer

Timestamp:

Apr 14, 2017, 5:55:02 PM (8 years ago)

Author:

ldecherf

Message:

Ajout CameraPlayer

Location:

trunk/CameraViewer

Files:

• CMakeLists.txt (modified) (1 diff)
• CameraViewerComponent.cpp (modified) (3 diffs)
• CameraViewerComponent.hpp (modified) (1 diff)

trunk/CameraViewer/CMakeLists.txt

@@ -76 +76 @@
 )
 
+target_compile_definitions(${PROJECT_NAME} PUBLIC OPENCV_MAJOR=${OpenCV_VERSION_MAJOR})
+
 
 # ========================================

trunk/CameraViewer/CameraViewerComponent.cpp

@@ +1 @@
+
 
 // Includes, project.
@@ -18 +19 @@
 using namespace pacpus;
 
-// Declare the logger and register the new component.
-//DECLARE_STATIC_LOGGER("pacpus.component.vislabCamera")
-//REGISTER_COMPONENT(CameraViewerComponent, "Camera");
 
 ComponentFactory<CameraViewerComponent> sFactory("CameraViewerComponent");
@@ -62 +60 @@
 void CameraViewerComponent::DisplayFrame(cv::Mat const& frame)
 {
-        //getchar();
-        //std::cout << getName().toStdString() << std::endl;
         cv::imshow(getName().toStdString(), frame);
-        //cv::imshow("Image", frame);
 }
 

trunk/CameraViewer/CameraViewerComponent.hpp

@@ -13 +13 @@
 
 // Includes, opencv.
-#include <opencv2/opencv.hpp>
-#include <opencv2/highgui.hpp>
+#if (OPENCV_MAJOR == 3)
+#   include <opencv2/opencv.hpp>
+#   include <opencv2/highgui.hpp>
+#else
+#   include <opencv/cv.h>
+#   include <opencv/highgui.h>
+#endif