Skip to content

Commit 6d6e517

Browse files
author
github-actions
committed
Merge branch 'release/3.3.0'
2 parents 83d46b4 + aeee0ab commit 6d6e517

File tree

2 files changed

+22
-17
lines changed

2 files changed

+22
-17
lines changed

src/PiWeb.Volume/NativeMethods.cs

+21-16
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,33 @@
88

99
#endregion
1010

11-
namespace Zeiss.PiWeb.Volume
12-
{
13-
#region usings
11+
// ReSharper disable UnusedParameter.Global
12+
namespace Zeiss.PiWeb.Volume;
1413

15-
using System.Runtime.InteropServices;
16-
using Zeiss.PiWeb.Volume.Interop;
14+
#region usings
1715

18-
#endregion
16+
using Zeiss.PiWeb.Volume.Interop;
1917

20-
internal static class NativeMethods
21-
{
22-
#region methods
18+
#endregion
2319

24-
[DllImport( "PiWeb.Volume.Core.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi )]
25-
internal static extern VolumeError CompressVolume( InteropSliceReader inputStream, InteropStream outputStream, ushort width, ushort height, [MarshalAs( UnmanagedType.LPStr )] string encoderName, [MarshalAs( UnmanagedType.LPStr )] string pixelFormat, [MarshalAs( UnmanagedType.LPStr )] string options, int bitrate );
20+
internal static class NativeMethods
21+
{
22+
#region methods
2623

27-
[DllImport( "PiWeb.Volume.Core.dll", CallingConvention = CallingConvention.Cdecl )]
28-
internal static extern VolumeError DecompressVolume( InteropStream inputStream, InteropSliceWriter outputStream );
24+
internal static VolumeError CompressVolume( InteropSliceReader inputStream, InteropStream outputStream, ushort width, ushort height, string encoderName, string pixelFormat, string options, int bitrate )
25+
{
26+
return VolumeError.CodecInvalidName;
27+
}
2928

30-
[DllImport( "PiWeb.Volume.Core.dll", CallingConvention = CallingConvention.Cdecl )]
31-
internal static extern VolumeError DecompressSlices( InteropStream inputStream, InteropSliceWriter outputStream, ushort index, ushort count );
29+
internal static VolumeError DecompressVolume( InteropStream inputStream, InteropSliceWriter outputStream )
30+
{
31+
return VolumeError.CodecInvalidName;
32+
}
3233

33-
#endregion
34+
internal static VolumeError DecompressSlices( InteropStream inputStream, InteropSliceWriter outputStream, ushort index, ushort count )
35+
{
36+
return VolumeError.CodecInvalidName;
3437
}
38+
39+
#endregion
3540
}

src/PiWeb.Volume/PiWeb.Volume.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
volumemetric data for visualization in PiWeb.
4040
</Description>
4141
<PackageId>Zeiss.PiWeb.Volume</PackageId>
42-
<Version>3.2.0</Version>
42+
<Version>3.3.0</Version>
4343
<PackageIcon>logo_128x128.png</PackageIcon>
4444
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
4545
<PackageProjectUrl>https://github.com/ZEISS-PiWeb/PiWeb-Volume</PackageProjectUrl>

0 commit comments

Comments
 (0)