Merge branch 'catch-exceptions'

Author: rainyl

.github/workflows/build_catch_exceptions.yaml

@@ -0,0 +1,51 @@
+name: build for catch exceptions
+
+on:
+  push:
+    branches: ["catch-exceptions"]
+  pull_request:
+    branches: [ "catch-exceptions" ]
+
+env:
+  ANDROID_NDK_VERSION: r26c
+  OPENCV_VERSION: 4.9.0
+  LIB_NAME: libopencv_dart
+
+jobs:
+  build-ubuntu:
+    name: build-ubuntu
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: setup
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y curl git wget python3 unzip build-essential \
+            libgtk-3-dev ffmpeg libavcodec-dev \
+            cmake ninja-build ccache nasm libavformat-dev libavutil-dev \
+            libswscale-dev libgflags-dev \
+            libjpeg-dev libpng-dev libtiff-dev python3-pip
+
+          python3 -m pip install conan
+          conan profile detect -f
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: build-opencv-dart
+        run: |
+          conan build . -b missing -c tools.cmake.cmaketoolchain:generator=Ninja
+      - uses: subosito/flutter-action@v2
+        with:
+          # flutter-version: '3.16.9'
+          channel: "stable"
+      - uses: actions/upload-artifact@v4
+        name: upload-linux-x64
+        with:
+          path: build/publish/libopencv_dart-linux-x64.tar.gz
+          name: libopencv_dart-linux-x64.tar.gz
+      - name: Run Test
+        run: |
+          export LD_LIBRARY_PATH="${{github.workspace}}/linux:$LD_LIBRARY_PATH"
+          flutter pub get
+          flutter test -x skip-workflow,no-local-files

.github/workflows/build_test.yaml

@@ -168,7 +168,7 @@ jobs:
           submodules: true
       - name: setup
         run: |
-          brew install --force --overwrite ninja ffmpeg nasm conan
+          brew install --force --overwrite ninja ccache ffmpeg nasm conan
           conan profile detect -f
           cd ${{github.workspace}}
       - name: build
@@ -208,7 +208,7 @@ jobs:
       - name: setup
         run: |
           # brew update
-          brew install --force --overwrite ninja ffmpeg nasm conan
+          brew install --force --overwrite ninja ccache ffmpeg nasm conan
           conan profile detect -f
           cd ${{github.workspace}}
       - name: build
@@ -248,7 +248,7 @@ jobs:
             submodules: true
         - name: setup
           run: |
-            brew install --force --overwrite ninja nasm conan
+            brew install --force --overwrite ninja ccache nasm conan
             conan profile detect -f
             cd ${{github.workspace}}
         - name: build

.gitignore

@@ -26,6 +26,8 @@ test/models/
 *.dylib
 CMakeUserPresets*
 *.framework
+.clang-format
+CMakePresets.json
 
 # Files and directories created by pub
 .dart_tool/

CMakeLists.txt

@@ -1,16 +1,20 @@
 cmake_minimum_required(VERSION 3.15)
 
 project(opencv_dart_library VERSION 0.0.1 LANGUAGES C CXX)
-set(library_name "opencv_dart")
+set(LIBRARY_NAME "opencv_dart")
 
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
+cmake_policy(SET CMP0135 NEW)
 
 find_package(OpenCV REQUIRED)
 
 set(OpenCV_LIBS
     opencv_aruco opencv_core opencv_calib3d opencv_dnn opencv_highgui
-    opencv_features2d opencv_photo opencv_imgproc opencv_img_hash
+    opencv_features2d opencv_gapi opencv_photo opencv_imgproc
     opencv_objdetect opencv_video opencv_videoio opencv_stitching
+    opencv_img_hash
 )
 
 if(ANDROID)
@@ -31,36 +35,43 @@ message(STATUS "    version: ${OpenCV_VERSION}")
 message(STATUS "    libraries: ${OpenCV_LIBS}")
 message(STATUS "    include path: ${OpenCV_INCLUDE_DIRS}")
 
