update tinyexr

ksgfk · Feb 23, 2024 · 25df72d · 25df72d
1 parent 0b01434
commit 25df72d
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ out
 
 obj
 bin
+
+.cache
diff --git a/TinyEXR.NET/Assets/runtimes/win-x64/native/TinyEXR.Native.dll b/TinyEXR.NET/Assets/runtimes/win-x64/native/TinyEXR.Native.dll
diff --git a/TinyEXR.NET/Native/EXRNative.cs b/TinyEXR.NET/Native/EXRNative.cs
@@ -21,7 +21,7 @@ public static unsafe partial class EXRNative
         public static extern int IsEXRFromMemoryInternal([NativeTypeName("const unsigned char *")] byte* memory, [NativeTypeName("size_t")] UIntPtr size);
 
         [DllImport("TinyEXR.Native", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        public static extern int SaveEXRToMemoryInternal([NativeTypeName("const float *")] float* data, [NativeTypeName("const int")] int width, [NativeTypeName("const int")] int height, [NativeTypeName("const int")] int components, [NativeTypeName("const int")] int save_as_fp16, [NativeTypeName("const unsigned char **")] byte** buffer, [NativeTypeName("const char **")] sbyte** err);
+        public static extern int SaveEXRToMemoryInternal([NativeTypeName("const float *")] float* data, [NativeTypeName("const int")] int width, [NativeTypeName("const int")] int height, [NativeTypeName("const int")] int components, [NativeTypeName("const int")] int save_as_fp16, [NativeTypeName("unsigned char **")] byte** buffer, [NativeTypeName("const char **")] sbyte** err);
 
         [DllImport("TinyEXR.Native", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         public static extern int SaveEXRInternal([NativeTypeName("const float *")] float* data, [NativeTypeName("const int")] int width, [NativeTypeName("const int")] int height, [NativeTypeName("const int")] int components, [NativeTypeName("const int")] int save_as_fp16, [NativeTypeName("const char *")] sbyte* filename, [NativeTypeName("const char **")] sbyte** err);

diff --git a/TinyEXR.NET/TinyEXR.NET.csproj b/TinyEXR.NET/TinyEXR.NET.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RootNamespace>TinyEXR</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <AssemblyVersion>0.3.1</AssemblyVersion>
-    <FileVersion>0.3.1</FileVersion>
+    <AssemblyVersion>0.3.6</AssemblyVersion>
+    <FileVersion>0.3.6</FileVersion>
     <RepositoryType>git</RepositoryType>
     <Description>TinyEXR.NET is a C# wrapper of tinyexr</Description>
     <Company>ksgfk</Company>
@@ -18,7 +18,7 @@
     <PackageTags>OpenEXR,HDR</PackageTags>
     <PackageReleaseNotes>update tinyexr</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
     <Nullable>enable</Nullable>
 
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -49,7 +49,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
 </Project>
diff --git a/TinyEXR.Native/TinyEXR.Native.cpp b/TinyEXR.Native/TinyEXR.Native.cpp
@@ -29,7 +29,7 @@ int IsEXRFromMemoryInternal(const unsigned char* memory, size_t size) { return I
 int SaveEXRToMemoryInternal(const float* data, const int width,
                             const int height, const int components,
                             const int save_as_fp16,
-                            const unsigned char** outbuf,
+                            unsigned char** outbuf,
                             const char** err) {
   return SaveEXRToMemory(data, width, height, components, save_as_fp16, outbuf, err);
 }

diff --git a/TinyEXR.Native/TinyEXR.Native.h b/TinyEXR.Native/TinyEXR.Native.h
@@ -34,7 +34,7 @@ EXPORT_API int IsEXRInternal(const char* filename);
 EXPORT_API int IsEXRFromMemoryInternal(const unsigned char* memory, size_t size);
 EXPORT_API int SaveEXRToMemoryInternal(const float* data, const int width, const int height,
                                        const int components, const int save_as_fp16,
-                                       const unsigned char** buffer, const char** err);
+                                       unsigned char** buffer, const char** err);
 EXPORT_API int SaveEXRInternal(const float* data, const int width, const int height,
                                const int components, const int save_as_fp16,
                                const char* filename, const char** err);

diff --git a/TinyEXR.Native/tinyexr b/TinyEXR.Native/tinyexr
diff --git a/TinyEXR.Native/zlib b/TinyEXR.Native/zlib
diff --git a/TinyEXR.Test/Program.cs b/TinyEXR.Test/Program.cs
@@ -1,6 +1,6 @@
-using System.Reflection.PortableExecutable;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
 using TinyEXR;
 
 {//test reader

diff --git a/TinyEXR.Test/TinyEXR.Test.csproj b/TinyEXR.Test/TinyEXR.Test.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
-    <PackageReference Include="TinyEXR.NET" Version="0.3.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
+    <PackageReference Include="TinyEXR.NET" Version="0.3.6" />
     <None Update="100639413_p0.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>