CMakeLists.txt

@@ -5,10 +5,9 @@ project(rf_stbi LANGUAGES C VERSION 1.0)
 if (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin"))
     add_compile_options(-static-libgcc -static-libstdc++ -fno-exceptions)
 endif()
-add_compile_options(-O3)
 
 add_library(stbi SHARED "rf_stbi.c")
-    install(
+install(
     TARGETS stbi
     RUNTIME DESTINATION .
     LIBRARY DESTINATION .)

NativeTypeNameAttribute.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Quik.Stb
+{
+    [AttributeUsage(System.AttributeTargets.All, Inherited = false, AllowMultiple = true)]
+    internal sealed class NativeTypeNameAttribute : System.Attribute
+    {
+        public NativeTypeNameAttribute(string typename)
+        {
+        }
+    }
+}

ReFuel.StbImage.csproj

@@ -1,20 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <RuntimeIdentifiers>linux-arm;linux-arm64;linux-x64;win-x86;win-x64;osx-arm64;osx-x64</RuntimeIdentifiers>
     <RootNamespace>ReFuel.Stb</RootNamespace>
-    <Optimize>true</Optimize>
   </PropertyGroup>
 
   <PropertyGroup>
     <!-- Nuget Properties. -->
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>ReFuel.StbImage</PackageId>
-    <Version>2.1.0</Version>
+    <Version>2.0-rc.3</Version>
     <Authors>STBI Authors, H. Utku Maden</Authors>
     <Description>
       A C# wrapper for the ubiquitous stb_image.h and stb_image_write.h library.
@@ -26,15 +25,7 @@
     <RepositoryUrl>https://git.mixedup.dev/ReFuel/ReFuel.StbImage</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>stb; stb_image; stbi; image; load; save; read; write</PackageTags>
-    <PackageReleaseNotes># 2.1.0 (ABI BRAKING)
+    <PackageReleaseNotes># 2.0.0
-* Fixed calling convention of unmanaged function pointers. (Thanks NogginBops!)
-* Modified StbiStreamWrapper in order to fixed backing delegates of function pointers from being prematurely collected 
-  by release mode JIT and the GC. StbiStreamWrapper.Callbacks is now a readonly field. (ABI BREAKING)
-
-# 2.0.1
-* Enabled optimizations across the board for native and managed assemblies.
-
-# 2.0.0
 * Exposed stbi_image_write.h
 * Moved native function calls to ReFuel.Stb.Native</PackageReleaseNotes>
   </PropertyGroup>
@@ -56,7 +47,7 @@
     <Content Include="runtimes/linux-arm64/native/*.so">
       <PackagePath>runtimes/linux-arm64/native/</PackagePath>
       <Pack>true</Pack>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest/</CopyToOutputDirectory>
     </Content>
     <Content Include="runtimes/linux-x64/native/*.so">
       <PackagePath>runtimes/linux-x64/native/</PackagePath>

StbImage.cs

@@ -33,7 +33,6 @@ namespace ReFuel.Stb
         /// Internal image format.
         /// </summary>
         public StbiImageFormat Format { get; }
-
         /// <summary>
         /// True if the image is a floating point image.
         /// </summary>
@@ -67,7 +66,7 @@ namespace ReFuel.Stb
                 StbiImageFormat.GreyAlpha => 2,
                 StbiImageFormat.Rgb => 3,
                 StbiImageFormat.Rgba => 4,
-                _ => throw new Exception("unknown image format")
+                _ => throw new Exception("unkown image format")
             } * (IsFloat ? sizeof(float) : sizeof(byte));
 
             return new ReadOnlySpan<T>((T*)ImagePointer, Width * Height * sz / sizeof(T));
@@ -81,7 +80,7 @@ namespace ReFuel.Stb
         /// Incurs a conversion cost if the image format is not a byte format. Affected by non-thread safe global options.
         /// </remarks>
         public void WritePng(Stream dest) => WritePng(AsSpan<byte>(), Width, Height, Format, dest, isFloat: IsFloat);
-
+        
         /// <summary>
         /// Write image to a BMP file.
         /// </summary>
@@ -90,7 +89,7 @@ namespace ReFuel.Stb
         /// Incurs a conversion cost if the image format is not a byte format. Affected by non-thread safe global options.
         /// </remarks>
         public void WriteBmp(Stream dest) => WriteBmp(AsSpan<byte>(), Width, Height, Format, dest, isFloat: IsFloat);
-
+        
         /// <summary>
         /// Write image to a TGA file.
         /// </summary>
@@ -99,7 +98,7 @@ namespace ReFuel.Stb
         /// Incurs a conversion cost if the image format is not a byte format. Ignores alpha channel. Affected by non-thread safe global options.
         /// </remarks>
         public void WriteTga(Stream dest) => WriteTga(AsSpan<byte>(), Width, Height, Format, dest, isFloat: IsFloat);
-
+        
         /// <summary>
         /// Write image to a PNG file.
         /// </summary>
@@ -108,12 +107,11 @@ namespace ReFuel.Stb
         /// Incurs a conversion cost if the image format is not a float format. Affected by non-thread safe global options.
         /// </remarks>
         public void WriteHdr(Stream dest) => WriteHdr(AsSpan<byte>(), Width, Height, Format, dest, isFloat: IsFloat);
-
+        
         /// <summary>
         /// Write image to a PNG file.
         /// </summary>
         /// <param name="dest">The destination stream.</param>
-        /// <param name="quality">The JPEG quality factor.</param>
         /// <remarks>
         /// Incurs a conversion cost if the image format is not a byte format. Ignores alpha channel. Affected by non-thread safe global options.
         /// </remarks>
@@ -151,7 +149,7 @@ namespace ReFuel.Stb
         /// According to the stb_image documentation, only iPhone PNG images
         /// can come with premultiplied alpha.
         /// </remarks>
-        public static bool UnpremultiplyOnLoad { set => Stbi.set_unpremultiply_on_load(value ? 1 : 0); }
+        public static bool UnpremultiplyOnLoad { set => Stbi.set_unpremultiply_on_load(1); }
 
         /// <summary>
         /// Force a filter on PNG filter when saving.
@@ -203,24 +201,22 @@ namespace ReFuel.Stb
         /// <param name="image">The resulting image.</param>
         /// <param name="stream">Source stream.</param>
         /// <param name="format">The desired image format.</param>
-        /// <param name="asFloat">The buffer uses floating point pixels if true.</param>
         /// <returns>True on success.</returns>
         public static bool TryLoad([NotNullWhen(true)] out StbImage? image, Stream stream, StbiImageFormat format = StbiImageFormat.Default, bool asFloat = false)
         {
             int x, y, iFormat;
             StbiStreamWrapper wrapper = new StbiStreamWrapper(stream, true);
+            wrapper.CreateCallbacks(out stbi_io_callbacks cb);
+
             stream.Position = 0;
             IntPtr imagePtr;
-            fixed (stbi_io_callbacks* cb = &wrapper.Callbacks)
+            if (asFloat)
             {
-                if (asFloat)
+                imagePtr = (IntPtr)Stbi.loadf_from_callbacks(&cb, null, &x, &y, &iFormat, (int)format);
-                {
+            }
-                    imagePtr = (IntPtr)Stbi.loadf_from_callbacks(cb, null, &x, &y, &iFormat, (int)format);
+            else
-                }
+            {
-                else
+                imagePtr = (IntPtr)Stbi.load_from_callbacks(&cb, null, &x, &y, &iFormat, (int)format);
-                {
-                    imagePtr = (IntPtr)Stbi.load_from_callbacks(cb, null, &x, &y, &iFormat, (int)format);
-                }
             }
 
             if (imagePtr != IntPtr.Zero)
@@ -241,7 +237,6 @@ namespace ReFuel.Stb
         /// <param name="image">The resulting image.</param>
         /// <param name="span">Source memory span.</param>
         /// <param name="format">The desired image format.</param>
-        /// <param name="asFloat">The buffer uses floating point pixels if true.</param>
         /// <returns>True on success.</returns>
         public static bool TryLoad([NotNullWhen(true)] out StbImage? image, ReadOnlySpan<byte> span, StbiImageFormat format = StbiImageFormat.Default, bool asFloat = false)
         {
@@ -276,7 +271,6 @@ namespace ReFuel.Stb
         /// </summary>
         /// <param name="stream">The stream to load from.</param>
         /// <param name="format">The desired image format.</param>
-        /// <param name="asFloat">The buffer uses floating point pixels if true.</param>
         /// <returns>The image object.</returns>
         public static StbImage Load(Stream stream, StbiImageFormat format = StbiImageFormat.Default, bool asFloat = false)
         {
@@ -294,7 +288,6 @@ namespace ReFuel.Stb
         /// </summary>
         /// <param name="span">The span of memory to load from.</param>
         /// <param name="format">The desired image format.</param>
-        /// <param name="asFloat">The buffer uses floating point pixels if true.</param>
         /// <returns>The image object.</returns>
         public static StbImage Load(ReadOnlySpan<byte> span, StbiImageFormat format = StbiImageFormat.Default, bool asFloat = false)
         {
@@ -319,12 +312,10 @@ namespace ReFuel.Stb
         {
             int x, y, iFormat;
             StbiStreamWrapper wrapper = new StbiStreamWrapper(stream, true);
-            int result;
+            wrapper.CreateCallbacks(out stbi_io_callbacks cb);
+
             stream.Position = 0;
-            fixed (stbi_io_callbacks* cb = &wrapper.Callbacks)
+            int result = Stbi.info_from_callbacks(&cb, null, &x, &y, &iFormat);
-            {
-                result = Stbi.info_from_callbacks(cb, null, &x, &y, &iFormat);
-            }
 
             width = x;
             height = y;
@@ -398,7 +389,7 @@ namespace ReFuel.Stb
         /// <param name="data">Span of pixel data.</param>
         /// <param name="width">Width of the pixel data in pixels.</param>
         /// <param name="height">Height of the pixel data in pixels.</param>
-        /// <param name="format">Color format of the pixel data. Must not be <see cref="StbiImageFormat"/>.</param>
+        /// <param name="format">Color format of the pixel data. Must not be <see cref="StbiImageFormat.StbiImageFormat"/>.</param>
         /// <param name="destination">The destination stream.</param>
         /// <param name="isFloat">True if the pixel format in data is a floating point format.</param>
         /// <remarks>
@@ -434,7 +425,7 @@ namespace ReFuel.Stb
         /// <param name="data">Span of pixel data.</param>
         /// <param name="width">Width of the pixel data in pixels.</param>
         /// <param name="height">Height of the pixel data in pixels.</param>
-        /// <param name="format">Color format of the pixel data. Must not be <see cref="StbiImageFormat"/>.</param>
+        /// <param name="format">Color format of the pixel data. Must not be <see cref="StbiImageFormat.StbiImageFormat"/>.</param>
         /// <param name="destination">The destination stream.</param>
         /// <param name="isFloat">True if the pixel format in data is a floating point format.</param>
         /// <remarks>
@@ -470,7 +461,7 @@ namespace ReFuel.Stb
         /// <param name="data">Span of pixel data.</param>
         /// <param name="width">Width of the pixel data in pixels.</param>
         /// <param name="height">Height of the pixel data in pixels.</param>
-        /// <param name="format">Color format of the pixel data. Must not be <see cref="StbiImageFormat"/>.</param>
+        /// <param name="format">Color format of the pixel data. Must not be <see cref="StbiImageFormat.StbiImageFormat"/>.</param>
         /// <param name="destination">The destination stream.</param>
         /// <param name="isFloat">True if the pixel format in data is a floating point format.</param>
         /// <remarks>
@@ -506,7 +497,7 @@ namespace ReFuel.Stb
         /// <param name="data">Span of pixel data.</param>
         /// <param name="width">Width of the pixel data in pixels.</param>
         /// <param name="height">Height of the pixel data in pixels.</param>
-        /// <param name="format">Color format of the pixel data. Must not be <see cref="StbiImageFormat"/>.</param>
+        /// <param name="format">Color format of the pixel data. Must not be <see cref="StbiImageFormat.StbiImageFormat"/>.</param>
         /// <param name="destination">The destination stream.</param>
         /// <param name="isFloat">True if the pixel format in data is a floating point format.</param>
         /// <remarks>
@@ -542,9 +533,8 @@ namespace ReFuel.Stb
         /// <param name="data">Span of pixel data.</param>
         /// <param name="width">Width of the pixel data in pixels.</param>
         /// <param name="height">Height of the pixel data in pixels.</param>
-        /// <param name="format">Color format of the pixel data. Must not be <see cref="StbiImageFormat"/>.</param>
+        /// <param name="format">Color format of the pixel data. Must not be <see cref="StbiImageFormat.StbiImageFormat"/>.</param>
         /// <param name="destination">The destination stream.</param>
-        /// <param name="quality">The JPEG quality factor.</param>
         /// <param name="isFloat">True if the pixel format in data is a floating point format.</param>
         /// <remarks>
         /// This will incur a conversion cost if the pixel format is not a byte format. Ignores the alpha channel. Affected by global non-thread safe options.
@@ -572,4 +562,4 @@ namespace ReFuel.Stb
                 Stbi.write_jpg_to_func(wrapper, null, width, height, components, ptr, quality);
         }
     }
-}
+}

StbiStreamWrapper.cs

@@ -12,32 +12,26 @@ namespace ReFuel.Stb
     /// <param name="buffer">C array to read into.</param>
     /// <param name="count">Size of the C array in bytes.</param>
     /// <returns>The number of bytes read from the stream.</returns>
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public unsafe delegate int StbiReadProc(void *userdata, byte* buffer, int count);
-
     /// <summary>
     /// Pointer to STBI stream skip function.
     /// </summary>
     /// <param name="userdata">User provided userdata pointer.</param>
     /// <param name="count">Number of bytes to skip.</param>
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public unsafe delegate void StbiSkipProc(void *userdata, int count);
-
     /// <summary>
     /// Pointer to STBI stream end of file function.
     /// </summary>
     /// <param name="userdata">User provided userdata pointer.</param>
     /// <returns>Non-zero value if the end of the stream has been reached.</returns>
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public unsafe delegate int StbiEofProc(void *userdata);
 
     /// <summary>
-    /// An easy-to-use stream wrapper for use with STBI image load functions.
+    /// An easy to use stream wrapper for use with STBI image load functions.
     /// </summary>
     public unsafe class StbiStreamWrapper : IDisposable
     {
-        public readonly stbi_io_callbacks Callbacks;
+        private readonly stbi_io_callbacks _callbacks;
-
         private readonly Stream _stream;
         private readonly bool _keepOpen;
         private bool _isDisposed;
@@ -46,6 +40,8 @@ namespace ReFuel.Stb
         private StbiSkipProc _skipCb;
         private StbiEofProc _eofCb;
 
+        public ref readonly stbi_io_callbacks Callbacks => ref _callbacks;
+
         public StbiStreamWrapper(Stream stream, bool keepOpen = false)
         {
             if (stream == null) throw new ArgumentNullException(nameof(stream));
@@ -57,10 +53,18 @@ namespace ReFuel.Stb
             _skipCb = SkipCb;
             _eofCb = EofCb;
 
-            Callbacks = default;
+            _callbacks = default;
-            Callbacks.read = Marshal.GetFunctionPointerForDelegate<StbiReadProc>(_readCb);
+            _callbacks.read = Marshal.GetFunctionPointerForDelegate<StbiReadProc>(_readCb);
-            Callbacks.skip = Marshal.GetFunctionPointerForDelegate<StbiSkipProc>(_skipCb);
+            _callbacks.skip = Marshal.GetFunctionPointerForDelegate<StbiSkipProc>(_skipCb);
-            Callbacks.eof = Marshal.GetFunctionPointerForDelegate<StbiEofProc>(_eofCb);
+            _callbacks.eof = Marshal.GetFunctionPointerForDelegate<StbiEofProc>(_eofCb);
+        }
+
+        public void CreateCallbacks(out stbi_io_callbacks cb)
+        {
+            cb = default;
+            cb.read = Marshal.GetFunctionPointerForDelegate<StbiReadProc>(_readCb);
+            cb.skip = Marshal.GetFunctionPointerForDelegate<StbiSkipProc>(_skipCb);
+            cb.eof = Marshal.GetFunctionPointerForDelegate<StbiEofProc>(_eofCb);
         }
 
         private int ReadCb(void *userdata, byte* buffer, int count)
@@ -119,4 +123,4 @@ namespace ReFuel.Stb
 
         public static implicit operator IntPtr(in StbiWriteStreamWrapper wrapper) => wrapper.Callback;
     }
-}
+}

StbiWrite.cs

@@ -9,7 +9,6 @@ namespace ReFuel.Stb.Native
     /// <param name="context">User provided context pointer.</param>
     /// <param name="data">C Array of data to write.</param>
     /// <param name="size">Size of the C array in bytes.</param>
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public unsafe delegate void StbiWriteProc(void* context, void* data, int size);
 
     public unsafe partial class Stbi
@@ -25,7 +24,7 @@ namespace ReFuel.Stb.Native
         }
 
         public static int write_png_compression_level
-        {
+        { 
             get => *_png_compression_level_ptr;
             set => *_png_compression_level_ptr = value;
         }

build_native.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 cd $(dirname "$0")
 ./docker-cross-compiler/sh/build_native.sh .
-dotnet build -c Release
+dotnet build

docker-cross-compiler

@@ -1 +1 @@
-Subproject commit d0f5760c7a7995cec50bf31fef78f5408445f27c
+Subproject commit 5901e3e317571bce4a8772e2e994aaaadeae828e

stb

@@ -1 +1 @@
-Subproject commit f7f20f39fe4f206c6f19e26ebfef7b261ee59ee4
+Subproject commit 013ac3beddff3dbffafd5177e7972067cd2b5083