-file(GLOB GOCV_FILES
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp"
-
-    # "${CMAKE_CURRENT_SOURCE_DIR}/gocv/contrib/*.cpp"
+file(GLOB_RECURSE CPP_FILES
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/**/*.cpp"
+
+    # "${CMAKE_CURRENT_SOURCE_DIR}/src/calib3d/*.cpp"
+    # "${CMAKE_CURRENT_SOURCE_DIR}/src/core/*.cpp"
+    # "${CMAKE_CURRENT_SOURCE_DIR}/src/dnn/*.cpp"
+    # "${CMAKE_CURRENT_SOURCE_DIR}/src/extra/*.cpp"
+    # "${CMAKE_CURRENT_SOURCE_DIR}/src/highgui/*.cpp"
+    # "${CMAKE_CURRENT_SOURCE_DIR}/src/imgcodecs/*.cpp"
+    # "${CMAKE_CURRENT_SOURCE_DIR}/src/imgproc/*.cpp"
+    # "${CMAKE_CURRENT_SOURCE_DIR}/src/objdetect/*.cpp"
+    # "${CMAKE_CURRENT_SOURCE_DIR}/src/photo/*.cpp"
+    # "${CMAKE_CURRENT_SOURCE_DIR}/src/stitching/*.cpp"
 )
-file(GLOB GOCV_HEADERS
+file(GLOB_RECURSE HEADER_FILES
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h"
-
-    # "${CMAKE_CURRENT_SOURCE_DIR}/gocv/contrib/*.cpp"
 )
 
-add_library(${library_name} SHARED
-    ${GOCV_FILES}
+add_library(${LIBRARY_NAME} SHARED
+    ${CPP_FILES}
 )
-target_include_directories(${library_name} SYSTEM PUBLIC
+target_include_directories(${LIBRARY_NAME} SYSTEM PUBLIC
     "${CMAKE_CURRENT_SOURCE_DIR}/src"
     ${OpenCV_INCLUDE_DIRS}
 )
-target_link_libraries(${library_name} PRIVATE ${OpenCV_LIBS})
+target_link_libraries(${LIBRARY_NAME} PRIVATE ${OpenCV_LIBS})
 
-set_target_properties(${library_name} PROPERTIES
+set_target_properties(${LIBRARY_NAME} PROPERTIES
     # PUBLIC_HEADER ${GOCV_HEADERS}
-    OUTPUT_NAME ${library_name}
+    OUTPUT_NAME ${LIBRARY_NAME}
     CXX_VISIBILITY_PRESET default
     C_VISIBILITY_PRESET default
     LINK_FLAGS_RELEASE -s
 )
 
 if(IOS)
-    set_target_properties(${library_name} PROPERTIES
+    set_target_properties(${LIBRARY_NAME} PROPERTIES
         FRAMEWORK TRUE
         FRAMEWORK_VERSION CXX
         MACOSX_FRAMEWORK_IDENTIFIER dev.rainyl.opencvDart
@@ -71,28 +82,16 @@ endif(IOS)
 
 
 if(WIN32)
-    set_target_properties(${library_name} PROPERTIES
+    set_target_properties(${LIBRARY_NAME} PROPERTIES
         WINDOWS_EXPORT_ALL_SYMBOLS ON
+        COMPILE_FLAGS "/EHsc"
     )
 endif(WIN32)
 
-target_compile_definitions(${library_name} PUBLIC DART_SHARED_LIB)
-
-if(WITH_OPENCV_DART_DEMO)
-    add_executable(
-        demo
-        "src/demo.cxx"
-    )
-    target_link_libraries(
-        demo
-        PUBLIC
-        ${OpenCV_LIBS}
-        ${library_name}
-    )
-endif()
+target_compile_definitions(${LIBRARY_NAME} PUBLIC DART_SHARED_LIB)
 
-# ## install
-install(TARGETS ${library_name}
+### install
+install(TARGETS ${LIBRARY_NAME}
     DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 if(WIN32)
@@ -104,3 +103,68 @@ elseif(LINUX)
 endif()
 
 install(FILES ${CV_DEPENDENCIES} DESTINATION ${CMAKE_INSTALL_PREFIX})
+
+if(CVD_ENABLE_TEST)
+    ### test
+    include(FetchContent)
+    FetchContent_Declare(
+        googletest
+        URL https://github.com/google/googletest/archive/refs/heads/main.zip
+    )
+    # For Windows: Prevent overriding the parent project's compiler/linker settings
+    if(WIN32)
+        set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+    endif(WIN32)
+    FetchContent_MakeAvailable(googletest)
+    # copy test images
+    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/test)
+    file(COPY
+        "${CMAKE_CURRENT_SOURCE_DIR}/test/images"
+        DESTINATION ${CMAKE_BINARY_DIR}/test
+    )
+    # model files for DNN test
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/models")    
+        file(COPY
+        "${CMAKE_CURRENT_SOURCE_DIR}/test/models"
+        DESTINATION ${CMAKE_BINARY_DIR}/test
+        )
+    endif()
+
+    enable_testing()
+
+    macro(add_ocv_dart_test executable_name source_file)
+        add_executable(
+            ${executable_name}
+            "${source_file}"
+        )
+
+        target_link_libraries(
+            ${executable_name}
+            PUBLIC
+            ${OpenCV_LIBS}
+            ${LIBRARY_NAME}
+            GTest::gtest_main
+        )
+
+        if(WIN32)
+            set_target_properties(${executable_name} PROPERTIES
+                COMPILE_FLAGS "/EHsc"
+            )
+        endif(WIN32)
+    endmacro()
+
+    add_ocv_dart_test(ocv_dart_test_vec "src/test/vec.cc")
+    add_ocv_dart_test(ocv_dart_test_core "src/test/core.cc")
+    add_ocv_dart_test(ocv_dart_test_calib3d "src/test/calib3d.cc")
+    add_ocv_dart_test(ocv_dart_test_dnn "src/test/dnn.cc")
+    add_ocv_dart_test(ocv_dart_test_imgcodecs "src/test/imgcodecs.cc")
+    add_ocv_dart_test(ocv_dart_test_imgproc "src/test/imgproc.cc")
+
+    include(GoogleTest)
+    gtest_discover_tests(ocv_dart_test_vec)
+    gtest_discover_tests(ocv_dart_test_core)
+    gtest_discover_tests(ocv_dart_test_calib3d)
+    gtest_discover_tests(ocv_dart_test_dnn)
+    gtest_discover_tests(ocv_dart_test_imgcodecs)
+    gtest_discover_tests(ocv_dart_test_imgproc)
+endif()

README.md

@@ -202,6 +202,10 @@ This package is in heavy development, dynamic libraries for Windows and linux ha
 
 - `gocv` project: <https://github.com/hybridgroup/gocv> License: Apache-2.0
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=rainyl/opencv_dart&type=Date)](https://star-history.com/#rainyl/opencv_dart&Date)
+
 ## License
 
 Apache-2.0 License

example/lib/main.dart

@@ -113,10 +113,8 @@ class _MyAppState extends State<MyApp> {
                       .load("images/lenna.png");
                   final im =
                       cv.imdecode(data.buffer.asUint8List(), cv.IMREAD_COLOR);
-                  final gray = cv.Mat.empty();
-                  cv.cvtColor(im, gray, cv.COLOR_BGR2GRAY);
-                  final blur = cv.Mat.empty();
-                  cv.gaussianBlur(im, blur, (7, 7), 2, sigmaY: 2);
+                  final gray = cv.cvtColor(im, cv.COLOR_BGR2GRAY);
+                  final blur = cv.gaussianBlur(im, (7, 7), 2, sigmaY: 2);
                   setState(() {
                     images = [
                       data.buffer.asUint8List(),