fixed inclusion of nanovg and nanogui

modules/viz2d/CMakeLists.txt

@@ -12,7 +12,7 @@ if (${idx} LESS 0)
   message(STATUS "Module opencv_viz2d disabled because it requires C++20")
   ocv_module_disable(viz2d)
 endif()
-#  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVIZ2D_USE_ES3=1")
+set(CMAKE_CXX_FLAGS "${CMAKE_LD_FLAGS} -L../../lib")
 
 find_package(Git QUIET)
 if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../.git")
@@ -48,7 +48,8 @@ target_compile_features(opencv_viz2d PRIVATE cxx_std_20)
 set_target_properties(opencv_viz2d PROPERTIES OUTPUT_NAME "viz2d")
 
 #ocv_add_samples(opencv_aruco)
-ocv_warnings_disable(CMAKE_CXX_FLAGS -Wunused-parameter)
-ocv_target_link_libraries(${the_module} ${GLEW_LIBRARIES} OpenCL -lnanogui -lGL)
+ocv_warnings_disable(CMAKE_CXX_FLAGS -Wunused-parameter -Wdeprecated-enum-enum-conversion)
+ocv_target_link_libraries(${the_module} ${GLEW_LIBRARIES} OpenCL -lnanovg -lnanogui -lGL)
+
 
 

modules/viz2d/include/opencv2/viz2d/nvg.hpp

@@ -138,7 +138,7 @@ public:
     void restore();
     void reset();
 
-    void shapeAntiAlias(int enabled);
+//    void shapeAntiAlias(int enabled);
     void strokeColor(const cv::Scalar& bgra);
     void strokePaint(Paint paint);
     void fillColor(const cv::Scalar& bgra);
@@ -293,10 +293,10 @@ CV_EXPORTS void restore();
  * A forward to nvgReset. See https://github.com/memononen/nanovg/blob/master/src/nanovg.h
  */
 CV_EXPORTS void reset();
-/*!
- * A forward to nvgShapeAntiAlias. See https://github.com/memononen/nanovg/blob/master/src/nanovg.h
- */
-CV_EXPORTS void shapeAntiAlias(int enabled);
+///*!
+// * A forward to nvgShapeAntiAlias. See https://github.com/memononen/nanovg/blob/master/src/nanovg.h
+// */
+//CV_EXPORTS void shapeAntiAlias(int enabled);
 /*!
  * A forward to nvgStrokeColor. See https://github.com/memononen/nanovg/blob/master/src/nanovg.h
  */

modules/viz2d/src/nvg.cpp

@@ -115,9 +115,9 @@ void NVG::reset() {
     nvgReset(getContext());
 }
 
-void NVG::shapeAntiAlias(int enabled) {
-    nvgShapeAntiAlias(getContext(), enabled);
-}
+//void NVG::shapeAntiAlias(int enabled) {
+//    nvgShapeAntiAlias(getContext(), enabled);
+//}
 
 void NVG::strokeColor(const cv::Scalar& bgra) {
     nvgStrokeColor(getContext(), nvgRGBA(bgra[2], bgra[1], bgra[0], bgra[3]));
@@ -438,9 +438,9 @@ void reset() {
     detail::NVG::getCurrentContext()->reset();
 }
 
-void shapeAntiAlias(int enabled) {
-    detail::NVG::getCurrentContext()->strokeColor(enabled);
-}
+//void shapeAntiAlias(int enabled) {
+//    detail::NVG::getCurrentContext()->strokeColor(enabled);
+//}
 
 void strokeColor(const cv::Scalar& bgra) {
     detail::NVG::getCurrentContext()->strokeColor(bgra);