potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2024-01-23 17:06:52 +03:00
parent d6424233f0 69772b0260
commit decf6538a2
148 changed files with 3263 additions and 1564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/android/15-puzzle/build.gradle.in
+1 -2
View File
@@ -19,7 +19,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -31,7 +30,7 @@ dependencies {
if (gradle.opencv_source == 'sdk_path') {
println 'Using OpenCV from SDK'
implementation project(':opencv')
} else if (gradle.opencv_source == 'maven_local' || gradle.opencv_source == 'maven_cenral') {
} else if (gradle.opencv_source == 'maven_local' || gradle.opencv_source == 'maven_central') {
println 'Using OpenCV from Maven repo'
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
samples/android/camera-calibration/build.gradle.in
+1 -2
View File
@@ -19,7 +19,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -31,7 +30,7 @@ dependencies {
if (gradle.opencv_source == "sdk_path") {
println 'Using OpenCV from SDK'
implementation project(':opencv')
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
println 'Using OpenCV from Maven repo'
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
samples/android/color-blob-detection/build.gradle.in
+1 -2
View File
@@ -19,7 +19,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -31,7 +30,7 @@ dependencies {
if (gradle.opencv_source == "sdk_path") {
println 'Using OpenCV from from SDK'
implementation project(':opencv')
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
println 'Using OpenCV from Maven repo'
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
samples/android/face-detection/build.gradle.in
+1 -2
View File
@@ -19,7 +19,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -31,7 +30,7 @@ dependencies {
if (gradle.opencv_source == "sdk_path") {
println 'Using OpenCV from from SDK'
implementation project(':opencv')
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
println 'Using OpenCV from Maven repo'
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
samples/android/face-detection/gradle/AndroidManifest.xml
-1
View File
@@ -11,7 +11,6 @@
android:exported="true"
android:name="FaceDetectActivity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
samples/android/face-detection/src/org/opencv/samples/facedetect/FaceDetectActivity.java
+3 -2
View File
@@ -184,8 +184,9 @@ public class FaceDetectActivity extends CameraActivity implements CvCameraViewLi
mRgba = inputFrame.rgba();
if (mInputSize == null) {
mInputSize = new Size(Math.round(mRgba.cols()/mScale), Math.round(mRgba.rows()/mScale));
Size inputSize = new Size(Math.round(mRgba.cols()/mScale), Math.round(mRgba.rows()/mScale));
if (mInputSize == null || !mInputSize.equals(inputSize)) {
mInputSize = inputSize;
mFaceDetector.setInputSize(mInputSize);
}
samples/android/image-manipulations/build.gradle.in
+1 -2
View File
@@ -19,7 +19,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -31,7 +30,7 @@ dependencies {
if (gradle.opencv_source == "sdk_path") {
println 'Using OpenCV from from SDK'
implementation project(':opencv')
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
println 'Using OpenCV from Maven repo'
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
samples/android/mobilenet-objdetect/build.gradle.in
+1 -2
View File
@@ -19,7 +19,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -31,7 +30,7 @@ dependencies {
if (gradle.opencv_source == "sdk_path") {
println 'Using OpenCV from SDK'
implementation project(':opencv')
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
println 'Using OpenCV from Maven repo'
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
samples/android/qr-detection/build.gradle.in
+1 -2
View File
@@ -19,7 +19,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -30,7 +29,7 @@ dependencies {
//implementation fileTree(dir: 'libs', include: ['*.jar'])
if (gradle.opencv_source == "sdk_path") {
implementation project(':opencv')
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
}
samples/android/tutorial-1-camerapreview/build.gradle.in
+1 -2
View File
@@ -19,7 +19,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -31,7 +30,7 @@ dependencies {
if (gradle.opencv_source == "sdk_path") {
println 'Using OpenCV from SDK'
implementation project(':opencv')
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
println 'Using OpenCV from Maven repo'
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
samples/android/tutorial-1-camerapreview/gradle/AndroidManifest.xml
+2 -3
View File
@@ -12,7 +12,6 @@
android:exported="true"
android:name="Tutorial1Activity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -27,13 +26,13 @@
android:largeScreens="true"
android:anyDensity="true" />
//! [camera_permissions]
<!--[camera_permissions]-->
<uses-permission android:name="android.permission.CAMERA"/>
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
<uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
//! [camera_permissions]
<!--[camera_permissions]-->
</manifest>
samples/android/tutorial-2-mixedprocessing/build.gradle.in
+2 -3
View File
@@ -33,7 +33,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -44,7 +43,7 @@ android {
}
}
buildFeatures {
if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
prefab true
}
}
@@ -55,7 +54,7 @@ dependencies {
if (gradle.opencv_source == "sdk_path") {
println 'Using OpenCV from SDK'
implementation project(':opencv')
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
println 'Using OpenCV from Maven repo'
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
samples/android/tutorial-3-cameracontrol/build.gradle.in
+1 -2
View File
@@ -19,7 +19,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -31,7 +30,7 @@ dependencies {
if (gradle.opencv_source == "sdk_path") {
println 'Using OpenCV from SDK'
implementation project(':opencv')
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
println 'Using OpenCV from Maven repo'
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
samples/android/tutorial-4-opencl/build.gradle.in
+2 -3
View File
@@ -35,7 +35,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -46,7 +45,7 @@ android {
}
}
buildFeatures {
if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
prefab true
}
}
@@ -57,7 +56,7 @@ dependencies {
if (gradle.opencv_source == "sdk_path") {
println 'Using OpenCV from SDK'
implementation project(':opencv')
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
println 'Using OpenCV from Maven repo'
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
samples/android/video-recorder/build.gradle.in
+1 -2
View File
@@ -19,7 +19,6 @@ android {
sourceSets {
main {
java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
}
@@ -30,7 +29,7 @@ dependencies {
//implementation fileTree(dir: 'libs', include: ['*.jar'])
if (gradle.opencv_source == "sdk_path") {
implementation project(':opencv')
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
}
}