Update openCVLibrary to 3.4.1

leadrien · May 17, 2018 · 6d496e5 · 6d496e5
1 parent 0d62de4
commit 6d496e5
Show file tree

Hide file tree

Showing 141 changed files with 17,541 additions and 6,322 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -37,5 +37,5 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation project(':openCVLibrary300')
+    implementation project(':openCVLibrary')
 }
diff --git a/openCVLibrary300/build.gradle → openCVLibrary/build.gradle b/openCVLibrary300/build.gradle → openCVLibrary/build.gradle
diff --git a/openCVLibrary300/lint.xml → openCVLibrary/lint.xml b/openCVLibrary300/lint.xml → openCVLibrary/lint.xml
diff --git a/...CVLibrary300/src/main/AndroidManifest.xml → openCVLibrary/src/main/AndroidManifest.xml b/...CVLibrary300/src/main/AndroidManifest.xml → openCVLibrary/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.opencv"
-      android:versionCode="3000"
-      android:versionName="3.0.0">
+      android:versionCode="3410"
+      android:versionName="3.4.1">
 
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="21" />
 </manifest>
diff --git a/.../opencv/engine/OpenCVEngineInterface.aidl → .../opencv/engine/OpenCVEngineInterface.aidl b/.../opencv/engine/OpenCVEngineInterface.aidl → .../opencv/engine/OpenCVEngineInterface.aidl
diff --git a/...rg/opencv/android/AsyncServiceHelper.java → ...rg/opencv/android/AsyncServiceHelper.java b/...rg/opencv/android/AsyncServiceHelper.java → ...rg/opencv/android/AsyncServiceHelper.java
@@ -110,7 +110,7 @@ public void cancel()
 
                 public void wait_install()
                 {
-                    Log.e(TAG, "Instalation was not started! Nothing to wait!");
+                    Log.e(TAG, "Installation was not started! Nothing to wait!");
                 }
             };
 
@@ -131,7 +131,7 @@ public void install()
                 }
                 public void cancel()
                 {
-                    Log.d(TAG, "Wating for OpenCV canceled by user");
+                    Log.d(TAG, "Waiting for OpenCV canceled by user");
                     mServiceInstallationProgress = false;
                     int Status = LoaderCallbackInterface.INSTALL_CANCELED;
                     Log.d(TAG, "Init finished with status " + Status);
@@ -197,7 +197,7 @@ public void install() {
                                         if (mEngineService.installVersion(mOpenCVersion))
                                         {
                                             mLibraryInstallationProgress = true;
-                                            Log.d(TAG, "Package installation statred");
+                                            Log.d(TAG, "Package installation started");
                                             Log.d(TAG, "Unbind from service");
                                             mAppContext.unbindService(mServiceConnection);
                                         }
@@ -228,7 +228,7 @@ public void cancel() {
                                     mUserAppCallback.onManagerConnected(LoaderCallbackInterface.INSTALL_CANCELED);
                                 }
                                 public void wait_install() {
-                                    Log.e(TAG, "Instalation was not started! Nothing to wait!");
+                                    Log.e(TAG, "Installation was not started! Nothing to wait!");
                                 }
                             };
 
@@ -351,7 +351,7 @@ private boolean loadLibrary(String AbsPath)
         {
             Log.d(TAG, "Cannot load library \"" + AbsPath + "\"");
             e.printStackTrace();
-            result &= false;
+            result = false;
         }
 
         return result;
@@ -377,7 +377,7 @@ private boolean initOpenCVLibs(String Path, String Libs)
             {
                 // If the dependencies list is not defined or empty.
                 String AbsLibraryPath = Path + File.separator + "libopencv_java3.so";
-                result &= loadLibrary(AbsLibraryPath);
+                result = loadLibrary(AbsLibraryPath);
             }
 
             return result;

diff --git a/...rg/opencv/android/BaseLoaderCallback.java → ...rg/opencv/android/BaseLoaderCallback.java b/...rg/opencv/android/BaseLoaderCallback.java → ...rg/opencv/android/BaseLoaderCallback.java
@@ -43,7 +43,7 @@ public void onClick(DialogInterface dialog, int which) {
             /** Package installation has been canceled. **/
             case LoaderCallbackInterface.INSTALL_CANCELED:
             {
-                Log.d(TAG, "OpenCV library instalation was canceled by user");
+                Log.d(TAG, "OpenCV library installation was canceled by user");
                 finish();
             } break;
             /** Application is incompatible with this version of OpenCV Manager. Possibly, a service update is required. **/