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 branch 4.x

Browse Source
This commit is contained in:
Alexander Alekhin
2023-01-09 11:08:02 +00:00
parent 8a62b03761 2ab46d9553
commit 593a376566
880 changed files with 83958 additions and 9368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/android/15-puzzle/gradle/AndroidManifest.xml
+1
View File
@@ -8,6 +8,7 @@
android:label="@string/app_name">
<activity
android:exported="true"
android:name=".Puzzle15Activity"
android:label="@string/app_name"
android:screenOrientation="landscape"
samples/android/build.gradle.in
+10
View File
@@ -35,6 +35,7 @@ task clean(type: Delete) {
// }
//}
def opencv_strict_build_configuration = @ANDROID_STRICT_BUILD_CONFIGURATION@;
gradle.afterProject { project ->
if (project.pluginManager.hasPlugin('com.android.application')
@@ -90,5 +91,14 @@ gradle.afterProject { project ->
}
}
// Android Gradle Plugin (AGP) 3.5+ is required
// https://github.com/android/ndk-samples/wiki/Configure-NDK-Path
def isNdkVersionSupported = project.android.metaClass.getProperties().find { it.name == 'ndkVersion' } != null
if ((false || opencv_strict_build_configuration) && isNdkVersionSupported) {
gradle.println("Override ndkVersion for the project ${project.name}")
project.android {
ndkVersion '@ANDROID_NDK_REVISION@'
}
}
}
}
samples/android/camera-calibration/gradle/AndroidManifest.xml
+3 -1
View File
@@ -7,7 +7,9 @@
android:label="@string/app_name"
android:icon="@drawable/icon">
<activity android:name="CameraCalibrationActivity"
<activity
android:exported="true"
android:name="CameraCalibrationActivity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
samples/android/color-blob-detection/gradle/AndroidManifest.xml
+3 -1
View File
@@ -8,7 +8,9 @@
android:icon="@drawable/icon"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
<activity android:name="ColorBlobDetectionActivity"
<activity
android:exported="true"
android:name="ColorBlobDetectionActivity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
samples/android/face-detection/gradle/AndroidManifest.xml
+3 -1
View File
@@ -7,7 +7,9 @@
android:label="@string/app_name"
android:icon="@drawable/icon">
<activity android:name="FdActivity"
<activity
android:exported="true"
android:name="FdActivity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
samples/android/image-manipulations/gradle/AndroidManifest.xml
+3 -1
View File
@@ -7,7 +7,9 @@
android:label="@string/app_name"
android:icon="@drawable/icon">
<activity android:name="ImageManipulationsActivity"
<activity
android:exported="true"
android:name="ImageManipulationsActivity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
samples/android/mobilenet-objdetect/gradle/AndroidManifest.xml
+4 -2
View File
@@ -10,8 +10,10 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.AppCompat.NoActionBar"> <!--Full screen mode-->
<activity android:name=".MainActivity"
android:screenOrientation="landscape"> <!--Screen orientation-->
<activity
android:exported="true"
android:name=".MainActivity"
android:screenOrientation="landscape"> <!--Screen orientation-->
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
samples/android/tutorial-1-camerapreview/gradle/AndroidManifest.xml
+3 -1
View File
@@ -8,7 +8,9 @@
android:icon="@drawable/icon"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
<activity android:name="Tutorial1Activity"
<activity
android:exported="true"
android:name="Tutorial1Activity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
samples/android/tutorial-2-mixedprocessing/gradle/AndroidManifest.xml
+3 -1
View File
@@ -7,7 +7,9 @@
android:label="@string/app_name"
android:icon="@drawable/icon">
<activity android:name="Tutorial2Activity"
<activity
android:exported="true"
android:name="Tutorial2Activity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
samples/android/tutorial-3-cameracontrol/gradle/AndroidManifest.xml
+3 -1
View File
@@ -7,7 +7,9 @@
android:label="@string/app_name"
android:icon="@drawable/icon">
<activity android:name="Tutorial3Activity"
<activity
android:exported="true"
android:name="Tutorial3Activity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
samples/android/tutorial-4-opencl/gradle/AndroidManifest.xml
+31 -30
View File
@@ -1,31 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.samples.tutorial4"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="21" />
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
<uses-feature android:name="android.hardware.camera"/>
<uses-feature android:name="android.hardware.camera2" android:required="false"/>
<uses-permission android:name="android.permission.CAMERA"/>
<application
android:allowBackup="true"
android:icon="@drawable/icon">
<activity
android:name=".Tutorial4Activity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.samples.tutorial4"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="21" />
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
<uses-feature android:name="android.hardware.camera"/>
<uses-feature android:name="android.hardware.camera2" android:required="false"/>
<uses-permission android:name="android.permission.CAMERA"/>
<application
android:allowBackup="true"
android:icon="@drawable/icon">
<activity
android:exported="true"
android:name=".Tutorial4Activity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>