diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml b/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml index 253dba4e3d..78409d5118 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml @@ -8,7 +8,7 @@ - diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml.cpp b/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml.cpp index ce383cf341..228e24a1fe 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml.cpp +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml.cpp @@ -30,8 +30,8 @@ using namespace Windows::UI::Xaml::Navigation; /// App::App() { - InitializeComponent(); - Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending); + InitializeComponent(); + Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending); } /// @@ -42,53 +42,53 @@ App::App() /// Details about the launch request and process. void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ args) { - auto rootFrame = dynamic_cast(Window::Current->Content); + auto rootFrame = dynamic_cast(Window::Current->Content); - // Do not repeat app initialization when the Window already has content, - // just ensure that the window is active - if (rootFrame == nullptr) - { - // Create a Frame to act as the navigation context and associate it with - // a SuspensionManager key - rootFrame = ref new Frame(); + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (rootFrame == nullptr) + { + // Create a Frame to act as the navigation context and associate it with + // a SuspensionManager key + rootFrame = ref new Frame(); - if (args->PreviousExecutionState == ApplicationExecutionState::Terminated) - { - // TODO: Restore the saved session state only when appropriate, scheduling the - // final launch steps after the restore is complete + if (args->PreviousExecutionState == ApplicationExecutionState::Terminated) + { + // TODO: Restore the saved session state only when appropriate, scheduling the + // final launch steps after the restore is complete - } + } - if (rootFrame->Content == nullptr) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - if (!rootFrame->Navigate(TypeName(MainPage::typeid), args->Arguments)) - { - throw ref new FailureException("Failed to create initial page"); - } - } - // Place the frame in the current Window - Window::Current->Content = rootFrame; - // Ensure the current window is active - Window::Current->Activate(); - } - else - { - if (rootFrame->Content == nullptr) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - if (!rootFrame->Navigate(TypeName(MainPage::typeid), args->Arguments)) - { - throw ref new FailureException("Failed to create initial page"); - } - } - // Ensure the current window is active - Window::Current->Activate(); - } + if (rootFrame->Content == nullptr) + { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + if (!rootFrame->Navigate(TypeName(MainPage::typeid), args->Arguments)) + { + throw ref new FailureException("Failed to create initial page"); + } + } + // Place the frame in the current Window + Window::Current->Content = rootFrame; + // Ensure the current window is active + Window::Current->Activate(); + } + else + { + if (rootFrame->Content == nullptr) + { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + if (!rootFrame->Navigate(TypeName(MainPage::typeid), args->Arguments)) + { + throw ref new FailureException("Failed to create initial page"); + } + } + // Ensure the current window is active + Window::Current->Activate(); + } } /// @@ -100,8 +100,8 @@ void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEvent /// Details about the suspend request. void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e) { - (void) sender; // Unused parameter - (void) e; // Unused parameter + (void) sender; // Unused parameter + (void) e; // Unused parameter - //TODO: Save application state and stop any background activity + //TODO: Save application state and stop any background activity } diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml.h b/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml.h index 2004513dff..8e16532bce 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml.h +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/App.xaml.h @@ -9,16 +9,16 @@ namespace OcvImageProcessing { - /// - /// Provides application-specific behavior to supplement the default Application class. - /// - ref class App sealed - { - public: - App(); - virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ args) override; + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + ref class App sealed + { + public: + App(); + virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ args) override; - private: - void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e); - }; + private: + void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e); + }; } diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/Logo.png b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/Logo.png index e26771cb33..ea685d651a 100644 Binary files a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/Logo.png and b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/Logo.png differ diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/SmallLogo.png b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/SmallLogo.png index 1eb0d9d528..efaf5468a1 100644 Binary files a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/SmallLogo.png and b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/SmallLogo.png differ diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/SplashScreen.png b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/SplashScreen.png index c951e031bd..901c3b085a 100644 Binary files a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/SplashScreen.png and b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/SplashScreen.png differ diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/StoreLogo.png b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/StoreLogo.png index dcb672712c..af64bf00ad 100644 Binary files a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/StoreLogo.png and b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Assets/StoreLogo.png differ diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Common/StandardStyles.xaml b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Common/StandardStyles.xaml index 85f4ed640e..4def039e59 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Common/StandardStyles.xaml +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Common/StandardStyles.xaml @@ -142,8 +142,7 @@ - - -