diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5b7b8dd8..a961db8f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -28,8 +28,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.9.0 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0 + gocv/opencv:4.10.0 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0 tags: | type=sha,format=long type=raw,value=latest @@ -53,9 +53,9 @@ jobs: push: true tags: | gocv/opencv:latest - gocv/opencv:4.9.0 + gocv/opencv:4.10.0 ghcr.io/${{ github.repository_owner }}/opencv:latest - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -78,8 +78,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.9.0-static - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-static + gocv/opencv:4.10.0-static + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-static tags: | type=sha,format=long type=raw,value=latest @@ -102,8 +102,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.9.0-static - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-static + gocv/opencv:4.10.0-static + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-static labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -156,8 +156,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.9.0-gpu-cuda-11 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-gpu-cuda-11 + gocv/opencv:4.10.0-gpu-cuda-11 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-gpu-cuda-11 tags: | type=sha,format=long type=raw,value=latest @@ -180,8 +180,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.9.0-gpu-cuda-11 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-gpu-cuda-11 + gocv/opencv:4.10.0-gpu-cuda-11 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-gpu-cuda-11 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -234,8 +234,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.9.0-gpu-cuda-11.2.2 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-gpu-cuda-11.2.2 + gocv/opencv:4.10.0-gpu-cuda-11.2.2 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-gpu-cuda-11.2.2 tags: | type=sha,format=long type=raw,value=latest @@ -258,8 +258,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.9.0-gpu-cuda-11.2.2 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-gpu-cuda-11.2.2 + gocv/opencv:4.10.0-gpu-cuda-11.2.2 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-gpu-cuda-11.2.2 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -312,8 +312,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.9.0-gpu-cuda-12 - ghcr.io/${{ github.repository_owner }}/opemcv:4.9.0-gpu-cuda-12 + gocv/opencv:4.10.0-gpu-cuda-12 + ghcr.io/${{ github.repository_owner }}/opemcv:4.10.0-gpu-cuda-12 tags: | type=sha,format=long type=raw,value=latest @@ -336,8 +336,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.9.0-gpu-cuda-12 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-gpu-cuda-12 + gocv/opencv:4.10.0-gpu-cuda-12 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-gpu-cuda-12 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -358,8 +358,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.9.0-ubuntu-18.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-18.04 + gocv/opencv:4.10.0-ubuntu-18.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-18.04 tags: | type=sha,format=long type=raw,value=latest @@ -382,8 +382,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.9.0-ubuntu-18.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-18.04 + gocv/opencv:4.10.0-ubuntu-18.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-18.04 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -404,8 +404,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.9.0-ubuntu-20.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-20.04 + gocv/opencv:4.10.0-ubuntu-20.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-20.04 tags: | type=sha,format=long type=raw,value=latest @@ -428,8 +428,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.9.0-ubuntu-20.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-20.04 + gocv/opencv:4.10.0-ubuntu-20.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-20.04 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -450,8 +450,8 @@ jobs: uses: docker/metadata-action@v4 with: images: | - gocv/opencv:4.9.0-ubuntu-22.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-22.04 + gocv/opencv:4.10.0-ubuntu-22.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-22.04 tags: | type=sha,format=long type=raw,value=latest @@ -474,8 +474,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.9.0-ubuntu-22.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.9.0-ubuntu-22.04 + gocv/opencv:4.10.0-ubuntu-22.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-ubuntu-22.04 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2b6ee029..af5847f2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,7 +9,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: ghcr.io/hybridgroup/opencv:4.9.0 + container: ghcr.io/hybridgroup/opencv:4.10.0 steps: - name: Checkout diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ab0da7a5..a62b2608 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,39 +26,39 @@ jobs: uses: actions/cache/restore@v4 id: cache-opencv-source with: - key: opencv-source-490-windows-v1a + key: opencv-source-410-windows-v1a path: | - ./opencv/opencv-4.9.0 - ./opencv/opencv_contrib-4.9.0 + ./opencv/opencv-4.10.0 + ./opencv/opencv_contrib-4.10.0 - name: Download OpenCV source if: steps.cache-opencv-source.outputs.cache-hit != 'true' shell: bash run: | mkdir -p ./opencv - curl -Lo ./opencv/opencv-4.9.0.zip https://github.com/opencv/opencv/archive/4.9.0.zip - curl -Lo ./opencv/opencv_contrib-4.9.0.zip https://github.com/opencv/opencv_contrib/archive/4.9.0.zip + curl -Lo ./opencv/opencv-4.10.0.zip https://github.com/opencv/opencv/archive/4.10.0.zip + curl -Lo ./opencv/opencv_contrib-4.10.0.zip https://github.com/opencv/opencv_contrib/archive/4.10.0.zip - name: Extract OpenCV source if: steps.cache-opencv-source.outputs.cache-hit != 'true' shell: bash run: | cd ./opencv - mkdir -p opencv-4.9.0 - mkdir -p opencv_contrib-4.9.0 - 7z x opencv-4.9.0.zip - 7z x opencv_contrib-4.9.0.zip + mkdir -p opencv-4.10.0 + mkdir -p opencv_contrib-4.10.0 + 7z x opencv-4.10.0.zip + 7z x opencv_contrib-4.10.0.zip - name: Save cached OpenCV source uses: actions/cache/save@v4 if: steps.cache-opencv-source.outputs.cache-hit != 'true' with: key: ${{ steps.cache-opencv-source.outputs.cache-primary-key }} path: | - ./opencv/opencv-4.9.0 - ./opencv/opencv_contrib-4.9.0 + ./opencv/opencv-4.10.0 + ./opencv/opencv_contrib-4.10.0 - name: Restore cached OpenCV build uses: actions/cache/restore@v4 id: cache-opencv-build with: - key: opencv-build-490-windows-v1d + key: opencv-build-410-windows-v1d path: | ./opencv/build - name: Build OpenCV @@ -66,7 +66,7 @@ jobs: run: | mkdir -p ./opencv/build cd ./opencv/build - cmake -G "MinGW Makefiles" -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH="../opencv_contrib-4.9.0/modules" -DBUILD_SHARED_LIBS=ON -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -DOPENCV_ENABLE_NONFREE=ON -Wno-dev ../opencv-4.9.0 + cmake -G "MinGW Makefiles" -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH="../opencv_contrib-4.10.0/modules" -DBUILD_SHARED_LIBS=ON -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -DOPENCV_ENABLE_NONFREE=ON -Wno-dev ../opencv-4.10.0 cmake --build . --target install - name: Save cached OpenCV build uses: actions/cache/save@v4 @@ -80,7 +80,7 @@ jobs: go env echo "CGO_CXXFLAGS=--std=c++11" >> $env:GITHUB_ENV echo "CGO_CPPFLAGS=-I${env:GITHUB_WORKSPACE}\opencv\build\install\include" >> $env:GITHUB_ENV - echo "CGO_LDFLAGS=-L${env:GITHUB_WORKSPACE}\opencv\build\install\x64\mingw\lib -lopencv_core490 -lopencv_face490 -lopencv_videoio490 -lopencv_imgproc490 -lopencv_highgui490 -lopencv_imgcodecs490 -lopencv_objdetect490 -lopencv_features2d490 -lopencv_video490 -lopencv_dnn490 -lopencv_xfeatures2d490 -lopencv_plot490 -lopencv_tracking490 -lopencv_img_hash490 -lopencv_calib3d490 -lopencv_bgsegm490 -lopencv_photo490 -lopencv_aruco490 -lopencv_wechat_qrcode490 -lopencv_ximgproc490 -lopencv_xphoto490" >> $env:GITHUB_ENV + echo "CGO_LDFLAGS=-L${env:GITHUB_WORKSPACE}\opencv\build\install\x64\mingw\lib -lopencv_core410 -lopencv_face410 -lopencv_videoio410 -lopencv_imgproc410 -lopencv_highgui410 -lopencv_imgcodecs410 -lopencv_objdetect410 -lopencv_features2d410 -lopencv_video410 -lopencv_dnn410 -lopencv_xfeatures2d410 -lopencv_plot410 -lopencv_tracking410 -lopencv_img_hash410 -lopencv_calib3d410 -lopencv_bgsegm410 -lopencv_photo410 -lopencv_aruco410 -lopencv_wechat_qrcode410 -lopencv_ximgproc410 -lopencv_xphoto410" >> $env:GITHUB_ENV echo "${env:GITHUB_WORKSPACE}/opencv/build/install/x64/mingw/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Test GoCV run: | diff --git a/Dockerfile b/Dockerfile index fd2b52af..4dfdf7fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # to build this docker image: # docker build . -FROM ghcr.io/hybridgroup/opencv:4.9.0 +FROM ghcr.io/hybridgroup/opencv:4.10.0 ENV GOPATH /go diff --git a/Dockerfile-test b/Dockerfile-test index 4d724f8a..387cb8c2 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -6,7 +6,7 @@ # docker run -it --rm -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix gocv-test-4.x # xhost - # -FROM ghcr.io/hybridgroup/opencv:4.9.0 AS gocv-test-4.7 +FROM ghcr.io/hybridgroup/opencv:4.10.0 AS gocv-test-4.7 ENV GOPATH /go diff --git a/Dockerfile-test.gpu-cuda-10 b/Dockerfile-test.gpu-cuda-10 index ad4b9de3..0ff81248 100644 --- a/Dockerfile-test.gpu-cuda-10 +++ b/Dockerfile-test.gpu-cuda-10 @@ -4,7 +4,7 @@ # To run tests: # docker run -it --rm --gpus all gocv-test-gpu-cuda-10 # -FROM ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-10 AS gocv-gpu-test-cuda-10 +FROM ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-10 AS gocv-gpu-test-cuda-10 ENV GOPATH /go ENV PATH="${PATH}:/go/bin" diff --git a/Dockerfile-test.gpu-cuda-11 b/Dockerfile-test.gpu-cuda-11 index 1679cf3c..37817a05 100644 --- a/Dockerfile-test.gpu-cuda-11 +++ b/Dockerfile-test.gpu-cuda-11 @@ -4,7 +4,7 @@ # To run tests: # docker run -it --rm --gpus all gocv-test-gpu-cuda-11 # -FROM ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-11 AS gocv-gpu-test-cuda-11 +FROM ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-11 AS gocv-gpu-test-cuda-11 ENV GOPATH /go ENV PATH="${PATH}:/go/bin" diff --git a/Dockerfile-test.gpu-cuda-11.2.2 b/Dockerfile-test.gpu-cuda-11.2.2 index a662e42f..ffb2c554 100644 --- a/Dockerfile-test.gpu-cuda-11.2.2 +++ b/Dockerfile-test.gpu-cuda-11.2.2 @@ -4,7 +4,7 @@ # To run tests: # docker run -it --rm --gpus all gocv-test-gpu-cuda-11.2.2 # -FROM ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-11.2.2 AS gocv-gpu-test-cuda-11 +FROM ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-11.2.2 AS gocv-gpu-test-cuda-11 ENV GOPATH /go ENV PATH="${PATH}:/go/bin" diff --git a/Dockerfile-test.gpu-cuda-12 b/Dockerfile-test.gpu-cuda-12 index 6231e34f..0df9ce81 100644 --- a/Dockerfile-test.gpu-cuda-12 +++ b/Dockerfile-test.gpu-cuda-12 @@ -4,7 +4,7 @@ # To run tests: # docker run -it --rm --gpus all gocv-test-gpu-cuda-12 # -FROM ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-12 AS gocv-gpu-test-cuda-12 +FROM ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-12 AS gocv-gpu-test-cuda-12 ENV GOPATH /go ENV PATH="${PATH}:/go/bin" diff --git a/Dockerfile.gpu b/Dockerfile.gpu index 8091cc59..798b74f3 100644 --- a/Dockerfile.gpu +++ b/Dockerfile.gpu @@ -1,6 +1,6 @@ # to build this docker image: # docker build -f Dockerfile.gpu . -FROM ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-11 AS gocv-gpu +FROM ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-11 AS gocv-gpu ENV GOPATH /go diff --git a/Dockerfile.opencv b/Dockerfile.opencv index 55d29b4c..279f8515 100644 --- a/Dockerfile.opencv +++ b/Dockerfile.opencv @@ -1,10 +1,10 @@ # OpenCV 4 prebuilt multiarchitecture image # # To build release: -# docker buildx build -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.9.0 -t ghcr.io/hybridgroup/opencv:latest --platform=linux/arm64,linux/amd64 --push . +# docker buildx build -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.10.0 -t ghcr.io/hybridgroup/opencv:latest --platform=linux/arm64,linux/amd64 --push . # # To build prerelease: -# docker buildx build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.9.0-dev --platform=linux/arm64,linux/amd64 --push . +# docker buildx build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.10.0-dev --platform=linux/arm64,linux/amd64 --push . ################### @@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y \ FROM --platform=linux/amd64 opencv-base-amd64 AS opencv-build-amd64 -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -82,7 +82,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ FROM --platform=linux/arm64 opencv-base-arm64 AS opencv-build-arm64 -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" diff --git a/Dockerfile.opencv-gpu-cuda-10 b/Dockerfile.opencv-gpu-cuda-10 index 591f3a40..b4b69488 100644 --- a/Dockerfile.opencv-gpu-cuda-10 +++ b/Dockerfile.opencv-gpu-cuda-10 @@ -1,5 +1,5 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-gpu-cuda-10 -t ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-10 . +# docker build -f Dockerfile.opencv-gpu-cuda-10 -t ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-10 . FROM nvidia/cuda:10.2-cudnn8-devel AS opencv-gpu-base LABEL maintainer="hybridgroup" @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip && \ @@ -59,7 +59,7 @@ RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSIO # install golang here FROM opencv-gpu-base AS opencv-gpu-golang -ENV GO_RELEASE=1.22.0 +ENV GO_RELEASE=1.22.3 RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \ tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \ rm go${GO_RELEASE}.linux-amd64.tar.gz diff --git a/Dockerfile.opencv-gpu-cuda-11 b/Dockerfile.opencv-gpu-cuda-11 index 15416389..d98b69a4 100644 --- a/Dockerfile.opencv-gpu-cuda-11 +++ b/Dockerfile.opencv-gpu-cuda-11 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-11 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-11.2.2 -t ghcr.io/hybridgroup/opencv:4.9.0-dev-gpu-cuda-11 . +# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-11 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-11.2.2 -t ghcr.io/hybridgroup/opencv:4.10.0-dev-gpu-cuda-11 . FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 AS opencv-gpu-cuda-11-base LABEL maintainer="hybridgroup" ENV DEBIAN_FRONTEND=noninteractive @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -65,7 +65,7 @@ RUN curl -Lo opencv.zip ${OPENCV_FILE} && \ # install golang here FROM opencv-gpu-cuda-11-base AS opencv-gpu-cuda-11-golang -ENV GO_RELEASE=1.22.0 +ENV GO_RELEASE=1.22.3 RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \ tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \ rm go${GO_RELEASE}.linux-amd64.tar.gz diff --git a/Dockerfile.opencv-gpu-cuda-11.2.2 b/Dockerfile.opencv-gpu-cuda-11.2.2 index 6d0bf738..16d22c8e 100644 --- a/Dockerfile.opencv-gpu-cuda-11.2.2 +++ b/Dockerfile.opencv-gpu-cuda-11.2.2 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-11.2.2 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-11.2.2 -t ghcr.io/hybridgroup/opencv:4.9.0-dev-gpu-cuda-11.2.2 . +# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-11.2.2 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-11.2.2 -t ghcr.io/hybridgroup/opencv:4.10.0-dev-gpu-cuda-11.2.2 . FROM nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 AS opencv-gpu-cuda-11-base LABEL maintainer="hybridgroup" ENV DEBIAN_FRONTEND=noninteractive @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -65,7 +65,7 @@ RUN curl -Lo opencv.zip ${OPENCV_FILE} && \ # install golang here FROM opencv-gpu-cuda-11-base AS opencv-gpu-cuda-11-golang -ENV GO_RELEASE=1.22.0 +ENV GO_RELEASE=1.22.3 RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \ tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \ rm go${GO_RELEASE}.linux-amd64.tar.gz diff --git a/Dockerfile.opencv-gpu-cuda-12 b/Dockerfile.opencv-gpu-cuda-12 index c8e25fcc..6db5d004 100644 --- a/Dockerfile.opencv-gpu-cuda-12 +++ b/Dockerfile.opencv-gpu-cuda-12 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-gpu-cuda-12 -t ghcr.io/hybridgroup/opencv:4.9.0-gpu-cuda-12 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-12 -t ghcr.io/hybridgroup/opencv:4.9.0-dev-gpu-cuda-12 . +# docker build -f Dockerfile.opencv-gpu-cuda-12 -t ghcr.io/hybridgroup/opencv:4.10.0-gpu-cuda-12 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-12 -t ghcr.io/hybridgroup/opencv:4.10.0-dev-gpu-cuda-12 . FROM nvidia/cuda:12.1.0-cudnn8-devel-ubuntu22.04 AS opencv-gpu-cuda-12-base LABEL maintainer="hybridgroup" ENV DEBIAN_FRONTEND=noninteractive @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -65,7 +65,7 @@ RUN curl -Lo opencv.zip ${OPENCV_FILE} && \ # install golang here FROM opencv-gpu-cuda-12-base AS opencv-gpu-cuda-12-golang -ENV GO_RELEASE=1.22.0 +ENV GO_RELEASE=1.22.3 RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \ tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \ rm go${GO_RELEASE}.linux-amd64.tar.gz diff --git a/Dockerfile.opencv-openvino b/Dockerfile.opencv-openvino index f5095ec8..cca22579 100644 --- a/Dockerfile.opencv-openvino +++ b/Dockerfile.opencv-openvino @@ -1,5 +1,5 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-openvino -t ghcr.io/hybridgroup/opencv:4.9.0-openvino +# docker build -f Dockerfile.opencv-openvino -t ghcr.io/hybridgroup/opencv:4.10.0-openvino FROM openvino/ubuntu20_dev:2022.1.0 AS opencv-openvino-base LABEL maintainer="hybridgroup" ENV DEBIAN_FRONTEND=noninteractive @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip && \ @@ -48,7 +48,7 @@ RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSIO # install golang here FROM opencv-openvino-base AS opencv-openvino-golang -ENV GO_RELEASE=1.22.0 +ENV GO_RELEASE=1.22.3 RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \ tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \ rm go${GO_RELEASE}.linux-amd64.tar.gz diff --git a/Dockerfile.opencv-static b/Dockerfile.opencv-static index 27a3355f..1193d9b1 100644 --- a/Dockerfile.opencv-static +++ b/Dockerfile.opencv-static @@ -1,10 +1,10 @@ # OpenCV 4 prebuilt multiarchitecture image # # To build release: -# docker buildx build -f Dockerfile.opencv-static -t ghcr.io/hybridgroup/opencv:4.9.0-static --platform=linux/arm64,linux/amd64 --push . +# docker buildx build -f Dockerfile.opencv-static -t ghcr.io/hybridgroup/opencv:4.10.0-static --platform=linux/arm64,linux/amd64 --push . # # To build prerelease: -# docker buildx build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.9.0-dev --platform=linux/arm64,linux/amd64 --push . +# docker buildx build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.10.0-dev --platform=linux/arm64,linux/amd64 --push . ################### @@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y \ FROM --platform=linux/amd64 opencv-base-amd64 AS opencv-build-amd64 -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -84,7 +84,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ FROM --platform=linux/arm64 opencv-base-arm64 AS opencv-build-arm64 -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" diff --git a/Dockerfile.opencv-ubuntu-18.04 b/Dockerfile.opencv-ubuntu-18.04 index 94ae1db0..441f8acd 100644 --- a/Dockerfile.opencv-ubuntu-18.04 +++ b/Dockerfile.opencv-ubuntu-18.04 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.9.0-ubuntu-18.04 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.9.0-dev-ubuntu-18.04 . +# docker build -f Dockerfile.opencv-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.10.0-ubuntu-18.04 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.10.0-dev-ubuntu-18.04 . FROM ubuntu:18.04 AS opencv-base LABEL maintainer="hybridgroup" @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" diff --git a/Dockerfile.opencv-ubuntu-20.04 b/Dockerfile.opencv-ubuntu-20.04 index b3445f27..3af42a3f 100644 --- a/Dockerfile.opencv-ubuntu-20.04 +++ b/Dockerfile.opencv-ubuntu-20.04 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.9.0-ubuntu-20.04 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.9.0-dev-ubuntu-20.04 . +# docker build -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.10.0-ubuntu-20.04 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.10.0-dev-ubuntu-20.04 . FROM ubuntu:20.04 AS opencv-base LABEL maintainer="hybridgroup" @@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" diff --git a/Dockerfile.opencv-ubuntu-22.04 b/Dockerfile.opencv-ubuntu-22.04 index 973f7763..cc711a73 100644 --- a/Dockerfile.opencv-ubuntu-22.04 +++ b/Dockerfile.opencv-ubuntu-22.04 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-ubuntu-22.04 -t ghcr.io/hybridgroup/opencv:4.9.0-ubuntu-22.04 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.9.0-dev-ubuntu-20.04 . +# docker build -f Dockerfile.opencv-ubuntu-22.04 -t ghcr.io/hybridgroup/opencv:4.10.0-ubuntu-22.04 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.10.0-dev-ubuntu-20.04 . FROM ubuntu:22.04 AS opencv-base LABEL maintainer="hybridgroup" @@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.9.0" +ARG OPENCV_VERSION="4.10.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" diff --git a/Makefile b/Makefile index 8ae6c2e0..a062043b 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,10 @@ GOCV_VERSION?="v0.35.0" # OpenCV version to use. -OPENCV_VERSION?=4.9.0 +OPENCV_VERSION?=4.10.0 # Go version to use when building Docker image -GOVERSION?=1.22.0 +GOVERSION?=1.22.3 # Temporary directory to put files into. TMP_DIR?=/tmp/ diff --git a/README.md b/README.md index 7b5c698a..ce3bd89b 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The GoCV package provides Go language bindings for the [OpenCV 4](http://opencv.org/) computer vision library. -The GoCV package supports the latest releases of Go and OpenCV (v4.9.0) on Linux, macOS, and Windows. We intend to make the Go language a "first-class" client compatible with the latest developments in the OpenCV ecosystem. +The GoCV package supports the latest releases of Go and OpenCV (v4.10.0) on Linux, macOS, and Windows. We intend to make the Go language a "first-class" client compatible with the latest developments in the OpenCV ecosystem. GoCV supports [CUDA](https://en.wikipedia.org/wiki/CUDA) for hardware acceleration using Nvidia GPUs. Check out the [CUDA README](./cuda/README.md) for more info on how to use GoCV with OpenCV/CUDA. @@ -122,7 +122,7 @@ There are examples in the [cmd directory](./cmd) of this repo in the form of var ## How to install -To install GoCV, you must first have the matching version of OpenCV installed on your system. The current release of GoCV requires OpenCV 4.9.0. +To install GoCV, you must first have the matching version of OpenCV installed on your system. The current release of GoCV requires OpenCV 4.10.0. Here are instructions for Ubuntu, Raspian, macOS, and Windows. @@ -130,7 +130,7 @@ Here are instructions for Ubuntu, Raspian, macOS, and Windows. ### Installation -You can use `make` to install OpenCV 4.9.0 with the handy `Makefile` included with this repo. If you already have installed OpenCV, you do not need to do so again. The installation performed by the `Makefile` is minimal, so it may remove OpenCV options such as Python or Java wrappers if you have already installed OpenCV some other way. +You can use `make` to install OpenCV 4.10.0 with the handy `Makefile` included with this repo. If you already have installed OpenCV, you do not need to do so again. The installation performed by the `Makefile` is minimal, so it may remove OpenCV options such as Python or Java wrappers if you have already installed OpenCV some other way. #### Quick Install @@ -141,7 +141,7 @@ First, change directories to where you want to install GoCV, and then use git to Make sure to change `$HOME/folder/with/your/src/` to where you actually want to save the code. -Once you have cloned the repo, the following commands should do everything to download and install OpenCV 4.9.0 on Linux: +Once you have cloned the repo, the following commands should do everything to download and install OpenCV 4.10.0 on Linux: cd gocv make install @@ -153,7 +153,7 @@ If you need static opencv libraries If it works correctly, at the end of the entire process, the following message should be displayed: gocv version: 0.36.1 - opencv lib version: 4.9.0 + opencv lib version: 4.10.0 That's it, now you are ready to use GoCV. @@ -167,7 +167,7 @@ See the [openvino directory](./openvino) for information. #### Make Install for OpenVINO and Cuda -The following commands should do everything to download and install OpenCV 4.9.0 with CUDA and OpenVINO on Linux. Make sure to change `$HOME/folder/with/your/src/` to the directory you used to clone GoCV: +The following commands should do everything to download and install OpenCV 4.10.0 with CUDA and OpenVINO on Linux. Make sure to change `$HOME/folder/with/your/src/` to the directory you used to clone GoCV: cd $HOME/folder/with/gocv/ make install_all @@ -179,7 +179,7 @@ If you need static opencv libraries If it works correctly, at the end of the entire process, the following message should be displayed: gocv version: 0.36.1 - opencv lib version: 4.9.0-openvino + opencv lib version: 4.10.0-openvino cuda information: Device 0: "GeForce MX150" 2003Mb, sm_61, Driver/Runtime ver.10.0/10.0 @@ -206,7 +206,7 @@ Next, you need to update the system, and install any required packages: #### Download source -Now, download the OpenCV 4.9.0 and OpenCV Contrib source code: +Now, download the OpenCV 4.10.0 and OpenCV Contrib source code: make download @@ -241,7 +241,7 @@ Now you should be able to build or run any of the examples: The version program should output the following: gocv version: 0.36.1 - opencv lib version: 4.9.0 + opencv lib version: 4.10.0 #### Cleanup extra files @@ -270,7 +270,7 @@ The project now provides `Dockerfile` which lets you build [GoCV](https://gocv.i make docker ``` -By default Docker image built by running the command above ships [Go](https://golang.org/) version `1.20.2`, but if you would like to build an image which uses different version of `Go` you can override the default value when running the target command: +By default Docker image built by running the command above ships [Go](https://golang.org/) version `1.22.2`, but if you would like to build an image which uses different version of `Go` you can override the default value when running the target command: ``` make docker GOVERSION='1.22.0' @@ -323,7 +323,7 @@ There is a Docker image with Alpine 3.7 that has been created by project contrib ### Installation -We have a special installation for the Raspberry Pi that includes some hardware optimizations. You use `make` to install OpenCV 4.9.0 with the handy `Makefile` included with this repo. If you already have installed OpenCV, you do not need to do so again. The installation performed by the `Makefile` is minimal, so it may remove OpenCV options such as Python or Java wrappers if you have already installed OpenCV some other way. +We have a special installation for the Raspberry Pi that includes some hardware optimizations. You use `make` to install OpenCV 4.10.0 with the handy `Makefile` included with this repo. If you already have installed OpenCV, you do not need to do so again. The installation performed by the `Makefile` is minimal, so it may remove OpenCV options such as Python or Java wrappers if you have already installed OpenCV some other way. #### Quick Install @@ -334,7 +334,7 @@ First, change directories to where you want to install GoCV, and then use git to Make sure to change `$HOME/folder/with/your/src/` to where you actually want to save the code. -The following make command should do everything to download and install OpenCV 4.9.0 on Raspbian: +The following make command should do everything to download and install OpenCV 4.10.0 on Raspbian: cd $HOME/folder/with/your/src/gocv make install_raspi @@ -342,7 +342,7 @@ The following make command should do everything to download and install OpenCV 4 If it works correctly, at the end of the entire process, the following message should be displayed: gocv version: 0.36.1 - opencv lib version: 4.9.0 + opencv lib version: 4.10.0 That's it, now you are ready to use GoCV. @@ -350,13 +350,13 @@ That's it, now you are ready to use GoCV. ### Installation -You can install OpenCV 4.9.0 using Homebrew. +You can install OpenCV 4.10.0 using Homebrew. If you already have an earlier version of OpenCV (3.4.x) installed, you should probably remove it before installing the new version: brew uninstall opencv -You can then install OpenCV 4.9.0: +You can then install OpenCV 4.10.0: brew install opencv @@ -382,7 +382,7 @@ Now you should be able to build or run any of the examples: The version program should output the following: gocv version: 0.36.1 - opencv lib version: 4.9.0 + opencv lib version: 4.10.0 ### Custom Environment @@ -391,8 +391,8 @@ By default, pkg-config is used to determine the correct flags for compiling and For example: export CGO_CXXFLAGS="--std=c++11" - export CGO_CPPFLAGS="-I/usr/local/Cellar/opencv/4.9.0/include" - export CGO_LDFLAGS="-L/usr/local/Cellar/opencv/4.9.0/lib -lopencv_stitching -lopencv_superres -lopencv_videostab -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dpm -lopencv_face -lopencv_photo -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_line_descriptor -lopencv_optflow -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_surface_matching -lopencv_tracking -lopencv_datasets -lopencv_dnn -lopencv_plot -lopencv_xfeatures2d -lopencv_shape -lopencv_video -lopencv_ml -lopencv_ximgproc -lopencv_calib3d -lopencv_features2d -lopencv_highgui -lopencv_videoio -lopencv_flann -lopencv_xobjdetect -lopencv_imgcodecs -lopencv_objdetect -lopencv_xphoto -lopencv_imgproc -lopencv_core" + export CGO_CPPFLAGS="-I/usr/local/Cellar/opencv/4.10.0/include" + export CGO_LDFLAGS="-L/usr/local/Cellar/opencv/4.10.0/lib -lopencv_stitching -lopencv_superres -lopencv_videostab -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dpm -lopencv_face -lopencv_photo -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_line_descriptor -lopencv_optflow -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_surface_matching -lopencv_tracking -lopencv_datasets -lopencv_dnn -lopencv_plot -lopencv_xfeatures2d -lopencv_shape -lopencv_video -lopencv_ml -lopencv_ximgproc -lopencv_calib3d -lopencv_features2d -lopencv_highgui -lopencv_videoio -lopencv_flann -lopencv_xobjdetect -lopencv_imgcodecs -lopencv_objdetect -lopencv_xphoto -lopencv_imgproc -lopencv_core" Please note that you will need to run these 3 lines of code one time in your current session in order to build or run the code, in order to setup the needed ENV variables. Once you have done so, you can execute code that uses GoCV with your custom environment like this: @@ -404,7 +404,7 @@ Please note that you will need to run these 3 lines of code one time in your cur The following assumes that you are running a 64-bit version of Windows 10. -In order to build and install OpenCV 4.9.0 on Windows, you must first download and install MinGW-W64 and CMake, as follows. +In order to build and install OpenCV 4.10.0 on Windows, you must first download and install MinGW-W64 and CMake, as follows. #### MinGW-W64 @@ -420,9 +420,9 @@ Add the `C:\Program Files\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bi Download and install CMake [https://cmake.org/download/](https://cmake.org/download/) to the default location. CMake installer will add CMake to your system path. -#### OpenCV 4.9.0 and OpenCV Contrib Modules +#### OpenCV 4.10.0 and OpenCV Contrib Modules -The following commands should do everything to download and install OpenCV 4.9.0 on Windows: +The following commands should do everything to download and install OpenCV 4.10.0 on Windows: chdir %GOPATH%\src\gocv.io\x\gocv win_build_opencv.cmd @@ -444,7 +444,7 @@ Now you should be able to build or run any of the command examples: The version program should output the following: gocv version: 0.36.1 - opencv lib version: 4.9.0 + opencv lib version: 4.10.0 That's it, now you are ready to use GoCV. @@ -458,7 +458,7 @@ For example: set CGO_CXXFLAGS="--std=c++11" set CGO_CPPFLAGS=-IC:\opencv\build\install\include - set CGO_LDFLAGS=-LC:\opencv\build\install\x64\mingw\lib -lopencv_core490 -lopencv_face490 -lopencv_videoio490 -lopencv_imgproc490 -lopencv_highgui490 -lopencv_imgcodecs490 -lopencv_objdetect490 -lopencv_features2d490 -lopencv_video490 -lopencv_dnn490 -lopencv_xfeatures2d490 -lopencv_plot490 -lopencv_tracking490 -lopencv_img_hash490 + set CGO_LDFLAGS=-LC:\opencv\build\install\x64\mingw\lib -lopencv_core410 -lopencv_face410 -lopencv_videoio410 -lopencv_imgproc410 -lopencv_highgui410 -lopencv_imgcodecs410 -lopencv_objdetect410 -lopencv_features2d410 -lopencv_video410 -lopencv_dnn410 -lopencv_xfeatures2d410 -lopencv_plot410 -lopencv_tracking410 -lopencv_img_hash410 Please note that you will need to run these 3 lines of code one time in your current session in order to build or run the code, in order to setup the needed ENV variables. Once you have done so, you can execute code that uses GoCV with your custom environment like this: @@ -467,7 +467,7 @@ Please note that you will need to run these 3 lines of code one time in your cur ## Android There is some work in progress for running GoCV on Android using Gomobile. For information on how to install OpenCV/GoCV for Android, please see: -https://gist.github.com/ogero/c19458cf64bd3e91faae85c3ac887490 +https://gist.github.com/ogero/c19458cf64bd3e91faae85c3ac887410 See original discussion here: https://github.com/hybridgroup/gocv/issues/235 diff --git a/cgo.go b/cgo.go index a3fda9e5..5629a096 100644 --- a/cgo.go +++ b/cgo.go @@ -9,6 +9,6 @@ package gocv #cgo !windows pkg-config: opencv4 #cgo CXXFLAGS: --std=c++11 #cgo windows CPPFLAGS: -IC:/opencv/build/install/include -#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core490 -lopencv_face490 -lopencv_videoio490 -lopencv_imgproc490 -lopencv_highgui490 -lopencv_imgcodecs490 -lopencv_objdetect490 -lopencv_features2d490 -lopencv_video490 -lopencv_dnn490 -lopencv_xfeatures2d490 -lopencv_plot490 -lopencv_tracking490 -lopencv_img_hash490 -lopencv_calib3d490 -lopencv_bgsegm490 -lopencv_photo490 -lopencv_aruco490 -lopencv_wechat_qrcode490 -lopencv_ximgproc490 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core410 -lopencv_face410 -lopencv_videoio410 -lopencv_imgproc410 -lopencv_highgui410 -lopencv_imgcodecs410 -lopencv_objdetect410 -lopencv_features2d410 -lopencv_video410 -lopencv_dnn410 -lopencv_xfeatures2d410 -lopencv_plot410 -lopencv_tracking410 -lopencv_img_hash410 -lopencv_calib3d410 -lopencv_bgsegm410 -lopencv_photo410 -lopencv_aruco410 -lopencv_wechat_qrcode410 -lopencv_ximgproc410 */ import "C" diff --git a/cgo_static.go b/cgo_static.go index 4fb33b69..f5e23f56 100644 --- a/cgo_static.go +++ b/cgo_static.go @@ -10,6 +10,6 @@ package gocv #cgo !windows CPPFLAGS: -I/usr/local/include -I/usr/local/include/opencv4 #cgo !windows LDFLAGS: -L/usr/local/lib -L/usr/local/lib/opencv4/3rdparty -lopencv_gapi -lopencv_stitching -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dpm -lopencv_face -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_line_descriptor -lopencv_quality -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_datasets -lopencv_text -lopencv_highgui -lopencv_dnn -lopencv_plot -lopencv_videostab -lopencv_video -lopencv_videoio -lopencv_xfeatures2d -lopencv_shape -lopencv_ml -lopencv_ximgproc -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_flann -lopencv_xphoto -lopencv_wechat_qrcode -lopencv_photo -lopencv_imgproc -lopencv_core -littnotify -llibprotobuf -lIlmImf -lquirc -lippiw -lippicv -lade -lz -ljpeg -ldl -lm -lpthread -lrt -lquadmath #cgo windows CPPFLAGS: -IC:/opencv/build/install/include -#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo490 -lopencv_tracking490 -lopencv_superres490 -lopencv_stitching490 -lopencv_optflow490 -lopencv_gapi490 -lopencv_face490 -lopencv_dpm490 -lopencv_dnn_objdetect490 -lopencv_ccalib490 -lopencv_bioinspired490 -lopencv_bgsegm490 -lopencv_aruco490 -lopencv_xobjdetect490 -lopencv_ximgproc490 -lopencv_xfeatures2d490 -lopencv_videostab490 -lopencv_video490 -lopencv_structured_light490 -lopencv_shape490 -lopencv_rgbd490 -lopencv_rapid490 -lopencv_objdetect490 -lopencv_mcc490 -lopencv_highgui490 -lopencv_datasets490 -lopencv_calib3d490 -lopencv_videoio490 -lopencv_text490 -lopencv_line_descriptor490 -lopencv_imgcodecs490 -lopencv_img_hash490 -lopencv_hfs490 -lopencv_fuzzy490 -lopencv_features2d490 -lopencv_dnn_superres490 -lopencv_dnn490 -lopencv_xphoto490 -lopencv_wechat_qrcode490 -lopencv_surface_matching490 -lopencv_reg490 -lopencv_quality490 -lopencv_plot490 -lopencv_photo490 -lopencv_phase_unwrapping490 -lopencv_ml490 -lopencv_intensity_transform490 -lopencv_imgproc490 -lopencv_flann490 -lopencv_core490 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo410 -lopencv_tracking410 -lopencv_superres410 -lopencv_stitching410 -lopencv_optflow410 -lopencv_gapi410 -lopencv_face410 -lopencv_dpm410 -lopencv_dnn_objdetect410 -lopencv_ccalib410 -lopencv_bioinspired410 -lopencv_bgsegm410 -lopencv_aruco410 -lopencv_xobjdetect410 -lopencv_ximgproc410 -lopencv_xfeatures2d410 -lopencv_videostab410 -lopencv_video410 -lopencv_structured_light410 -lopencv_shape410 -lopencv_rgbd410 -lopencv_rapid410 -lopencv_objdetect410 -lopencv_mcc410 -lopencv_highgui410 -lopencv_datasets410 -lopencv_calib3d410 -lopencv_videoio410 -lopencv_text410 -lopencv_line_descriptor410 -lopencv_imgcodecs410 -lopencv_img_hash410 -lopencv_hfs410 -lopencv_fuzzy410 -lopencv_features2d410 -lopencv_dnn_superres410 -lopencv_dnn410 -lopencv_xphoto410 -lopencv_wechat_qrcode410 -lopencv_surface_matching410 -lopencv_reg410 -lopencv_quality410 -lopencv_plot410 -lopencv_photo410 -lopencv_phase_unwrapping410 -lopencv_ml410 -lopencv_intensity_transform410 -lopencv_imgproc410 -lopencv_flann410 -lopencv_core410 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 */ import "C" diff --git a/contrib/cgo.go b/contrib/cgo.go index ca6cfdca..6e4215db 100644 --- a/contrib/cgo.go +++ b/contrib/cgo.go @@ -9,6 +9,6 @@ package contrib #cgo !windows pkg-config: opencv4 #cgo CXXFLAGS: --std=c++11 #cgo windows CPPFLAGS: -IC:/opencv/build/install/include -#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core490 -lopencv_face490 -lopencv_videoio490 -lopencv_imgproc490 -lopencv_highgui490 -lopencv_imgcodecs490 -lopencv_objdetect490 -lopencv_features2d490 -lopencv_video490 -lopencv_dnn490 -lopencv_xfeatures2d490 -lopencv_plot490 -lopencv_tracking490 -lopencv_img_hash490 -lopencv_calib3d490 -lopencv_bgsegm490 -lopencv_xphoto490 -lopencv_aruco490 -lopencv_wechat_qrcode490 -lopencv_ximgproc490 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core410 -lopencv_face410 -lopencv_videoio410 -lopencv_imgproc410 -lopencv_highgui410 -lopencv_imgcodecs410 -lopencv_objdetect410 -lopencv_features2d410 -lopencv_video410 -lopencv_dnn410 -lopencv_xfeatures2d410 -lopencv_plot410 -lopencv_tracking410 -lopencv_img_hash410 -lopencv_calib3d410 -lopencv_bgsegm410 -lopencv_xphoto410 -lopencv_aruco410 -lopencv_wechat_qrcode410 -lopencv_ximgproc410 */ import "C" diff --git a/contrib/cgo_static.go b/contrib/cgo_static.go index 26e8f03c..f45f38b6 100644 --- a/contrib/cgo_static.go +++ b/contrib/cgo_static.go @@ -10,6 +10,6 @@ package contrib #cgo !windows CPPFLAGS: -I/usr/local/include -I/usr/local/include/opencv4 #cgo !windows LDFLAGS: -L/usr/local/lib -L/usr/local/lib/opencv4/3rdparty -lopencv_gapi -lopencv_stitching -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dpm -lopencv_face -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_line_descriptor -lopencv_quality -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_datasets -lopencv_text -lopencv_highgui -lopencv_dnn -lopencv_plot -lopencv_videostab -lopencv_video -lopencv_videoio -lopencv_xfeatures2d -lopencv_shape -lopencv_ml -lopencv_ximgproc -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_flann -lopencv_xphoto -lopencv_wechat_qrcode -lopencv_photo -lopencv_imgproc -lopencv_core -littnotify -llibprotobuf -lIlmImf -lquirc -lippiw -lippicv -lade -lz -ljpeg -ldl -lm -lpthread -lrt -lquadmath #cgo windows CPPFLAGS: -IC:/opencv/build/install/include -#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo490 -lopencv_tracking490 -lopencv_superres490 -lopencv_stitching490 -lopencv_optflow490 -lopencv_gapi490 -lopencv_face490 -lopencv_dpm490 -lopencv_dnn_objdetect490 -lopencv_ccalib490 -lopencv_bioinspired490 -lopencv_bgsegm490 -lopencv_aruco490 -lopencv_xobjdetect490 -lopencv_ximgproc490 -lopencv_xfeatures2d490 -lopencv_videostab490 -lopencv_video490 -lopencv_structured_light490 -lopencv_shape490 -lopencv_rgbd490 -lopencv_rapid490 -lopencv_objdetect490 -lopencv_mcc490 -lopencv_highgui490 -lopencv_datasets490 -lopencv_calib3d490 -lopencv_videoio490 -lopencv_text490 -lopencv_line_descriptor490 -lopencv_imgcodecs490 -lopencv_img_hash490 -lopencv_hfs490 -lopencv_fuzzy490 -lopencv_features2d490 -lopencv_dnn_superres490 -lopencv_dnn490 -lopencv_xphoto490 -lopencv_wechat_qrcode490 -lopencv_surface_matching490 -lopencv_reg490 -lopencv_quality490 -lopencv_plot490 -lopencv_photo490 -lopencv_phase_unwrapping490 -lopencv_ml490 -lopencv_intensity_transform490 -lopencv_imgproc490 -lopencv_flann490 -lopencv_core490 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo410 -lopencv_tracking410 -lopencv_superres410 -lopencv_stitching410 -lopencv_optflow410 -lopencv_gapi410 -lopencv_face410 -lopencv_dpm410 -lopencv_dnn_objdetect410 -lopencv_ccalib410 -lopencv_bioinspired410 -lopencv_bgsegm410 -lopencv_aruco410 -lopencv_xobjdetect410 -lopencv_ximgproc410 -lopencv_xfeatures2d410 -lopencv_videostab410 -lopencv_video410 -lopencv_structured_light410 -lopencv_shape410 -lopencv_rgbd410 -lopencv_rapid410 -lopencv_objdetect410 -lopencv_mcc410 -lopencv_highgui410 -lopencv_datasets410 -lopencv_calib3d410 -lopencv_videoio410 -lopencv_text410 -lopencv_line_descriptor410 -lopencv_imgcodecs410 -lopencv_img_hash410 -lopencv_hfs410 -lopencv_fuzzy410 -lopencv_features2d410 -lopencv_dnn_superres410 -lopencv_dnn410 -lopencv_xphoto410 -lopencv_wechat_qrcode410 -lopencv_surface_matching410 -lopencv_reg410 -lopencv_quality410 -lopencv_plot410 -lopencv_photo410 -lopencv_phase_unwrapping410 -lopencv_ml410 -lopencv_intensity_transform410 -lopencv_imgproc410 -lopencv_flann410 -lopencv_core410 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 */ import "C" diff --git a/cuda/cgo.go b/cuda/cgo.go index 3e3e77bf..d4c553ee 100644 --- a/cuda/cgo.go +++ b/cuda/cgo.go @@ -9,6 +9,6 @@ package cuda #cgo !windows pkg-config: opencv4 #cgo CXXFLAGS: --std=c++11 #cgo windows CPPFLAGS: -IC:/opencv/build/install/include -#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core490 -lopencv_face490 -lopencv_videoio490 -lopencv_imgproc490 -lopencv_highgui490 -lopencv_imgcodecs490 -lopencv_objdetect490 -lopencv_features2d490 -lopencv_video490 -lopencv_dnn490 -lopencv_xfeatures2d490 -lopencv_plot490 -lopencv_tracking490 -lopencv_img_hash490 -lopencv_calib3d490 -lopencv_bgsegm490 -lopencv_aruco490 -lopencv_wechat_qrcode490 -lopencv_ximgproc490 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core410 -lopencv_face410 -lopencv_videoio410 -lopencv_imgproc410 -lopencv_highgui410 -lopencv_imgcodecs410 -lopencv_objdetect410 -lopencv_features2d410 -lopencv_video410 -lopencv_dnn410 -lopencv_xfeatures2d410 -lopencv_plot410 -lopencv_tracking410 -lopencv_img_hash410 -lopencv_calib3d410 -lopencv_bgsegm410 -lopencv_aruco410 -lopencv_wechat_qrcode410 -lopencv_ximgproc410 */ import "C" diff --git a/cuda/cgo_static.go b/cuda/cgo_static.go index 4fb33b69..f5e23f56 100644 --- a/cuda/cgo_static.go +++ b/cuda/cgo_static.go @@ -10,6 +10,6 @@ package gocv #cgo !windows CPPFLAGS: -I/usr/local/include -I/usr/local/include/opencv4 #cgo !windows LDFLAGS: -L/usr/local/lib -L/usr/local/lib/opencv4/3rdparty -lopencv_gapi -lopencv_stitching -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dpm -lopencv_face -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_line_descriptor -lopencv_quality -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_datasets -lopencv_text -lopencv_highgui -lopencv_dnn -lopencv_plot -lopencv_videostab -lopencv_video -lopencv_videoio -lopencv_xfeatures2d -lopencv_shape -lopencv_ml -lopencv_ximgproc -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_flann -lopencv_xphoto -lopencv_wechat_qrcode -lopencv_photo -lopencv_imgproc -lopencv_core -littnotify -llibprotobuf -lIlmImf -lquirc -lippiw -lippicv -lade -lz -ljpeg -ldl -lm -lpthread -lrt -lquadmath #cgo windows CPPFLAGS: -IC:/opencv/build/install/include -#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo490 -lopencv_tracking490 -lopencv_superres490 -lopencv_stitching490 -lopencv_optflow490 -lopencv_gapi490 -lopencv_face490 -lopencv_dpm490 -lopencv_dnn_objdetect490 -lopencv_ccalib490 -lopencv_bioinspired490 -lopencv_bgsegm490 -lopencv_aruco490 -lopencv_xobjdetect490 -lopencv_ximgproc490 -lopencv_xfeatures2d490 -lopencv_videostab490 -lopencv_video490 -lopencv_structured_light490 -lopencv_shape490 -lopencv_rgbd490 -lopencv_rapid490 -lopencv_objdetect490 -lopencv_mcc490 -lopencv_highgui490 -lopencv_datasets490 -lopencv_calib3d490 -lopencv_videoio490 -lopencv_text490 -lopencv_line_descriptor490 -lopencv_imgcodecs490 -lopencv_img_hash490 -lopencv_hfs490 -lopencv_fuzzy490 -lopencv_features2d490 -lopencv_dnn_superres490 -lopencv_dnn490 -lopencv_xphoto490 -lopencv_wechat_qrcode490 -lopencv_surface_matching490 -lopencv_reg490 -lopencv_quality490 -lopencv_plot490 -lopencv_photo490 -lopencv_phase_unwrapping490 -lopencv_ml490 -lopencv_intensity_transform490 -lopencv_imgproc490 -lopencv_flann490 -lopencv_core490 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo410 -lopencv_tracking410 -lopencv_superres410 -lopencv_stitching410 -lopencv_optflow410 -lopencv_gapi410 -lopencv_face410 -lopencv_dpm410 -lopencv_dnn_objdetect410 -lopencv_ccalib410 -lopencv_bioinspired410 -lopencv_bgsegm410 -lopencv_aruco410 -lopencv_xobjdetect410 -lopencv_ximgproc410 -lopencv_xfeatures2d410 -lopencv_videostab410 -lopencv_video410 -lopencv_structured_light410 -lopencv_shape410 -lopencv_rgbd410 -lopencv_rapid410 -lopencv_objdetect410 -lopencv_mcc410 -lopencv_highgui410 -lopencv_datasets410 -lopencv_calib3d410 -lopencv_videoio410 -lopencv_text410 -lopencv_line_descriptor410 -lopencv_imgcodecs410 -lopencv_img_hash410 -lopencv_hfs410 -lopencv_fuzzy410 -lopencv_features2d410 -lopencv_dnn_superres410 -lopencv_dnn410 -lopencv_xphoto410 -lopencv_wechat_qrcode410 -lopencv_surface_matching410 -lopencv_reg410 -lopencv_quality410 -lopencv_plot410 -lopencv_photo410 -lopencv_phase_unwrapping410 -lopencv_ml410 -lopencv_intensity_transform410 -lopencv_imgproc410 -lopencv_flann410 -lopencv_core410 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 */ import "C" diff --git a/win_build_opencv.cmd b/win_build_opencv.cmd index 2d129e70..34ed113f 100644 --- a/win_build_opencv.cmd +++ b/win_build_opencv.cmd @@ -11,18 +11,18 @@ echo. REM This is why there is no progress bar: REM https://github.com/PowerShell/PowerShell/issues/2138 -echo Downloading: opencv-4.9.0.zip [91MB] -powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://github.com/opencv/opencv/archive/4.9.0.zip -OutFile c:\opencv\opencv-4.9.0.zip" +echo Downloading: opencv-4.10.0.zip [91MB] +powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://github.com/opencv/opencv/archive/4.10.0.zip -OutFile c:\opencv\opencv-4.10.0.zip" echo Extracting... -powershell -command "$ProgressPreference = 'SilentlyContinue'; Expand-Archive -Path c:\opencv\opencv-4.9.0.zip -DestinationPath c:\opencv" -del c:\opencv\opencv-4.9.0.zip /q +powershell -command "$ProgressPreference = 'SilentlyContinue'; Expand-Archive -Path c:\opencv\opencv-4.10.0.zip -DestinationPath c:\opencv" +del c:\opencv\opencv-4.10.0.zip /q echo. -echo Downloading: opencv_contrib-4.9.0.zip [58MB] -powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://github.com/opencv/opencv_contrib/archive/4.9.0.zip -OutFile c:\opencv\opencv_contrib-4.9.0.zip" +echo Downloading: opencv_contrib-4.10.0.zip [58MB] +powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://github.com/opencv/opencv_contrib/archive/4.10.0.zip -OutFile c:\opencv\opencv_contrib-4.10.0.zip" echo Extracting... -powershell -command "$ProgressPreference = 'SilentlyContinue'; Expand-Archive -Path c:\opencv\opencv_contrib-4.9.0.zip -DestinationPath c:\opencv" -del c:\opencv\opencv_contrib-4.9.0.zip /q +powershell -command "$ProgressPreference = 'SilentlyContinue'; Expand-Archive -Path c:\opencv\opencv_contrib-4.10.0.zip -DestinationPath c:\opencv" +del c:\opencv\opencv_contrib-4.10.0.zip /q echo. echo Done with downloading and extracting sources. @@ -38,9 +38,9 @@ if [%1]==[static] ( ) else ( set enable_shared=ON ) -cmake C:\opencv\opencv-4.9.0 -G "MinGW Makefiles" -BC:\opencv\build -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH=C:\opencv\opencv_contrib-4.9.0\modules -DBUILD_SHARED_LIBS=%enable_shared% -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -Wno-dev +cmake C:\opencv\opencv-4.10.0 -G "MinGW Makefiles" -BC:\opencv\build -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH=C:\opencv\opencv_contrib-4.10.0\modules -DBUILD_SHARED_LIBS=%enable_shared% -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -Wno-dev mingw32-make -j%NUMBER_OF_PROCESSORS% mingw32-make install -rmdir c:\opencv\opencv-4.9.0 /s /q -rmdir c:\opencv\opencv_contrib-4.9.0 /s /q +rmdir c:\opencv\opencv-4.10.0 /s /q +rmdir c:\opencv\opencv_contrib-4.10.0 /s /q chdir /D %GOPATH%\src\gocv.io\x\gocv