From 903f4adf262f6a36c3bdfac7a1d7f3a38374503c Mon Sep 17 00:00:00 2001 From: diegohce Date: Tue, 21 Jan 2025 15:32:08 -0300 Subject: [PATCH 1/4] new: signal contrib module --- .github/workflows/windows.yml | 2 +- ROADMAP.md | 2 +- cgo.go | 2 +- contrib/cgo.go | 2 +- contrib/signal.cpp | 6 ++++++ contrib/signal.go | 32 ++++++++++++++++++++++++++++++++ contrib/signal.h | 18 ++++++++++++++++++ contrib/signal_test.go | 23 +++++++++++++++++++++++ cuda/cgo.go | 2 +- 9 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 contrib/signal.cpp create mode 100644 contrib/signal.go create mode 100644 contrib/signal.h create mode 100644 contrib/signal_test.go diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 40a8fd2d..8c83770f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -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_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_photo4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 -lopencv_xphoto4110 -lopencv_xobjdetect4110" >> $env:GITHUB_ENV + echo "CGO_LDFLAGS=-L${env:GITHUB_WORKSPACE}\opencv\build\install\x64\mingw\lib -lopencv_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_photo4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 -lopencv_xphoto4110 -lopencv_xobjdetect4110 -lopencv_signal4110" >> $env:GITHUB_ENV echo "${env:GITHUB_WORKSPACE}/opencv/build/install/x64/mingw/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Install Tensorflow test model run: | diff --git a/ROADMAP.md b/ROADMAP.md index 0f6022ee..75addd2a 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -338,7 +338,7 @@ Your pull requests will be greatly appreciated! - [ ] saliency. Saliency API - [ ] sfm. Structure From Motion - [ ] shape. Shape Distance and Matching -- [ ] signal. Signal Processing +- [X] signal. Signal Processing - [ ] stereo. Stereo Correspondance Algorithms - [ ] structured_light. Structured Light API - [ ] superres. Super Resolution diff --git a/cgo.go b/cgo.go index 53324b5e..67c8dcd1 100644 --- a/cgo.go +++ b/cgo.go @@ -8,6 +8,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_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_photo4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_photo4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 -lopencv_signal4110 */ import "C" diff --git a/contrib/cgo.go b/contrib/cgo.go index 85051e50..a724f256 100644 --- a/contrib/cgo.go +++ b/contrib/cgo.go @@ -8,6 +8,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_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_xphoto4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 -lopencv_xobjdetect4110 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_xphoto4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 -lopencv_xobjdetect4110 -lopencv_signal4110 */ import "C" diff --git a/contrib/signal.cpp b/contrib/signal.cpp new file mode 100644 index 00000000..67d85b17 --- /dev/null +++ b/contrib/signal.cpp @@ -0,0 +1,6 @@ +#include "signal.h" + +void Signal_ResampleSignal(Mat inputSignal, Mat outSignal, int inFreq, int outFreq) { + cv::signal::resampleSignal(*inputSignal, *outSignal, inFreq, outFreq); +} + diff --git a/contrib/signal.go b/contrib/signal.go new file mode 100644 index 00000000..62a1e38e --- /dev/null +++ b/contrib/signal.go @@ -0,0 +1,32 @@ +package contrib + +/* +#include +#include "signal.h" +*/ +import "C" +import "gocv.io/x/gocv" + +// ResampleSignal Signal resampling. +// +// Parameters: +// +// inputSignal: gocv.Mat with input signal. +// +// inFreq: Input signal frequency. +// +// outFreq: Output signal frequency. Signal resampling implemented a cubic interpolation function +// and a filtering function based on Kaiser window and Bessel function, used to construct a FIR filter. +// Result is similar to scipy.signal.resample. +// +// Returns a gocv.Mat with output signal. +// +// For further details, please see: +// https://docs.opencv.org/4.11.0/d2/d1f/group__signal.html#gad32480ac5c9832126cf0c6bde026686d +func ResampleSignal(inputSignal gocv.Mat, inFreq int, outFreq int) gocv.Mat { + out := gocv.NewMat() + + C.Signal_ResampleSignal(C.Mat(inputSignal.Ptr()), C.Mat(out.Ptr()), C.int(inFreq), C.int(outFreq)) + + return out +} diff --git a/contrib/signal.h b/contrib/signal.h new file mode 100644 index 00000000..7138db62 --- /dev/null +++ b/contrib/signal.h @@ -0,0 +1,18 @@ +#ifndef _OPENCV3_CONTRIB_SIGNAL_H_ +#define _OPENCV3_CONTRIB_SIGNAL_H_ + +#ifdef __cplusplus +#include +#include +extern "C" { +#endif + +#include "../core.h" + +void Signal_ResampleSignal(Mat inputSignal, Mat outSignal, int inFreq, int outFreq); + +#ifdef __cplusplus +} +#endif + +#endif //_OPENCV3_CONTRIB_SIGNAL_H_ diff --git a/contrib/signal_test.go b/contrib/signal_test.go new file mode 100644 index 00000000..ddebbd8c --- /dev/null +++ b/contrib/signal_test.go @@ -0,0 +1,23 @@ +package contrib + +import ( + "testing" + + "gocv.io/x/gocv" +) + +func TestResampleSignal(t *testing.T) { + + img := gocv.IMRead("../images/face.jpg", gocv.IMReadAnyColor) + if img.Empty() { + t.Error("xobjdetect: cannot read image") + } + + resampledMat := ResampleSignal(img, 1000, 1000) + defer resampledMat.Close() + + if resampledMat.Empty() { + t.Error("contrib.signal.ResampleSignal: empty output") + } + +} diff --git a/cuda/cgo.go b/cuda/cgo.go index 236be33c..0659d24f 100644 --- a/cuda/cgo.go +++ b/cuda/cgo.go @@ -8,6 +8,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_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 -lopencv_xobjdetect4110 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 -lopencv_xobjdetect4110 -lopencv_signal4110 */ import "C" From a7b7eed26d4ac75cd6fab5975a90d49289ca5ae7 Mon Sep 17 00:00:00 2001 From: diegohce Date: Tue, 21 Jan 2025 15:47:34 -0300 Subject: [PATCH 2/4] added missing windows linker libs --- cgo_static_windows.go | 2 +- contrib/cgo_static_windows.go | 2 +- cuda/cgo_static_windows.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cgo_static_windows.go b/cgo_static_windows.go index 69263af8..1a5344c4 100644 --- a/cgo_static_windows.go +++ b/cgo_static_windows.go @@ -7,6 +7,6 @@ package gocv /* #cgo CXXFLAGS: --std=c++11 #cgo CPPFLAGS: -IC:/opencv/build/install/include -#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo4110 -lopencv_tracking4110 -lopencv_superres4110 -lopencv_stitching4110 -lopencv_optflow4110 -lopencv_gapi4110 -lopencv_face4110 -lopencv_dpm4110 -lopencv_dnn_objdetect4110 -lopencv_ccalib4110 -lopencv_bioinspired4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_xobjdetect4110 -lopencv_ximgproc4110 -lopencv_xfeatures2d4110 -lopencv_videostab4110 -lopencv_video4110 -lopencv_structured_light4110 -lopencv_shape4110 -lopencv_rgbd4110 -lopencv_rapid4110 -lopencv_objdetect4110 -lopencv_mcc4110 -lopencv_highgui4110 -lopencv_datasets4110 -lopencv_calib3d4110 -lopencv_videoio4110 -lopencv_text4110 -lopencv_line_descriptor4110 -lopencv_imgcodecs4110 -lopencv_img_hash4110 -lopencv_hfs4110 -lopencv_fuzzy4110 -lopencv_features2d4110 -lopencv_dnn_superres4110 -lopencv_dnn4110 -lopencv_xphoto4110 -lopencv_wechat_qrcode4110 -lopencv_surface_matching4110 -lopencv_reg4110 -lopencv_quality4110 -lopencv_plot4110 -lopencv_photo4110 -lopencv_phase_unwrapping4110 -lopencv_ml4110 -lopencv_intensity_transform4110 -lopencv_imgproc4110 -lopencv_flann4110 -lopencv_core4110 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 +#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_signal4110 -lopencv_stereo4110 -lopencv_tracking4110 -lopencv_superres4110 -lopencv_stitching4110 -lopencv_optflow4110 -lopencv_gapi4110 -lopencv_face4110 -lopencv_dpm4110 -lopencv_dnn_objdetect4110 -lopencv_ccalib4110 -lopencv_bioinspired4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_xobjdetect4110 -lopencv_ximgproc4110 -lopencv_xfeatures2d4110 -lopencv_videostab4110 -lopencv_video4110 -lopencv_structured_light4110 -lopencv_shape4110 -lopencv_rgbd4110 -lopencv_rapid4110 -lopencv_objdetect4110 -lopencv_mcc4110 -lopencv_highgui4110 -lopencv_datasets4110 -lopencv_calib3d4110 -lopencv_videoio4110 -lopencv_text4110 -lopencv_line_descriptor4110 -lopencv_imgcodecs4110 -lopencv_img_hash4110 -lopencv_hfs4110 -lopencv_fuzzy4110 -lopencv_features2d4110 -lopencv_dnn_superres4110 -lopencv_dnn4110 -lopencv_xphoto4110 -lopencv_wechat_qrcode4110 -lopencv_surface_matching4110 -lopencv_reg4110 -lopencv_quality4110 -lopencv_plot4110 -lopencv_photo4110 -lopencv_phase_unwrapping4110 -lopencv_ml4110 -lopencv_intensity_transform4110 -lopencv_imgproc4110 -lopencv_flann4110 -lopencv_core4110 -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_static_windows.go b/contrib/cgo_static_windows.go index 69263af8..1a5344c4 100644 --- a/contrib/cgo_static_windows.go +++ b/contrib/cgo_static_windows.go @@ -7,6 +7,6 @@ package gocv /* #cgo CXXFLAGS: --std=c++11 #cgo CPPFLAGS: -IC:/opencv/build/install/include -#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo4110 -lopencv_tracking4110 -lopencv_superres4110 -lopencv_stitching4110 -lopencv_optflow4110 -lopencv_gapi4110 -lopencv_face4110 -lopencv_dpm4110 -lopencv_dnn_objdetect4110 -lopencv_ccalib4110 -lopencv_bioinspired4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_xobjdetect4110 -lopencv_ximgproc4110 -lopencv_xfeatures2d4110 -lopencv_videostab4110 -lopencv_video4110 -lopencv_structured_light4110 -lopencv_shape4110 -lopencv_rgbd4110 -lopencv_rapid4110 -lopencv_objdetect4110 -lopencv_mcc4110 -lopencv_highgui4110 -lopencv_datasets4110 -lopencv_calib3d4110 -lopencv_videoio4110 -lopencv_text4110 -lopencv_line_descriptor4110 -lopencv_imgcodecs4110 -lopencv_img_hash4110 -lopencv_hfs4110 -lopencv_fuzzy4110 -lopencv_features2d4110 -lopencv_dnn_superres4110 -lopencv_dnn4110 -lopencv_xphoto4110 -lopencv_wechat_qrcode4110 -lopencv_surface_matching4110 -lopencv_reg4110 -lopencv_quality4110 -lopencv_plot4110 -lopencv_photo4110 -lopencv_phase_unwrapping4110 -lopencv_ml4110 -lopencv_intensity_transform4110 -lopencv_imgproc4110 -lopencv_flann4110 -lopencv_core4110 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 +#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_signal4110 -lopencv_stereo4110 -lopencv_tracking4110 -lopencv_superres4110 -lopencv_stitching4110 -lopencv_optflow4110 -lopencv_gapi4110 -lopencv_face4110 -lopencv_dpm4110 -lopencv_dnn_objdetect4110 -lopencv_ccalib4110 -lopencv_bioinspired4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_xobjdetect4110 -lopencv_ximgproc4110 -lopencv_xfeatures2d4110 -lopencv_videostab4110 -lopencv_video4110 -lopencv_structured_light4110 -lopencv_shape4110 -lopencv_rgbd4110 -lopencv_rapid4110 -lopencv_objdetect4110 -lopencv_mcc4110 -lopencv_highgui4110 -lopencv_datasets4110 -lopencv_calib3d4110 -lopencv_videoio4110 -lopencv_text4110 -lopencv_line_descriptor4110 -lopencv_imgcodecs4110 -lopencv_img_hash4110 -lopencv_hfs4110 -lopencv_fuzzy4110 -lopencv_features2d4110 -lopencv_dnn_superres4110 -lopencv_dnn4110 -lopencv_xphoto4110 -lopencv_wechat_qrcode4110 -lopencv_surface_matching4110 -lopencv_reg4110 -lopencv_quality4110 -lopencv_plot4110 -lopencv_photo4110 -lopencv_phase_unwrapping4110 -lopencv_ml4110 -lopencv_intensity_transform4110 -lopencv_imgproc4110 -lopencv_flann4110 -lopencv_core4110 -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_static_windows.go b/cuda/cgo_static_windows.go index 69263af8..1a5344c4 100644 --- a/cuda/cgo_static_windows.go +++ b/cuda/cgo_static_windows.go @@ -7,6 +7,6 @@ package gocv /* #cgo CXXFLAGS: --std=c++11 #cgo CPPFLAGS: -IC:/opencv/build/install/include -#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo4110 -lopencv_tracking4110 -lopencv_superres4110 -lopencv_stitching4110 -lopencv_optflow4110 -lopencv_gapi4110 -lopencv_face4110 -lopencv_dpm4110 -lopencv_dnn_objdetect4110 -lopencv_ccalib4110 -lopencv_bioinspired4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_xobjdetect4110 -lopencv_ximgproc4110 -lopencv_xfeatures2d4110 -lopencv_videostab4110 -lopencv_video4110 -lopencv_structured_light4110 -lopencv_shape4110 -lopencv_rgbd4110 -lopencv_rapid4110 -lopencv_objdetect4110 -lopencv_mcc4110 -lopencv_highgui4110 -lopencv_datasets4110 -lopencv_calib3d4110 -lopencv_videoio4110 -lopencv_text4110 -lopencv_line_descriptor4110 -lopencv_imgcodecs4110 -lopencv_img_hash4110 -lopencv_hfs4110 -lopencv_fuzzy4110 -lopencv_features2d4110 -lopencv_dnn_superres4110 -lopencv_dnn4110 -lopencv_xphoto4110 -lopencv_wechat_qrcode4110 -lopencv_surface_matching4110 -lopencv_reg4110 -lopencv_quality4110 -lopencv_plot4110 -lopencv_photo4110 -lopencv_phase_unwrapping4110 -lopencv_ml4110 -lopencv_intensity_transform4110 -lopencv_imgproc4110 -lopencv_flann4110 -lopencv_core4110 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 +#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_signal4110 -lopencv_stereo4110 -lopencv_tracking4110 -lopencv_superres4110 -lopencv_stitching4110 -lopencv_optflow4110 -lopencv_gapi4110 -lopencv_face4110 -lopencv_dpm4110 -lopencv_dnn_objdetect4110 -lopencv_ccalib4110 -lopencv_bioinspired4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_xobjdetect4110 -lopencv_ximgproc4110 -lopencv_xfeatures2d4110 -lopencv_videostab4110 -lopencv_video4110 -lopencv_structured_light4110 -lopencv_shape4110 -lopencv_rgbd4110 -lopencv_rapid4110 -lopencv_objdetect4110 -lopencv_mcc4110 -lopencv_highgui4110 -lopencv_datasets4110 -lopencv_calib3d4110 -lopencv_videoio4110 -lopencv_text4110 -lopencv_line_descriptor4110 -lopencv_imgcodecs4110 -lopencv_img_hash4110 -lopencv_hfs4110 -lopencv_fuzzy4110 -lopencv_features2d4110 -lopencv_dnn_superres4110 -lopencv_dnn4110 -lopencv_xphoto4110 -lopencv_wechat_qrcode4110 -lopencv_surface_matching4110 -lopencv_reg4110 -lopencv_quality4110 -lopencv_plot4110 -lopencv_photo4110 -lopencv_phase_unwrapping4110 -lopencv_ml4110 -lopencv_intensity_transform4110 -lopencv_imgproc4110 -lopencv_flann4110 -lopencv_core4110 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 */ import "C" From 9978713e64e1c753b27e5ee24e0150579a32aedf Mon Sep 17 00:00:00 2001 From: diegohce Date: Wed, 22 Jan 2025 10:43:19 -0300 Subject: [PATCH 3/4] windows workflow: list libs --- .github/workflows/windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8c83770f..9ece09b9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -75,6 +75,9 @@ jobs: key: ${{ steps.cache-opencv-build.outputs.cache-primary-key }} path: | ./opencv/build + - name: List OpenCV Libraries + run: | + dir ${env:GITHUB_WORKSPACE}\opencv\build\install\x64\mingw\lib - name: Set GoCV env run: | go env From ce91d87c7c7345614ae9397d583a763c4587fdde Mon Sep 17 00:00:00 2001 From: diegohce Date: Wed, 22 Jan 2025 11:06:16 -0300 Subject: [PATCH 4/4] changed: signal.hpp include --- contrib/signal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/signal.h b/contrib/signal.h index 7138db62..4cddad1f 100644 --- a/contrib/signal.h +++ b/contrib/signal.h @@ -3,7 +3,7 @@ #ifdef __cplusplus #include -#include +#include extern "C" { #endif