all: update needed CGO directives to OpenCV 4.9.0

Signed-off-by: deadprogram <[email protected]>

README.md

@@ -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_core481 -lopencv_face481 -lopencv_videoio481 -lopencv_imgproc481 -lopencv_highgui481 -lopencv_imgcodecs481 -lopencv_objdetect481 -lopencv_features2d481 -lopencv_video481 -lopencv_dnn481 -lopencv_xfeatures2d481 -lopencv_plot481 -lopencv_tracking481 -lopencv_img_hash481
+ 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
 
 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/c19458cf64bd3e91faae85c3ac887481
+https://gist.github.com/ogero/c19458cf64bd3e91faae85c3ac887490
 
 See original discussion here:
 https://github.com/hybridgroup/gocv/issues/235

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_core481 -lopencv_face481 -lopencv_videoio481 -lopencv_imgproc481 -lopencv_highgui481 -lopencv_imgcodecs481 -lopencv_objdetect481 -lopencv_features2d481 -lopencv_video481 -lopencv_dnn481 -lopencv_xfeatures2d481 -lopencv_plot481 -lopencv_tracking481 -lopencv_img_hash481 -lopencv_calib3d481 -lopencv_bgsegm481 -lopencv_photo481 -lopencv_aruco481 -lopencv_wechat_qrcode481 -lopencv_ximgproc481
+#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
 */
 import "C"

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_stereo481 -lopencv_tracking481 -lopencv_superres481 -lopencv_stitching481 -lopencv_optflow481 -lopencv_gapi481 -lopencv_face481 -lopencv_dpm481 -lopencv_dnn_objdetect481 -lopencv_ccalib481 -lopencv_bioinspired481 -lopencv_bgsegm481 -lopencv_aruco481 -lopencv_xobjdetect481 -lopencv_ximgproc481 -lopencv_xfeatures2d481 -lopencv_videostab481 -lopencv_video481 -lopencv_structured_light481 -lopencv_shape481 -lopencv_rgbd481 -lopencv_rapid481 -lopencv_objdetect481 -lopencv_mcc481 -lopencv_highgui481 -lopencv_datasets481 -lopencv_calib3d481 -lopencv_videoio481 -lopencv_text481 -lopencv_line_descriptor481 -lopencv_imgcodecs481 -lopencv_img_hash481 -lopencv_hfs481 -lopencv_fuzzy481 -lopencv_features2d481 -lopencv_dnn_superres481 -lopencv_dnn481 -lopencv_xphoto481 -lopencv_wechat_qrcode481 -lopencv_surface_matching481 -lopencv_reg481 -lopencv_quality481 -lopencv_plot481 -lopencv_photo481 -lopencv_phase_unwrapping481 -lopencv_ml481 -lopencv_intensity_transform481 -lopencv_imgproc481 -lopencv_flann481 -lopencv_core481 -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_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
 */
 import "C"

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_core481 -lopencv_face481 -lopencv_videoio481 -lopencv_imgproc481 -lopencv_highgui481 -lopencv_imgcodecs481 -lopencv_objdetect481 -lopencv_features2d481 -lopencv_video481 -lopencv_dnn481 -lopencv_xfeatures2d481 -lopencv_plot481 -lopencv_tracking481 -lopencv_img_hash481 -lopencv_calib3d481 -lopencv_bgsegm481 -lopencv_xphoto481 -lopencv_aruco481 -lopencv_wechat_qrcode481 -lopencv_ximgproc481
+#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
 */
 import "C"

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_stereo481 -lopencv_tracking481 -lopencv_superres481 -lopencv_stitching481 -lopencv_optflow481 -lopencv_gapi481 -lopencv_face481 -lopencv_dpm481 -lopencv_dnn_objdetect481 -lopencv_ccalib481 -lopencv_bioinspired481 -lopencv_bgsegm481 -lopencv_aruco481 -lopencv_xobjdetect481 -lopencv_ximgproc481 -lopencv_xfeatures2d481 -lopencv_videostab481 -lopencv_video481 -lopencv_structured_light481 -lopencv_shape481 -lopencv_rgbd481 -lopencv_rapid481 -lopencv_objdetect481 -lopencv_mcc481 -lopencv_highgui481 -lopencv_datasets481 -lopencv_calib3d481 -lopencv_videoio481 -lopencv_text481 -lopencv_line_descriptor481 -lopencv_imgcodecs481 -lopencv_img_hash481 -lopencv_hfs481 -lopencv_fuzzy481 -lopencv_features2d481 -lopencv_dnn_superres481 -lopencv_dnn481 -lopencv_xphoto481 -lopencv_wechat_qrcode481 -lopencv_surface_matching481 -lopencv_reg481 -lopencv_quality481 -lopencv_plot481 -lopencv_photo481 -lopencv_phase_unwrapping481 -lopencv_ml481 -lopencv_intensity_transform481 -lopencv_imgproc481 -lopencv_flann481 -lopencv_core481 -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_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
 */
 import "C"

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_core481 -lopencv_face481 -lopencv_videoio481 -lopencv_imgproc481 -lopencv_highgui481 -lopencv_imgcodecs481 -lopencv_objdetect481 -lopencv_features2d481 -lopencv_video481 -lopencv_dnn481 -lopencv_xfeatures2d481 -lopencv_plot481 -lopencv_tracking481 -lopencv_img_hash481 -lopencv_calib3d481 -lopencv_bgsegm481 -lopencv_aruco481 -lopencv_wechat_qrcode481 -lopencv_ximgproc481
+#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
 */
 import "C"

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_stereo481 -lopencv_tracking481 -lopencv_superres481 -lopencv_stitching481 -lopencv_optflow481 -lopencv_gapi481 -lopencv_face481 -lopencv_dpm481 -lopencv_dnn_objdetect481 -lopencv_ccalib481 -lopencv_bioinspired481 -lopencv_bgsegm481 -lopencv_aruco481 -lopencv_xobjdetect481 -lopencv_ximgproc481 -lopencv_xfeatures2d481 -lopencv_videostab481 -lopencv_video481 -lopencv_structured_light481 -lopencv_shape481 -lopencv_rgbd481 -lopencv_rapid481 -lopencv_objdetect481 -lopencv_mcc481 -lopencv_highgui481 -lopencv_datasets481 -lopencv_calib3d481 -lopencv_videoio481 -lopencv_text481 -lopencv_line_descriptor481 -lopencv_imgcodecs481 -lopencv_img_hash481 -lopencv_hfs481 -lopencv_fuzzy481 -lopencv_features2d481 -lopencv_dnn_superres481 -lopencv_dnn481 -lopencv_xphoto481 -lopencv_wechat_qrcode481 -lopencv_surface_matching481 -lopencv_reg481 -lopencv_quality481 -lopencv_plot481 -lopencv_photo481 -lopencv_phase_unwrapping481 -lopencv_ml481 -lopencv_intensity_transform481 -lopencv_imgproc481 -lopencv_flann481 -lopencv_core481 -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_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
 */
 import "C"