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

Merge pull request #1734 from asmorkalov:android_manager_version_inc

Browse Source
This commit is contained in:
Roman Donchenko
2013-11-01 16:39:43 +04:00
committed by OpenCV Buildbot
parent 6c21b85fce f027cf80f7
commit 9d263db8aa
7 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/version.hpp
+2 -2
View File
@@ -49,8 +49,8 @@
#define CV_VERSION_EPOCH 2
#define CV_VERSION_MAJOR 4
#define CV_VERSION_MINOR 6
#define CV_VERSION_REVISION 2
#define CV_VERSION_MINOR 7
#define CV_VERSION_REVISION 0
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
modules/java/generator/src/java/android+OpenCVLoader.java
+5
View File
@@ -32,6 +32,11 @@ public class OpenCVLoader
*/
public static final String OPENCV_VERSION_2_4_6 = "2.4.6";
/**
* OpenCV Library version 2.4.7.
*/
public static final String OPENCV_VERSION_2_4_7 = "2.4.7";
/**
* Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").