Skip to content

Commit b3bd683

Browse files
committed
v1.0.9 update OpenCVForUnity version to 2.6.4.
1 parent acb6ef1 commit b3bd683

File tree

137 files changed

+505
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+505
-287
lines changed
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace HoloLensWithOpenCVForUnityExample
2222
/// An example of marker based AR using OpenCVForUnity on Hololens.
2323
/// Referring to https://github.com/opencv/opencv_contrib/blob/master/modules/aruco/samples/detect_markers.cpp.
2424
/// </summary>
25-
[RequireComponent(typeof(HLCameraStreamToMatHelper), typeof(ImageOptimizationHelper))]
25+
[RequireComponent(typeof(HLCameraStream2MatHelper), typeof(ImageOptimizationHelper))]
2626
public class HLArUcoExample : MonoBehaviour
2727
{
2828
[HeaderAttribute("Preview")]
@@ -149,7 +149,7 @@ public class HLArUcoExample : MonoBehaviour
149149
/// <summary>
150150
/// The webcam texture to mat helper.
151151
/// </summary>
152-
HLCameraStreamToMatHelper webCamTextureToMatHelper;
152+
HLCameraStream2MatHelper webCamTextureToMatHelper;
153153

154154
/// <summary>
155155
/// The image optimization helper.
@@ -253,11 +253,11 @@ protected void Start()
253253
enableLerpFilterToggle.isOn = enableLerpFilter;
254254

255255
imageOptimizationHelper = gameObject.GetComponent<ImageOptimizationHelper>();
256-
webCamTextureToMatHelper = gameObject.GetComponent<HLCameraStreamToMatHelper>();
256+
webCamTextureToMatHelper = gameObject.GetComponent<HLCameraStream2MatHelper>();
257257
#if WINDOWS_UWP && !DISABLE_HOLOLENSCAMSTREAM_API
258258
webCamTextureToMatHelper.frameMatAcquired += OnFrameMatAcquired;
259259
#endif
260-
webCamTextureToMatHelper.outputColorFormat = WebCamTextureToMatHelper.ColorFormat.GRAY;
260+
webCamTextureToMatHelper.outputColorFormat = Source2MatHelperColorFormat.GRAY;
261261
webCamTextureToMatHelper.Initialize();
262262
}
263263

@@ -506,12 +506,13 @@ public void OnWebCamTextureToMatHelperDisposed()
506506
}
507507

508508
/// <summary>
509-
/// Raises the web cam texture to mat helper error occurred event.
509+
/// Raises the webcam texture to mat helper error occurred event.
510510
/// </summary>
511511
/// <param name="errorCode">Error code.</param>
512-
public void OnWebCamTextureToMatHelperErrorOccurred(WebCamTextureToMatHelper.ErrorCode errorCode)
512+
/// <param name="message">Message.</param>
513+
public void OnWebCamTextureToMatHelperErrorOccurred(Source2MatHelperErrorCode errorCode, string message)
513514
{
514-
Debug.Log("OnWebCamTextureToMatHelperErrorOccurred " + errorCode);
515+
Debug.Log("OnWebCamTextureToMatHelperErrorOccurred " + errorCode + ":" + message);
515516
}
516517

517518
#if WINDOWS_UWP && !DISABLE_HOLOLENSCAMSTREAM_API

0 commit comments

Comments
 (0)