generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed 'doc' builder warnings.

Browse Source
This commit is contained in:
Maxim Kostin 2015-03-18 17:37:42 +03:00
parent 5ec908c5f0
commit 349e3b546a
8 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.cpp
View File

@ -126,7 +126,7 @@ HRESULT OcvImageManipulations::SetProperties(ABI::Windows::Foundation::Collectio
spSetting->Lookup(key, spInsp.ReleaseAndGetAddressOf()); spSetting->Lookup(key, spInsp.ReleaseAndGetAddressOf());
hr = spInsp.As(&spPropVal); hr = spInsp.As(&spPropVal);
if (hr != S_OK) if (hr != S_OK)
{ {
return hr; return hr;
} }

2
samples/winrt/JavaScript/MediaCaptureJavaScript.jsproj
View File

@ -102,7 +102,7 @@
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" /> <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 <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
</Target> </Target>

2
samples/winrt/JavaScript/css/default.css
View File

@ -2,5 +2,5 @@
#featureLabel #featureLabel
{ {
padding-top: 50px; padding-top: 50px;
} }

8
samples/winrt/JavaScript/default.html
View File

@ -19,10 +19,10 @@
<body role="application"> <body role="application">
<div id="rootGrid"> <div id="rootGrid">
<div id="content"> <div id="content">
<h4> <h4>
<img src="images/windows-sdk.png" /> <img src="images/windows-sdk.png" />
<span>OpenCV for Windows RT</span> <span>OpenCV for Windows RT</span>
</h4> </h4>
<h1 id="featureLabel"></h1> <h1 id="featureLabel"></h1>
<div id="contentHost"></div> <div id="contentHost"></div>
</div> </div>

14
samples/winrt/JavaScript/html/AdvancedCapture.html
View File

@ -15,13 +15,13 @@
<select id="cameraSelect" aria-labelledby="listLabel"></select> <select id="cameraSelect" aria-labelledby="listLabel"></select>
<button id="btnStartDevice" disabled="disabled">Start Device</button> <button id="btnStartDevice" disabled="disabled">Start Device</button>
<button id="btnStartPreview" disabled="disabled">Start Preview</button> <button id="btnStartPreview" disabled="disabled">Start Preview</button>
<select id="videoEffect" disabled="disabled"> <select id="videoEffect" disabled="disabled">
<option>Preview</option> <option>Preview</option>
<option>Grayscale</option> <option>Grayscale</option>
<option>Canny</option> <option>Canny</option>
<option>Sobel</option> <option>Sobel</option>
<option>Histogram</option> <option>Histogram</option>
</select> </select>
</div> </div>
<div data-win-control="SdkSample.ScenarioOutput"> <div data-win-control="SdkSample.ScenarioOutput">
<table> <table>

66
samples/winrt/JavaScript/js/AdvancedCapture.js
View File

@ -11,7 +11,7 @@
var cameraList = null; var cameraList = null;
var mediaCaptureMgr = null; var mediaCaptureMgr = null;
var captureInitSettings = null; var captureInitSettings = null;
var page = WinJS.UI.Pages.define("/html/AdvancedCapture.html", { var page = WinJS.UI.Pages.define("/html/AdvancedCapture.html", {
ready: function (element, options) { ready: function (element, options) {
@ -25,22 +25,22 @@
}); });
function scenarioInitialize() { function scenarioInitialize() {
// Initialize the UI elements // Initialize the UI elements
id("btnStartDevice").disabled = false; id("btnStartDevice").disabled = false;
id("btnStartDevice").addEventListener("click", startDevice, false); id("btnStartDevice").addEventListener("click", startDevice, false);
id("btnStartPreview").disabled = true; id("btnStartPreview").disabled = true;
id("videoEffect").disabled = true; id("videoEffect").disabled = true;
id("btnStartPreview").addEventListener("click", startPreview, false); id("btnStartPreview").addEventListener("click", startPreview, false);
id("cameraSelect").addEventListener("change", onDeviceChange, false); id("cameraSelect").addEventListener("change", onDeviceChange, false);
id("videoEffect").addEventListener('change', addEffectToImageStream, false); id("videoEffect").addEventListener('change', addEffectToImageStream, false);
enumerateCameras(); enumerateCameras();
} }
function initCameraSettings() { function initCameraSettings() {
captureInitSettings = new Windows.Media.Capture.MediaCaptureInitializationSettings(); captureInitSettings = new Windows.Media.Capture.MediaCaptureInitializationSettings();
captureInitSettings.streamingCaptureMode = Windows.Media.Capture.StreamingCaptureMode.video captureInitSettings.streamingCaptureMode = Windows.Media.Capture.StreamingCaptureMode.video
// If the user chose another capture device, use it by default // If the user chose another capture device, use it by default
var selectedIndex = id("cameraSelect").selectedIndex; var selectedIndex = id("cameraSelect").selectedIndex;
@ -50,10 +50,10 @@
// this function takes care of releasing the resources associated with media capturing // this function takes care of releasing the resources associated with media capturing
function releaseMediaCapture() { function releaseMediaCapture() {
if (mediaCaptureMgr) { if (mediaCaptureMgr) {
mediaCaptureMgr.close(); mediaCaptureMgr.close();
mediaCaptureMgr = null; mediaCaptureMgr = null;
} }
} }
//Initialize media capture with the current settings //Initialize media capture with the current settings
@ -64,10 +64,10 @@
mediaCaptureMgr = new Windows.Media.Capture.MediaCapture(); mediaCaptureMgr = new Windows.Media.Capture.MediaCapture();
mediaCaptureMgr.initializeAsync(captureInitSettings).done(function (result) { mediaCaptureMgr.initializeAsync(captureInitSettings).done(function (result) {
// Update the UI // Update the UI
id("btnStartPreview").disabled = false; id("btnStartPreview").disabled = false;
id("btnStartDevice").disabled = true; id("btnStartDevice").disabled = true;
displayStatus("Device started"); displayStatus("Device started");
}); });
} }
@ -82,15 +82,15 @@
} }
function addEffectToImageStream() { function addEffectToImageStream() {
var effectId = id("videoEffect").selectedIndex; var effectId = id("videoEffect").selectedIndex;
var props = new Windows.Foundation.Collections.PropertySet(); var props = new Windows.Foundation.Collections.PropertySet();
props.insert("{698649BE-8EAE-4551-A4CB-3EC98FBD3D86}", effectId); props.insert("{698649BE-8EAE-4551-A4CB-3EC98FBD3D86}", effectId);
mediaCaptureMgr.clearEffectsAsync(Windows.Media.Capture.MediaStreamType.videoPreview).then(function () { mediaCaptureMgr.clearEffectsAsync(Windows.Media.Capture.MediaStreamType.videoPreview).then(function () {
return mediaCaptureMgr.addEffectAsync(Windows.Media.Capture.MediaStreamType.videoPreview, 'OcvTransform.OcvImageManipulations', props); return mediaCaptureMgr.addEffectAsync(Windows.Media.Capture.MediaStreamType.videoPreview, 'OcvTransform.OcvImageManipulations', props);
}).then(function () { }).then(function () {
displayStatus('Effect has been successfully added'); displayStatus('Effect has been successfully added');
}, errorHandler); }, errorHandler);
} }
function enumerateCameras() { function enumerateCameras() {
@ -118,7 +118,7 @@
cameraSelect.add(new Option(camera.name)); cameraSelect.add(new Option(camera.name));
}); });
} }
}, errorHandler); }, errorHandler);
} }
function onDeviceChange() { function onDeviceChange() {
@ -144,18 +144,18 @@
} }
function failedEventHandler(e) { function failedEventHandler(e) {
displayError("Fatal error", e.message); displayError("Fatal error", e.message);
} }
function displayStatus(statusText) { function displayStatus(statusText) {
SdkSample.displayStatus(statusText); SdkSample.displayStatus(statusText);
} }
function displayError(error) { function displayError(error) {
SdkSample.displayError(error); SdkSample.displayError(error);
} }
function id(elementId) { function id(elementId) {
return document.getElementById(elementId); return document.getElementById(elementId);
} }
})(); })();

2
samples/winrt/JavaScript/js/default.js
View File

@ -12,7 +12,7 @@
var sampleTitle = "OpenCV Image Manipulations sample"; var sampleTitle = "OpenCV Image Manipulations sample";
var scenarios = [ 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) { function activated(eventObject) {

6
samples/winrt/JavaScript/sample-utils/sample-utils.css
View File

@ -191,7 +191,7 @@ html
{ {
padding-bottom:20px; padding-bottom:20px;
} }
#input #input
{ {
-ms-grid-columns: auto; -ms-grid-columns: auto;
@ -210,6 +210,4 @@ html
-ms-grid-row: 2; -ms-grid-row: 2;
-ms-grid-column: 1; -ms-grid-column: 1;
} }
} }