Skip to content

Commit 6ffc487

Browse files
committed
OpenCV version++
OpenCV 3.4.1
1 parent 4a74408 commit 6ffc487

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

doc/tutorials/dnn/dnn_android/dnn_android.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Tutorial was written for the following versions of corresponding software:
1212

1313
- Download and install Android Studio from https://developer.android.com/studio.
1414

15-
- Get the latest pre-built OpenCV for Android release from https://github.com/opencv/opencv/releases and unpack it (for example, `opencv-3.4.0-android-sdk.zip`).
15+
- Get the latest pre-built OpenCV for Android release from https://github.com/opencv/opencv/releases and unpack it (for example, `opencv-3.4.1-android-sdk.zip`).
1616

1717
- Download MobileNet object detection model from https://github.com/chuanqi305/MobileNet-SSD. We need a configuration file `MobileNetSSD_deploy.prototxt` and weights `MobileNetSSD_deploy.caffemodel`.
1818

doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ Open your Doxyfile using your favorite text editor and search for the key
3636
`TAGFILES`. Change it as follows:
3737

3838
@code
39-
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.3.0
39+
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.1
4040
@endcode
4141

4242
If you had other definitions already, you can append the line using a `\`:
4343

4444
@code
4545
TAGFILES = ./docs/doxygen-tags/libstdc++.tag=https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen \
46-
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.0
46+
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.1
4747
@endcode
4848

4949
Doxygen can now use the information from the tag file to link to the OpenCV

modules/core/include/opencv2/core/version.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
#define CV_VERSION_MAJOR 3
99
#define CV_VERSION_MINOR 4
10-
#define CV_VERSION_REVISION 0
11-
#define CV_VERSION_STATUS "-dev"
10+
#define CV_VERSION_REVISION 1
11+
#define CV_VERSION_STATUS ""
1212

1313
#define CVAUX_STR_EXP(__A) #__A
1414
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)

platforms/android/build_sdk.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def build_engine(self, abi, engdest):
208208
# Add extra data
209209
apkxmldest = check_dir(os.path.join(apkdest, "res", "xml"), create=True)
210210
apklibdest = check_dir(os.path.join(apkdest, "libs", abi.name), create=True)
211-
for ver, d in self.extra_packs + [("3.4.0", os.path.join(self.libdest, "lib"))]:
211+
for ver, d in self.extra_packs + [("3.4.1", os.path.join(self.libdest, "lib"))]:
212212
r = ET.Element("library", attrib={"version": ver})
213213
log.info("Adding libraries from %s", d)
214214

platforms/android/service/engine/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="org.opencv.engine"
4-
android:versionCode="340@ANDROID_PLATFORM_ID@"
5-
android:versionName="3.40">
4+
android:versionCode="341@ANDROID_PLATFORM_ID@"
5+
android:versionName="3.41">
66

77
<uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" android:targetSdkVersion="22"/>
88
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>

platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public String getLibPathByVersion(String version)
137137

138138
@Override
139139
public int getEngineVersion() throws RemoteException {
140-
int version = 3400;
140+
int version = 3410;
141141
try {
142142
version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
143143
} catch (NameNotFoundException e) {

platforms/android/service/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ manually using adb tool:
1212

1313
adb install <path-to-OpenCV-sdk>/apk/OpenCV_<version>_Manager_<app_version>_<platform>.apk
1414

15-
Example: OpenCV_3.4.0-dev_Manager_3.40_armeabi-v7a.apk
15+
Example: OpenCV_3.4.1-dev_Manager_3.41_armeabi-v7a.apk
1616

1717
Use the list of platforms below to determine proper OpenCV Manager package for your device:
1818

platforms/maven/opencv-it/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.opencv</groupId>
66
<artifactId>opencv-parent</artifactId>
7-
<version>3.4.0</version>
7+
<version>3.4.1</version>
88
</parent>
99
<groupId>org.opencv</groupId>
1010
<artifactId>opencv-it</artifactId>

platforms/maven/opencv/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.opencv</groupId>
66
<artifactId>opencv-parent</artifactId>
7-
<version>3.4.0</version>
7+
<version>3.4.1</version>
88
</parent>
99
<groupId>org.opencv</groupId>
1010
<artifactId>opencv</artifactId>

platforms/maven/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.opencv</groupId>
55
<artifactId>opencv-parent</artifactId>
6-
<version>3.4.0</version>
6+
<version>3.4.1</version>
77
<packaging>pom</packaging>
88
<name>OpenCV Parent POM</name>
99
<licenses>

0 commit comments

Comments
 (0)