potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #7885 from alalek:release-3.2.0-rc

Browse Source
This commit is contained in:
Alexander Alekhin
2016-12-19 17:59:14 +00:00
parent ece08374a1 d85c11e525
commit a4db9833f7
7 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/version.hpp
+2 -2
View File
@@ -51,9 +51,9 @@
#define OPENCV_VERSION_HPP
#define CV_VERSION_MAJOR 3
#define CV_VERSION_MINOR 1
#define CV_VERSION_MINOR 2
#define CV_VERSION_REVISION 0
#define CV_VERSION_STATUS "-dev"
#define CV_VERSION_STATUS "-rc"
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
modules/java/generator/src/java/android+OpenCVLoader.java
+14
View File
@@ -57,6 +57,16 @@ public class OpenCVLoader
*/
public static final String OPENCV_VERSION_2_4_11 = "2.4.11";
/**
* OpenCV Library version 2.4.12.
*/
public static final String OPENCV_VERSION_2_4_12 = "2.4.12";
/**
* OpenCV Library version 2.4.13.
*/
public static final String OPENCV_VERSION_2_4_13 = "2.4.13";
/**
* OpenCV Library version 3.0.0.
*/
@@ -67,6 +77,10 @@ public class OpenCVLoader
*/
public static final String OPENCV_VERSION_3_1_0 = "3.1.0";
/**
* OpenCV Library version 3.2.0.
*/
public static final String OPENCV_VERSION_3_2_0 = "3.2.0";
/**
* Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").