mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-09 10:40:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21934 from Yulv-git:3.4-typos2

Browse Source 
Fix some typos in platforms/, samples/.
This commit is contained in:
Alexander Smorkalov 2022-09-07 17:16:23 +03:00 committed by GitHub
commit e24382691f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platforms/android/android.toolchain.cmake
View File

@ -399,7 +399,7 @@ if( NOT ANDROID_NDK )
__INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN ) __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN )
if( NOT ANDROID_STANDALONE_TOOLCHAIN ) if( NOT ANDROID_STANDALONE_TOOLCHAIN )
#try to find Android NDK in one of the the default locations #try to find Android NDK in one of the default locations
set( __ndkSearchPaths ) set( __ndkSearchPaths )
foreach( __ndkSearchPath ${ANDROID_NDK_SEARCH_PATHS} ) foreach( __ndkSearchPath ${ANDROID_NDK_SEARCH_PATHS} )
foreach( suffix ${ANDROID_SUPPORTED_NDK_VERSIONS} ) foreach( suffix ${ANDROID_SUPPORTED_NDK_VERSIONS} )
@ -413,7 +413,7 @@ if( NOT ANDROID_NDK )
message( STATUS "Using default path for Android NDK: ${ANDROID_NDK}" ) message( STATUS "Using default path for Android NDK: ${ANDROID_NDK}" )
message( STATUS " If you prefer to use a different location, please define a cmake or environment variable: ANDROID_NDK" ) message( STATUS " If you prefer to use a different location, please define a cmake or environment variable: ANDROID_NDK" )
else() else()
#try to find Android standalone toolchain in one of the the default locations #try to find Android standalone toolchain in one of the default locations
__INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH ) __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH )
if( ANDROID_STANDALONE_TOOLCHAIN ) if( ANDROID_STANDALONE_TOOLCHAIN )

2
samples/winrt/ImageManipulations/MainPage.xaml.cpp
View File

@ -91,7 +91,7 @@ void MainPage::InvalidateSize()
// We have different widths to use depending on the view state // We have different widths to use depending on the view state
if (ApplicationView::Value != ApplicationViewState::Snapped) if (ApplicationView::Value != ApplicationViewState::Snapped)
{ {
// Make us as big as the the left over space, factoring in the ListBox width, the ListBox margins. // Make us as big as the left over space, factoring in the ListBox width, the ListBox margins.
// and the LayoutRoot's margins // and the LayoutRoot's margins
InputSection->Width = ((availableWidth) - InputSection->Width = ((availableWidth) -
(layoutRootMarginLeft + layoutRootMarginRight + listBoxMarginLeft + listBoxMarginRight)); (layoutRootMarginLeft + layoutRootMarginRight + listBoxMarginLeft + listBoxMarginRight));