From be25d727bf4f5c0b25e5846da1e3c8f7a3c010df Mon Sep 17 00:00:00 2001 From: deadprogram Date: Sat, 16 Dec 2017 11:43:50 +0100 Subject: [PATCH] Updates needed for release v0.7.0 Signed-off-by: deadprogram --- CHANGELOG.md | 24 ++++++++++++++++++++++++ README.md | 4 ++-- contrib/README.md | 14 +++++++++++++- version.go | 2 +- 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2f269e6..f6f66098 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,27 @@ +0.7.0 +--- +* **core** + * correct Merge implementation +* **docs** + * change wording and formatting for roadmap + * update roadmap for a more complete list of OpenCV functionality + * sequence docs in README in same way as the web site, aka by OS + * show in README that some work was done on contrib face module +* **face** + * LBPH facerecognizer bindings +* **highgui** + * complete implementation for remaining API functions +* **imgcodecs** + * add IMDecode function +* **imgproc** + * elaborate on HoughLines & HoughLinesP tests to fetch a few individual results +* **objdetect** + * add GroupRectangles function +* **xfeatures2d** + * add SIFT and SURF algorithms from OpenCV contrib + * improve description for OpenCV contrib + * run tests from OpenCV contrib + 0.6.0 --- * **core** diff --git a/README.md b/README.md index 690710e9..204f8c9a 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ Once you have this info, you can build or run the Go code that consumes it by po For example: export CGO_CPPFLAGS="-I/usr/local/include" - export CGO_LDFLAGS="-L/usr/local/lib -lopencv_core -lopencv_videoio -lopencv_imgproc -lopencv_highgui -lopencv_imgcodecs -lopencv_objdetect -lopencv_calib3d -lopencv_video" + export CGO_LDFLAGS="-L/usr/local/lib -lopencv_core -lopencv_videoio -lopencv_imgproc -lopencv_highgui -lopencv_imgcodecs -lopencv_objdetect -lopencv_calib3d -lopencv_video -lopencv_xfeatures2d -lopencv_face" Please note that you will need to run these 2 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. @@ -307,7 +307,7 @@ You should now have OpenCV 3.3 installed on your Windows 10 machine. Run these commands to configure Go to know about the include and lib directories: set CGO_CPPFLAGS=-IC:\opencv\build\install\include - set CGO_LDFLAGS=-LC:\opencv\build\install\x64\mingw\lib -lopencv_core331 -lopencv_videoio331 -lopencv_imgproc331 -lopencv_highgui331 -lopencv_imgcodecs331 -lopencv_objdetect331 -lopencv_calib3d331 -lopencv_video331 + set CGO_LDFLAGS=-LC:\opencv\build\install\x64\mingw\lib -lopencv_core331 -lopencv_videoio331 -lopencv_imgproc331 -lopencv_highgui331 -lopencv_imgcodecs331 -lopencv_objdetect331 -lopencv_calib3d331 -lopencv_video331 -lopencv_xfeatures2d331 -lopencv_face331 Now you should be able to build or run any of the command examples: diff --git a/contrib/README.md b/contrib/README.md index 2a4a0f5d..1961ec7f 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -12,6 +12,18 @@ https://github.com/opencv/opencv_contrib If you have followed the installation instructions from the main README, then the OpenCV contrib modules have already been compiled and installed. +First, you must include the `contrib` subpackage: + +```go +import ( + "gocv.io/x/gocv" + "gocv.io/x/gocv/contrib" +) +``` + +Then you will be able to use the functions within the `contrib` subpackage. For example, this uses the `SIFT` feature identitification algorithm that is within the `xfeatures2d` module of OpenCV: + ```go -// code example here... +si := contrib.NewSIFT() +kp := si.Detect(img) ``` diff --git a/version.go b/version.go index 87706f0a..37677b75 100644 --- a/version.go +++ b/version.go @@ -7,7 +7,7 @@ package gocv import "C" // GoCVVersion of this package, for display purposes. -const GoCVVersion = "0.6.0" +const GoCVVersion = "0.7.0" // Version returns the current golang package version func Version() string {