v1.0.9.1 Updated OpenCVForUnity version to 2.6.5.

EnoxSoftware · EnoxSoftware · commit 2ce6c155b974 · 2024-12-12T01:39:07.000+09:00
diff --git a/HLWithOpenCVExampleMRTK2/Assets/HoloLensWithOpenCVForUnityExample/Scripts/Utils/HLCameraStream2MatHelper.cs b/HLWithOpenCVExampleMRTK2/Assets/HoloLensWithOpenCVForUnityExample/Scripts/Utils/HLCameraStream2MatHelper.cs
@@ -499,13 +499,13 @@ protected virtual void OnFrameSampleAcquired(VideoCaptureSample sample)
                     Core.rotate(mat, rotatedFrameMat, Core.ROTATE_90_CLOCKWISE);
                     mat.Dispose();
 
-                    FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal);
+                    FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal, false, 0);
 
                     frameMatAcquired.Invoke(rotatedFrameMat, projectionMatrix, cameraToWorldMatrix, cameraIntrinsics);
                 }
                 else
                 {
-                    FlipMat(mat, _flipVertical, _flipHorizontal);
+                    FlipMat(mat, _flipVertical, _flipHorizontal, false, 0);
 
                     frameMatAcquired.Invoke(mat, projectionMatrix, cameraToWorldMatrix, cameraIntrinsics);
                 }
@@ -1030,23 +1030,27 @@ public override Mat GetMat()
             if (rotatedFrameMat != null)
             {
                 Core.rotate(frameMat, rotatedFrameMat, Core.ROTATE_90_CLOCKWISE);
-                FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal);
+                FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal, false, 0);
 
                 return rotatedFrameMat;
             }
             else
             {
-                FlipMat(frameMat, _flipVertical, _flipHorizontal);
+                FlipMat(frameMat, _flipVertical, _flipHorizontal, false, 0);
 
                 return frameMat;
             }
         }
 
         /// <summary>
-        /// Flip the mat.
+        /// Flip Mat
         /// </summary>
-        /// <param name="mat">Mat.</param>
-        protected override void FlipMat(Mat mat, bool flipVertical, bool flipHorizontal)
+        /// <param name="mat"></param>
+        /// <param name="flipVertical"></param>
+        /// <param name="flipHorizontal"></param>
+        /// <param name="isFrontFacing"></param>
+        /// <param name="videoRotationAngle"></param>
+        protected override void FlipMat(Mat mat, bool flipVertical, bool flipHorizontal, bool isFrontFacing, int videoRotationAngle)
         {
             int flipCode = int.MinValue;
 
diff --git a/HLWithOpenCVExampleMRTK3/Assets/HoloLensWithOpenCVForUnityExample/Scripts/Utils/HLCameraStream2MatHelper.cs b/HLWithOpenCVExampleMRTK3/Assets/HoloLensWithOpenCVForUnityExample/Scripts/Utils/HLCameraStream2MatHelper.cs
@@ -499,13 +499,13 @@ protected virtual void OnFrameSampleAcquired(VideoCaptureSample sample)
                     Core.rotate(mat, rotatedFrameMat, Core.ROTATE_90_CLOCKWISE);
                     mat.Dispose();
 
-                    FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal);
+                    FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal, false, 0);
 
                     frameMatAcquired.Invoke(rotatedFrameMat, projectionMatrix, cameraToWorldMatrix, cameraIntrinsics);
                 }
                 else
                 {
-                    FlipMat(mat, _flipVertical, _flipHorizontal);
+                    FlipMat(mat, _flipVertical, _flipHorizontal, false, 0);
 
                     frameMatAcquired.Invoke(mat, projectionMatrix, cameraToWorldMatrix, cameraIntrinsics);
                 }
@@ -1030,23 +1030,27 @@ public override Mat GetMat()
             if (rotatedFrameMat != null)
             {
                 Core.rotate(frameMat, rotatedFrameMat, Core.ROTATE_90_CLOCKWISE);
-                FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal);
+                FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal, false, 0);
 
                 return rotatedFrameMat;
             }
             else
             {
-                FlipMat(frameMat, _flipVertical, _flipHorizontal);
+                FlipMat(frameMat, _flipVertical, _flipHorizontal, false, 0);
 
                 return frameMat;
             }
         }
 
         /// <summary>
