generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3726 from asmorkalov:ocv_version_inc4

Browse Source
This commit is contained in:
Andrey Pavlenko
2015-02-20 16:11:58 +00:00
parent a46166d30f 96e5300fdd
commit c059f7ddcd
7 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/version.hpp
View File

@@ -49,7 +49,7 @@
#define CV_VERSION_EPOCH 2
#define CV_VERSION_MAJOR 4
#define CV_VERSION_MINOR 10
#define CV_VERSION_MINOR 11
#define CV_VERSION_REVISION 0
#define CVAUX_STR_EXP(__A) #__A

4
modules/java/generator/src/java/android+OpenCVLoader.java
View File

@@ -52,6 +52,10 @@ public class OpenCVLoader
*/
public static final String OPENCV_VERSION_2_4_10 = "2.4.10";
/**
* OpenCV Library version 2.4.11.
*/
public static final String OPENCV_VERSION_2_4_11 = "2.4.11";
/**
* Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").