Skip to content

O
opencv
Commit 349e3b54 authored by Maxim Kostin's avatar Maxim Kostin
Browse files
Options

Fixed 'doc' builder warnings.

parent 5ec908c5
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 53 deletions
samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.cpp
View file @ 349e3b54
......@@ -126,7 +126,7 @@ HRESULT OcvImageManipulations::SetProperties(ABI::Windows::Foundation::Collectio
spSetting->Lookup(key, spInsp.ReleaseAndGetAddressOf());
hr = spInsp.As(&spPropVal);
if (hr != S_OK)
if (hr != S_OK)
{
return hr;
}
......
samples/winrt/JavaScript/MediaCaptureJavaScript.jsproj
View file @ 349e3b54
......@@ -102,7 +102,7 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
<!-- To modify your build process, add your task inside one of the targets below then uncomment
that target and the DisableFastUpToDateCheck PropertyGroup.
that target and the DisableFastUpToDateCheck PropertyGroup.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
......
samples/winrt/JavaScript/css/default.css
View file @ 349e3b54
......@@ -2,5 +2,5 @@
#featureLabel
{
padding-top: 50px;
padding-top: 50px;
}
\ No newline at end of file
samples/winrt/JavaScript/default.html
View file @ 349e3b54
......@@ -19,10 +19,10 @@
<body role="application">
<div id="rootGrid">
<div id="content">
<h4>
<img src="images/windows-sdk.png" />
<span>OpenCV for Windows RT</span>
</h4>
<h4>
<img src="images/windows-sdk.png" />
<span>OpenCV for Windows RT</span>
</h4>
<h1 id="featureLabel"></h1>
<div id="contentHost"></div>
</div>
......
samples/winrt/JavaScript/html/AdvancedCapture.html
View file @ 349e3b54
......@@ -15,13 +15,13 @@
<select id="cameraSelect" aria-labelledby="listLabel"></select>
<button id="btnStartDevice" disabled="disabled">Start Device</button>
<button id="btnStartPreview" disabled="disabled">Start Preview</button>
<select id="videoEffect" disabled="disabled">
<option>Preview</option>
<option>Grayscale</option>
<option>Canny</option>
<option>Sobel</option>
<option>Histogram</option>
</select>
<select id="videoEffect" disabled="disabled">
<option>Preview</option>
<option>Grayscale</option>
<option>Canny</option>
<option>Sobel</option>
<option>Histogram</option>
</select>
</div>
<div data-win-control="SdkSample.ScenarioOutput">
<table>
......
samples/winrt/JavaScript/js/AdvancedCapture.js
View file @ 349e3b54
......@@ -11,7 +11,7 @@
var cameraList = null;
var mediaCaptureMgr = null;
var captureInitSettings = null;
var page = WinJS.UI.Pages.define("/html/AdvancedCapture.html", {
ready: function (element, options) {
......@@ -25,22 +25,22 @@
});
function scenarioInitialize() {
// Initialize the UI elements
id("btnStartDevice").disabled = false;
id("btnStartDevice").addEventListener("click", startDevice, false);
id("btnStartPreview").disabled = true;
id("videoEffect").disabled = true;
id("btnStartPreview").addEventListener("click", startPreview, false);
id("cameraSelect").addEventListener("change", onDeviceChange, false);
// Initialize the UI elements
id("btnStartDevice").disabled = false;
id("btnStartDevice").addEventListener("click", startDevice, false);
id("btnStartPreview").disabled = true;
id("videoEffect").disabled = true;
id("btnStartPreview").addEventListener("click", startPreview, false);
id("cameraSelect").addEventListener("change", onDeviceChange, false);
id("videoEffect").addEventListener('change', addEffectToImageStream, false);
id("videoEffect").addEventListener('change', addEffectToImageStream, false);
enumerateCameras();
enumerateCameras();
}
function initCameraSettings() {
captureInitSettings = new Windows.Media.Capture.MediaCaptureInitializationSettings();
captureInitSettings.streamingCaptureMode = Windows.Media.Capture.StreamingCaptureMode.video
captureInitSettings = new Windows.Media.Capture.MediaCaptureInitializationSettings();
captureInitSettings.streamingCaptureMode = Windows.Media.Capture.StreamingCaptureMode.video
// If the user chose another capture device, use it by default
var selectedIndex = id("cameraSelect").selectedIndex;
......@@ -50,10 +50,10 @@
// this function takes care of releasing the resources associated with media capturing
function releaseMediaCapture() {
if (mediaCaptureMgr) {
mediaCaptureMgr.close();
mediaCaptureMgr = null;
}
if (mediaCaptureMgr) {
mediaCaptureMgr.close();
mediaCaptureMgr = null;
}
}
//Initialize media capture with the current settings
......@@ -64,10 +64,10 @@
mediaCaptureMgr = new Windows.Media.Capture.MediaCapture();
mediaCaptureMgr.initializeAsync(captureInitSettings).done(function (result) {
// Update the UI
id("btnStartPreview").disabled = false;
id("btnStartDevice").disabled = true;
displayStatus("Device started");
// Update the UI
id("btnStartPreview").disabled = false;
id("btnStartDevice").disabled = true;
displayStatus("Device started");
});
}
......@@ -82,15 +82,15 @@
}
function addEffectToImageStream() {
var effectId = id("videoEffect").selectedIndex;
var props = new Windows.Foundation.Collections.PropertySet();
props.insert("{698649BE-8EAE-4551-A4CB-3EC98FBD3D86}", effectId);
mediaCaptureMgr.clearEffectsAsync(Windows.Media.Capture.MediaStreamType.videoPreview).then(function () {
return mediaCaptureMgr.addEffectAsync(Windows.Media.Capture.MediaStreamType.videoPreview, 'OcvTransform.OcvImageManipulations', props);
}).then(function () {
displayStatus('Effect has been successfully added');
}, errorHandler);
var effectId = id("videoEffect").selectedIndex;
var props = new Windows.Foundation.Collections.PropertySet();
props.insert("{698649BE-8EAE-4551-A4CB-3EC98FBD3D86}", effectId);
mediaCaptureMgr.clearEffectsAsync(Windows.Media.Capture.MediaStreamType.videoPreview).then(function () {
return mediaCaptureMgr.addEffectAsync(Windows.Media.Capture.MediaStreamType.videoPreview, 'OcvTransform.OcvImageManipulations', props);
}).then(function () {
displayStatus('Effect has been successfully added');
}, errorHandler);
}
function enumerateCameras() {
......@@ -118,7 +118,7 @@
cameraSelect.add(new Option(camera.name));
});
}
}, errorHandler);
}, errorHandler);
}
function onDeviceChange() {
......@@ -144,18 +144,18 @@
}
function failedEventHandler(e) {
displayError("Fatal error", e.message);
displayError("Fatal error", e.message);
}
function displayStatus(statusText) {
SdkSample.displayStatus(statusText);
SdkSample.displayStatus(statusText);
}
function displayError(error) {
SdkSample.displayError(error);
SdkSample.displayError(error);
}
function id(elementId) {
return document.getElementById(elementId);
return document.getElementById(elementId);
}
})();
samples/winrt/JavaScript/js/default.js
View file @ 349e3b54
......@@ -12,7 +12,7 @@
var sampleTitle = "OpenCV Image Manipulations sample";
var scenarios = [
{ url: "/html/AdvancedCapture.html", title: "Enumerate cameras and add a video effect" },
{ url: "/html/AdvancedCapture.html", title: "Enumerate cameras and add a video effect" },
];
function activated(eventObject) {
......
samples/winrt/JavaScript/sample-utils/sample-utils.css
View file @ 349e3b54
......@@ -191,7 +191,7 @@ html
{
padding-bottom:20px;
}
#input
{
-ms-grid-columns: auto;
......@@ -210,6 +210,4 @@ html
-ms-grid-row: 2;
-ms-grid-column: 1;
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment