mirror of
https://github.com/opencv/opencv.git
synced 2025-06-10 19:24:07 +08:00
Fixing 'doc' buildbot job: removing trailing whitespaces and tab indents
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
This commit is contained in:
parent
22a30af353
commit
530c8dc0c0
@ -93,11 +93,10 @@ Windows Store 8.0 ARM
|
|||||||
cmake -G "Visual Studio 12 2013 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=8.0 <path-to-source>
|
cmake -G "Visual Studio 12 2013 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=8.0 <path-to-source>
|
||||||
|
|
||||||
Example
|
Example
|
||||||
=======
|
======================================================
|
||||||
|
|
||||||
To generate Windows Phone 8.1 x86 project files in the opencv/bin dir
|
To generate Windows Phone 8.1 x86 project files in the opencv/bin dir
|
||||||
|
|
||||||
mkdir bin
|
mkdir bin
|
||||||
cd bin
|
cd bin
|
||||||
cmake -G "Visual Studio 12 2013" -DCMAKE_SYSTEM_NAME=WindowsPhone -DCMAKE_SYSTEM_VERSION=8.1 ../
|
cmake -G "Visual Studio 12 2013" -DCMAKE_SYSTEM_NAME=WindowsPhone -DCMAKE_SYSTEM_VERSION=8.1 ../
|
||||||
|
|
||||||
|
@ -273,8 +273,8 @@ Function Execute() {
|
|||||||
Function ShowHelp() {
|
Function ShowHelp() {
|
||||||
Write-Host "Configures OpenCV and generates projects for specified verion of Visual Studio/platforms/architectures."
|
Write-Host "Configures OpenCV and generates projects for specified verion of Visual Studio/platforms/architectures."
|
||||||
Write-Host "Must be executed from the sources folder containing main CMakeLists configuration."
|
Write-Host "Must be executed from the sources folder containing main CMakeLists configuration."
|
||||||
Write-Host "Parameter keys can be shortened down to a signle symbol (e.g. '-a') and are not case sensitive."
|
Write-Host "Parameter keys can be shortened down to a single symbol (e.g. '-a') and are not case sensitive."
|
||||||
Write-Host "Proper parameter sequensing is required when omitting keys."
|
Write-Host "Proper parameter sequencing is required when omitting keys."
|
||||||
Write-Host "Generates the following folder structure, depending on the supplied parameters: "
|
Write-Host "Generates the following folder structure, depending on the supplied parameters: "
|
||||||
Write-Host " bin/ "
|
Write-Host " bin/ "
|
||||||
Write-Host " | "
|
Write-Host " | "
|
||||||
|
@ -1,92 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
/* this ALWAYS GENERATED file contains the definitions for the interfaces */
|
|
||||||
|
|
||||||
|
|
||||||
/* File created by MIDL compiler version 8.00.0603 */
|
|
||||||
/* at Tue Jan 20 15:16:38 2015
|
|
||||||
*/
|
|
||||||
/* Compiler settings for C:\Users\MAXIM~1.KOS\AppData\Local\Temp\OcvImageManipulations.idl-a5dae736:
|
|
||||||
Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603
|
|
||||||
protocol : dce , ms_ext, c_ext, robust
|
|
||||||
error checks: allocation ref bounds_check enum stub_data
|
|
||||||
VC __declspec() decoration level:
|
|
||||||
__declspec(uuid()), __declspec(selectany), __declspec(novtable)
|
|
||||||
DECLSPEC_UUID(), MIDL_INTERFACE()
|
|
||||||
*/
|
|
||||||
/* @@MIDL_FILE_HEADING( ) */
|
|
||||||
|
|
||||||
#pragma warning( disable: 4049 ) /* more than 64k source lines */
|
|
||||||
|
|
||||||
|
|
||||||
/* verify that the <rpcndr.h> version is high enough to compile this file*/
|
|
||||||
#ifndef __REQUIRED_RPCNDR_H_VERSION__
|
|
||||||
#define __REQUIRED_RPCNDR_H_VERSION__ 475
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "rpc.h"
|
|
||||||
#include "rpcndr.h"
|
|
||||||
|
|
||||||
#ifndef __RPCNDR_H_VERSION__
|
|
||||||
#error this stub requires an updated version of <rpcndr.h>
|
|
||||||
#endif // __RPCNDR_H_VERSION__
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef __OcvImageManipulations_h__
|
|
||||||
#define __OcvImageManipulations_h__
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
|
|
||||||
#pragma once
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__cplusplus)
|
|
||||||
#if defined(__MIDL_USE_C_ENUM)
|
|
||||||
#define MIDL_ENUM enum
|
|
||||||
#else
|
|
||||||
#define MIDL_ENUM enum class
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Forward Declarations */
|
|
||||||
|
|
||||||
/* header files for imported files */
|
|
||||||
#include "Windows.Media.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"{
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* interface __MIDL_itf_OcvImageManipulations_0000_0000 */
|
|
||||||
/* [local] */
|
|
||||||
|
|
||||||
#pragma warning(push)
|
|
||||||
#pragma warning(disable:4001)
|
|
||||||
#pragma once
|
|
||||||
#pragma warning(pop)
|
|
||||||
#ifndef RUNTIMECLASS_OcvTransform_OcvImageManipulations_DEFINED
|
|
||||||
#define RUNTIMECLASS_OcvTransform_OcvImageManipulations_DEFINED
|
|
||||||
extern const __declspec(selectany) _Null_terminated_ WCHAR RuntimeClass_OcvTransform_OcvImageManipulations[] = L"OcvTransform.OcvImageManipulations";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* interface __MIDL_itf_OcvImageManipulations_0000_0000 */
|
|
||||||
/* [local] */
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
extern RPC_IF_HANDLE __MIDL_itf_OcvImageManipulations_0000_0000_v0_0_c_ifspec;
|
|
||||||
extern RPC_IF_HANDLE __MIDL_itf_OcvImageManipulations_0000_0000_v0_0_s_ifspec;
|
|
||||||
|
|
||||||
/* Additional Prototypes for ALL interfaces */
|
|
||||||
|
|
||||||
/* end of Additional Prototypes */
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
@ -1,39 +1,50 @@
|
|||||||
<phone:PhoneApplicationPage
|
<phone:PhoneApplicationPage x:Class="PhoneXamlDirect3DApp1.MainPage"
|
||||||
x:Class="PhoneXamlDirect3DApp1.MainPage"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
|
|
||||||
xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
|
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
mc:Ignorable="d"
|
xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
|
||||||
|
xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
|
||||||
FontFamily="{StaticResource PhoneFontFamilyNormal}"
|
FontFamily="{StaticResource PhoneFontFamilyNormal}"
|
||||||
FontSize="{StaticResource PhoneFontSizeNormal}"
|
FontSize="{StaticResource PhoneFontSizeNormal}"
|
||||||
Foreground="{StaticResource PhoneForegroundBrush}"
|
Foreground="{StaticResource PhoneForegroundBrush}"
|
||||||
SupportedOrientations="Portrait" Orientation="Portrait"
|
Orientation="Portrait"
|
||||||
shell:SystemTray.IsVisible="True">
|
SupportedOrientations="Portrait"
|
||||||
|
shell:SystemTray.IsVisible="True"
|
||||||
|
mc:Ignorable="d">
|
||||||
|
|
||||||
<!-- LayoutRoot is the root grid where all page content is placed -->
|
<!-- LayoutRoot is the root grid where all page content is placed -->
|
||||||
<Grid x:Name="LayoutRoot" Background="Transparent">
|
<Grid x:Name="LayoutRoot" Background="Transparent">
|
||||||
<DrawingSurface x:Name="DrawingSurface" Loaded="DrawingSurface_Loaded" />
|
<DrawingSurface x:Name="DrawingSurface" Loaded="DrawingSurface_Loaded" />
|
||||||
<StackPanel Margin="40">
|
<StackPanel Margin="40">
|
||||||
<RadioButton x:Name="Normal" Content="Normal" GroupName="Group1"
|
<RadioButton x:Name="Normal"
|
||||||
Checked="RadioButton_Checked" IsChecked="True"/>
|
Checked="RadioButton_Checked"
|
||||||
<RadioButton x:Name="Gray" Content="Gray" GroupName="Group1"
|
Content="Normal"
|
||||||
Checked="RadioButton_Checked"/>
|
GroupName="Group1"
|
||||||
<RadioButton x:Name="Canny" Content="Canny" GroupName="Group1"
|
IsChecked="True" />
|
||||||
Checked="RadioButton_Checked"/>
|
<RadioButton x:Name="Gray"
|
||||||
<RadioButton x:Name="Sepia" Content="Sepia" GroupName="Group1"
|
Checked="RadioButton_Checked"
|
||||||
Checked="RadioButton_Checked"/>
|
Content="Gray"
|
||||||
<RadioButton x:Name="Features" Content="Features" GroupName="Group1"
|
GroupName="Group1" />
|
||||||
Checked="RadioButton_Checked"/>
|
<RadioButton x:Name="Canny"
|
||||||
|
Checked="RadioButton_Checked"
|
||||||
|
Content="Canny"
|
||||||
|
GroupName="Group1" />
|
||||||
|
<RadioButton x:Name="Sepia"
|
||||||
|
Checked="RadioButton_Checked"
|
||||||
|
Content="Sepia"
|
||||||
|
GroupName="Group1" />
|
||||||
|
<RadioButton x:Name="Features"
|
||||||
|
Checked="RadioButton_Checked"
|
||||||
|
Content="Features"
|
||||||
|
GroupName="Group1" />
|
||||||
|
|
||||||
<StackPanel Orientation="Horizontal" Margin="20,0,0,0">
|
<StackPanel Margin="20,0,0,0" Orientation="Horizontal">
|
||||||
<TextBlock Text="Memory: " />
|
<TextBlock Text="Memory: " />
|
||||||
<TextBlock x:Name="MemoryTextBlock" />
|
<TextBlock x:Name="MemoryTextBlock" />
|
||||||
<TextBlock Text=" MB" />
|
<TextBlock Text=" MB" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Orientation="Horizontal" Margin="20,0,0,0">
|
<StackPanel Margin="20,0,0,0" Orientation="Horizontal">
|
||||||
<TextBlock Text="Peak Memory: " />
|
<TextBlock Text="Peak Memory: " />
|
||||||
<TextBlock x:Name="PeakMemoryTextBlock" />
|
<TextBlock x:Name="PeakMemoryTextBlock" />
|
||||||
<TextBlock Text=" MB" />
|
<TextBlock Text=" MB" />
|
||||||
|
@ -1,30 +1,39 @@
|
|||||||
<phone:PhoneApplicationPage
|
<phone:PhoneApplicationPage x:Class="PhoneXamlDirect3DApp1.MainPage"
|
||||||
x:Class="PhoneXamlDirect3DApp1.MainPage"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
|
|
||||||
xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
|
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
mc:Ignorable="d"
|
xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
|
||||||
|
xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
|
||||||
FontFamily="{StaticResource PhoneFontFamilyNormal}"
|
FontFamily="{StaticResource PhoneFontFamilyNormal}"
|
||||||
FontSize="{StaticResource PhoneFontSizeNormal}"
|
FontSize="{StaticResource PhoneFontSizeNormal}"
|
||||||
Foreground="{StaticResource PhoneForegroundBrush}"
|
Foreground="{StaticResource PhoneForegroundBrush}"
|
||||||
SupportedOrientations="Portrait" Orientation="Portrait"
|
Orientation="Portrait"
|
||||||
shell:SystemTray.IsVisible="True">
|
SupportedOrientations="Portrait"
|
||||||
|
shell:SystemTray.IsVisible="True"
|
||||||
|
mc:Ignorable="d">
|
||||||
|
|
||||||
<!-- LayoutRoot is the root grid where all page content is placed -->
|
<!-- LayoutRoot is the root grid where all page content is placed -->
|
||||||
<Grid x:Name="LayoutRoot" Background="Transparent">
|
<Grid x:Name="LayoutRoot" Background="Transparent">
|
||||||
<DrawingSurface x:Name="DrawingSurface" Loaded="DrawingSurface_Loaded" />
|
<DrawingSurface x:Name="DrawingSurface" Loaded="DrawingSurface_Loaded" />
|
||||||
<StackPanel Margin="40">
|
<StackPanel Margin="40">
|
||||||
<RadioButton x:Name="Normal" Content="Normal" GroupName="Group1"
|
<RadioButton x:Name="Normal"
|
||||||
Checked="RadioButton_Checked" IsChecked="True"/>
|
Checked="RadioButton_Checked"
|
||||||
<RadioButton x:Name="Gray" Content="Gray" GroupName="Group1"
|
Content="Normal"
|
||||||
Checked="RadioButton_Checked"/>
|
GroupName="Group1"
|
||||||
<RadioButton x:Name="Canny" Content="Canny" GroupName="Group1"
|
IsChecked="True" />
|
||||||
Checked="RadioButton_Checked"/>
|
<RadioButton x:Name="Gray"
|
||||||
<RadioButton x:Name="Sepia" Content="Sepia" GroupName="Group1"
|
Checked="RadioButton_Checked"
|
||||||
Checked="RadioButton_Checked"/>
|
Content="Gray"
|
||||||
|
GroupName="Group1" />
|
||||||
|
<RadioButton x:Name="Canny"
|
||||||
|
Checked="RadioButton_Checked"
|
||||||
|
Content="Canny"
|
||||||
|
GroupName="Group1" />
|
||||||
|
<RadioButton x:Name="Sepia"
|
||||||
|
Checked="RadioButton_Checked"
|
||||||
|
Content="Sepia"
|
||||||
|
GroupName="Group1" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
@ -65,5 +65,3 @@ void CopyMatrixToVector(const cv::Mat& mat, std::vector<int>& vector, int size)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user