diff --git a/kinect2_viewer/CMakeLists.txt b/kinect2_viewer/CMakeLists.txt index c68fd59..15bb622 100644 --- a/kinect2_viewer/CMakeLists.txt +++ b/kinect2_viewer/CMakeLists.txt @@ -9,14 +9,15 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Warray-bounds -Wtype-limits -Wreturn-ty # Check for c++11 support INCLUDE(CheckCXXCompilerFlag) +CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14) CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) -IF(COMPILER_SUPPORTS_CXX11) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +IF(COMPILER_SUPPORTS_CXX14) +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") ELSEIF(COMPILER_SUPPORTS_CXX0X) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") ELSE() - MESSAGE(ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") + MESSAGE(ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++14 support. Please use a different C++ compiler.") ENDIF() find_package(catkin REQUIRED COMPONENTS roscpp rostime std_msgs sensor_msgs message_filters cv_bridge image_transport compressed_image_transport compressed_depth_image_transport kinect2_bridge) diff --git a/kinect2_viewer/src/viewer.cpp b/kinect2_viewer/src/viewer.cpp index 26c170b..1eb0e0d 100644 --- a/kinect2_viewer/src/viewer.cpp +++ b/kinect2_viewer/src/viewer.cpp @@ -276,7 +276,7 @@ private: combine(color, depthDisp, combined); //combined = color; - cv::putText(combined, oss.str(), pos, font, sizeText, colorText, lineText, CV_AA); + cv::putText(combined, oss.str(), pos, font, sizeText, colorText, lineText, cv::LINE_AA); cv::imshow("Image Viewer", combined); }