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

Merge tag '3.1.0'

Browse Source 
OpenCV 3.1.0
This commit is contained in:
Alexander Alekhin
2015-12-21 14:24:46 +03:00
parent b4432c4fd7 92387b1ef8
commit 4cfe2b4dea
7 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@
#define __OPENCV_VERSION_HPP__
#define CV_VERSION_MAJOR 3
#define CV_VERSION_MINOR 0
#define CV_VERSION_MINOR 1
#define CV_VERSION_REVISION 0
#define CV_VERSION_STATUS "-dev"

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

@@ -62,6 +62,11 @@ public class OpenCVLoader
*/
public static final String OPENCV_VERSION_3_0_0 = "3.0.0";
/**
* OpenCV Library version 3.1.0.
*/
public static final String OPENCV_VERSION_3_1_0 = "3.1.0";
/**
* Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").