Skip to content

Commit f8fa511

Browse files
authored
Merge pull request #24 from stereolabs/v4.2.0
push to 4.2.0
2 parents 80fc742 + 91b2b1a commit f8fa511

5 files changed

Lines changed: 233 additions & 144 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This package lets you use the ZED stereo camera in C#. The C# API is a wrapper a
1414
- Visual Studio 2017 with C# extensions
1515
- Cmake 3.23 at least
1616
- [C wrapper](https://github.com/stereolabs/zed-c-api) of the ZED SDK
17-
- [ZED SDK **4.1.0**](https://www.stereolabs.com/developers/release/) and its dependency ([CUDA](https://developer.nvidia.com/cuda-downloads))
17+
- [ZED SDK **4.2.0**](https://www.stereolabs.com/developers/release/) and its dependency ([CUDA](https://developer.nvidia.com/cuda-downloads))
1818

1919
## From NuGet
2020

Stereolabs.zed/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ target_compile_options(${PROJECT_NAME} PRIVATE "/platform:x64" )
1717
set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.6.1")
1818

1919
# Set the C# language version, otherwise default 3.0 is taken
20-
set(CMAKE_CSharp_FLAGS "/langversion:7")
20+
set(CMAKE_CSharp_FLAGS "/langversion:10")
2121

2222

2323
# Set configuration type as Class Library

Stereolabs.zed/src/ZEDCamera.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ public void Close()
10451045
/// The grabbing method is typically called in the main loop in a separate thread.
10461046
/// \note For more info, read about the SDK method it calls:
10471047
/// <a href="https://www.stereolabs.com/docs/api/classsl_1_1Camera.html#afa3678a18dd574e162977e97d7cbf67b">grab</a>.
1048-
/// </remarks>
1048+
/// </summary>
10491049
/// <param name="runtimeParameters">A structure containing all the runtime parameters. Default: a preset of RuntimeParameters.</param>
10501050
/// <returns>false if no problem was encountered, true otherwise.</returns>
10511051
public sl.ERROR_CODE Grab(ref sl.RuntimeParameters runtimeParameters)
@@ -3097,14 +3097,14 @@ public sl.ERROR_CODE RetrieveObjects(ref Objects objs, ref ObjectDetectionRuntim
30973097
/// <param name="bt_params"> Body tracking runtime parameters </param>
30983098
/// <param name="instanceID">Id of the body tracking instance. Used when multiple instances of the body tracking module are enabled at the same time.</param>
30993099
/// <returns>sl.ERROR_CODE.SUCCESS if everything went fine, sl.ERROR_CODE.FAILURE otherwise.</returns>
3100-
public sl.ERROR_CODE RetrieveBodies(ref Bodies objs, ref BodyTrackingRuntimeParameters bt_params, uint instanceID = 0)
3100+
public sl.ERROR_CODE RetrieveBodies(ref Bodies bodies, ref BodyTrackingRuntimeParameters bt_params, uint instanceID = 0)
31013101
{
31023102
IntPtr p = Marshal.AllocHGlobal(System.Runtime.InteropServices.Marshal.SizeOf<sl.Bodies>());
31033103
sl.ERROR_CODE err = (sl.ERROR_CODE)dllz_retrieve_bodies_data(CameraID, ref bt_params, p, instanceID);
31043104

31053105
if (p != IntPtr.Zero)
31063106
{
3107-
objs = (sl.Bodies)Marshal.PtrToStructure(p, typeof(sl.Bodies));
3107+
bodies = (sl.Bodies)Marshal.PtrToStructure(p, typeof(sl.Bodies));
31083108
Marshal.FreeHGlobal(p);
31093109
return err;
31103110
}

0 commit comments

Comments
 (0)