-        /// Flip the mat.
+        /// Flip Mat
         /// </summary>
-        /// <param name="mat">Mat.</param>
-        protected override void FlipMat(Mat mat, bool flipVertical, bool flipHorizontal)
+        /// <param name="mat"></param>
+        /// <param name="flipVertical"></param>
+        /// <param name="flipHorizontal"></param>
+        /// <param name="isFrontFacing"></param>
+        /// <param name="videoRotationAngle"></param>
+        protected override void FlipMat(Mat mat, bool flipVertical, bool flipHorizontal, bool isFrontFacing, int videoRotationAngle)
         {
             int flipCode = int.MinValue;
 

Original file line number	Diff line number	Diff line change
`@@ -499,13 +499,13 @@ protected virtual void OnFrameSampleAcquired(VideoCaptureSample sample)`
`499`	`499`	`Core.rotate(mat, rotatedFrameMat, Core.ROTATE_90_CLOCKWISE);`
`500`	`500`	`mat.Dispose();`
`501`	`501`
`502`		`- FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal);`
	`502`	`+ FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal, false, 0);`
`503`	`503`
`504`	`504`	`frameMatAcquired.Invoke(rotatedFrameMat, projectionMatrix, cameraToWorldMatrix, cameraIntrinsics);`
`505`	`505`	`}`
`506`	`506`	`else`
`507`	`507`	`{`
`508`		`- FlipMat(mat, _flipVertical, _flipHorizontal);`
	`508`	`+ FlipMat(mat, _flipVertical, _flipHorizontal, false, 0);`
`509`	`509`
`510`	`510`	`frameMatAcquired.Invoke(mat, projectionMatrix, cameraToWorldMatrix, cameraIntrinsics);`
`511`	`511`	`}`
`@@ -1030,23 +1030,27 @@ public override Mat GetMat()`
`1030`	`1030`	`if (rotatedFrameMat != null)`
`1031`	`1031`	`{`
`1032`	`1032`	`Core.rotate(frameMat, rotatedFrameMat, Core.ROTATE_90_CLOCKWISE);`
`1033`		`- FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal);`
	`1033`	`+ FlipMat(rotatedFrameMat, _flipVertical, _flipHorizontal, false, 0);`
`1034`	`1034`
`1035`	`1035`	`return rotatedFrameMat;`
`1036`	`1036`	`}`
`1037`	`1037`	`else`
`1038`	`1038`	`{`
`1039`		`- FlipMat(frameMat, _flipVertical, _flipHorizontal);`
	`1039`	`+ FlipMat(frameMat, _flipVertical, _flipHorizontal, false, 0);`
`1040`	`1040`
`1041`	`1041`	`return frameMat;`
`1042`	`1042`	`}`
`1043`	`1043`	`}`
`1044`	`1044`
`1045`	`1045`	`/// <summary>`
`1046`		`- /// Flip the mat.`
	`1046`	`+ /// Flip Mat`
`1047`	`1047`	`/// </summary>`
`1048`		`- /// <param name="mat">Mat.</param>`
`1049`		`- protected override void FlipMat(Mat mat, bool flipVertical, bool flipHorizontal)`
	`1048`	`+ /// <param name="mat"></param>`
	`1049`	`+ /// <param name="flipVertical"></param>`
	`1050`	`+ /// <param name="flipHorizontal"></param>`
	`1051`	`+ /// <param name="isFrontFacing"></param>`
	`1052`	`+ /// <param name="videoRotationAngle"></param>`
	`1053`	`+ protected override void FlipMat(Mat mat, bool flipVertical, bool flipHorizontal, bool isFrontFacing, int videoRotationAngle)`
`1050`	`1054`	`{`
`1051`	`1055`	`int flipCode = int.MinValue;`
`1052`	`1056`