From 11188cb699b14f443aed8aac17b983b4271703f6 Mon Sep 17 00:00:00 2001 From: Junrou Nishida Date: Wed, 6 Apr 2022 23:01:27 +0900 Subject: [PATCH] fix(plugin): fail to initialize GlSyncPoint (#515) * fix: failed to initialize GlSyncPoint * call a base constructor explicitly --- .../Runtime/Scripts/Framework/Formats/ImageFrame.cs | 2 +- .../Runtime/Scripts/Framework/Packet/GpuBufferPacket.cs | 2 +- .../Runtime/Scripts/Gpu/GlCalculatorHelper.cs | 1 - .../Runtime/Scripts/Gpu/GlSyncPoint.cs | 2 +- .../Runtime/Scripts/Gpu/GlTextureBuffer.cs | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Formats/ImageFrame.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Formats/ImageFrame.cs index 0e28e0581..eb9a1da44 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Formats/ImageFrame.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Formats/ImageFrame.cs @@ -34,7 +34,7 @@ public ImageFrame(ImageFormat.Format format, int width, int height, uint alignme this.ptr = ptr; } - public ImageFrame(ImageFormat.Format format, int width, int height, int widthStep, NativeArray pixelData) + public ImageFrame(ImageFormat.Format format, int width, int height, int widthStep, NativeArray pixelData) : base() { unsafe { diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/GpuBufferPacket.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/GpuBufferPacket.cs index c578f99fc..8230166d6 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/GpuBufferPacket.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/GpuBufferPacket.cs @@ -25,7 +25,7 @@ public GpuBufferPacket(GpuBuffer gpuBuffer) : base() this.ptr = ptr; } - public GpuBufferPacket(GpuBuffer gpuBuffer, Timestamp timestamp) + public GpuBufferPacket(GpuBuffer gpuBuffer, Timestamp timestamp) : base() { UnsafeNativeMethods.mp__MakeGpuBufferPacket_At__Rgb_Rts(gpuBuffer.mpPtr, timestamp.mpPtr, out var ptr).Assert(); GC.KeepAlive(timestamp); diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlCalculatorHelper.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlCalculatorHelper.cs index abc27f1c9..55280944a 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlCalculatorHelper.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlCalculatorHelper.cs @@ -5,7 +5,6 @@ // https://opensource.org/licenses/MIT. using System; -using System.Runtime.InteropServices; namespace Mediapipe { diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlSyncPoint.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlSyncPoint.cs index 796f0875b..144723bfb 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlSyncPoint.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlSyncPoint.cs @@ -12,7 +12,7 @@ public class GlSyncPoint : MpResourceHandle { private SharedPtrHandle _sharedPtrHandle; - public GlSyncPoint(IntPtr ptr) : base(ptr) + public GlSyncPoint(IntPtr ptr) : base() { _sharedPtrHandle = new SharedPtr(ptr); this.ptr = _sharedPtrHandle.Get(); diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlTextureBuffer.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlTextureBuffer.cs index a77a67251..42b3b18d8 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlTextureBuffer.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlTextureBuffer.cs @@ -30,7 +30,7 @@ public GlTextureBuffer(IntPtr ptr, bool isOwner = true) : base(isOwner) /// Make sure that this function doesn't throw exceptions and won't be GCed. /// public GlTextureBuffer(uint target, uint name, int width, int height, - GpuBufferFormat format, DeletionCallback callback, GlContext glContext) + GpuBufferFormat format, DeletionCallback callback, GlContext glContext) : base() { var sharedContextPtr = glContext == null ? IntPtr.Zero : glContext.sharedPtr; UnsafeNativeMethods.mp_SharedGlTextureBuffer__ui_ui_i_i_ui_PF_PSgc(