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

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Alekhin
2021-06-13 10:14:17 +00:00
parent 4dc811946d 438e2dc228
commit 7a5f554bc4
102 changed files with 5432 additions and 3206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/android/build.gradle.in
+1
View File
@@ -8,6 +8,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:@ANDROID_GRADLE_PLUGIN_VERSION@'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:@KOTLIN_PLUGIN_VERSION@'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs
+2 -2
View File
@@ -207,7 +207,7 @@ namespace PhoneXamlDirect3DApp1
catch
{
// If an exception is caught here it is most likely due to either
// ResourceLangauge not being correctly set to a supported language
// ResourceLanguage not being correctly set to a supported language
// code or ResourceFlowDirection is set to a value other than LeftToRight
// or RightToLeft.
@@ -220,4 +220,4 @@ namespace PhoneXamlDirect3DApp1
}
}
}
}
}
samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs
+2 -2
View File
@@ -207,7 +207,7 @@ namespace PhoneXamlDirect3DApp1
catch
{
// If an exception is caught here it is most likely due to either
// ResourceLangauge not being correctly set to a supported language
// ResourceLanguage not being correctly set to a supported language
// code or ResourceFlowDirection is set to a value other than LeftToRight
// or RightToLeft.
@@ -220,4 +220,4 @@ namespace PhoneXamlDirect3DApp1
}
}
}
}
}
samples/wp8/OpenCVXaml/OpenCVXaml/App.xaml.cs
+2 -2
View File
@@ -207,7 +207,7 @@ namespace OpenCVXaml
catch
{
// If an exception is caught here it is most likely due to either
// ResourceLangauge not being correctly set to a supported language
// ResourceLanguage not being correctly set to a supported language
// code or ResourceFlowDirection is set to a value other than LeftToRight
// or RightToLeft.
@@ -220,4 +220,4 @@ namespace OpenCVXaml
}
}
}
}
}