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">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>disable</Nullable>
+    <LangVersion>7.3</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>1.1.0-rc0</Version>
     <Authors>STBI Authors, H. Utku Maden</Authors>
     <Description>
       A C# wrapper for the ubiquitous stb_image.h and stb_image_write.h library.
@@ -22,21 +21,6 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageIcon>images\icon.png</PackageIcon>
-    <PackageProjectUrl>https://refuel.mixedup.dev/docs/ReFuel.StbImage.html</PackageProjectUrl>
-    <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)
-* 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>
 
   <!--
@@ -46,8 +30,8 @@
     that determines a lot of load paths for projects.
   -->
   <ItemGroup>
-    <Content Include="*.md" Pack="true" PackagePath="/" />
-    <None Include="rf_stbimage.png" Pack="true" PackagePath="images\icon.png" />
+    <Content Include="*.md" Pack="true" PackagePath="/"/>
+    <None Include="rf_stbimage.png" Pack="true" PackagePath="images\icon.png"/>
     <Content Include="runtimes/linux-arm/native/*.so">
       <PackagePath>runtimes/linux-arm/native/</PackagePath>
       <Pack>true</Pack>
@@ -56,7 +40,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

@@ -1,6 +1,4 @@
-using ReFuel.Stb.Native;
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.InteropServices;
 
@@ -33,7 +31,6 @@ namespace ReFuel.Stb
         /// Internal image format.
         /// </summary>
         public StbiImageFormat Format { get; }
-
         /// <summary>
         /// True if the image is a floating point image.
         /// </summary>
@@ -53,72 +50,6 @@ namespace ReFuel.Stb
             Dispose(false);
         }
 
-        /// <summary>
-        /// Get a safe span to the image pointer.
-        /// </summary>
-        /// <typeparam name="T">The pixel type.</typeparam>
-        /// <returns>A span to the image data.</returns>
-        /// <exception cref="Exception">The image uses an unexpected image format.</exception>
-        public ReadOnlySpan<T> AsSpan<T>() where T : unmanaged
-        {
-            int sz = Format switch
-            {
-                StbiImageFormat.Grey => 1,
-                StbiImageFormat.GreyAlpha => 2,
-                StbiImageFormat.Rgb => 3,
-                StbiImageFormat.Rgba => 4,
-                _ => throw new Exception("unknown image format")
-            } * (IsFloat ? sizeof(float) : sizeof(byte));
-
-            return new ReadOnlySpan<T>((T*)ImagePointer, Width * Height * sz / sizeof(T));
-        }
-
-        /// <summary>
-        /// Write image to a PNG file.
-        /// </summary>
-        /// <param name="dest">The destination stream.</param>
-        /// <remarks>
-        /// 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>
-        /// <param name="dest">The destination stream.</param>
-        /// <remarks>
-        /// 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>
-        /// <param name="dest">The destination stream.</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>
-        public void WriteTga(Stream dest) => WriteTga(AsSpan<byte>(), Width, Height, Format, dest, isFloat: IsFloat);
-
-        /// <summary>
-        /// Write image to a PNG file.
-        /// </summary>
-        /// <param name="dest">The destination stream.</param>
-        /// <remarks>
-        /// 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>
-        public void WriteJpg(Stream dest, int quality = 90) => WriteJpg(AsSpan<byte>(), Width, Height, Format, dest, quality: quality, isFloat: IsFloat);
-
         public void Dispose() => Dispose(true);
 
         private void Dispose(bool disposing)
@@ -137,12 +68,7 @@ namespace ReFuel.Stb
         /// <summary>
         /// Set to flip the y-axis of loaded images on load.
         /// </summary>
-        public static bool FlipVerticallyOnLoad { set => Stbi.set_flip_vertically_on_load(value ? 1 : 0); }
-
-        /// <summary>
-        /// Set to flip the y-axis of saved images.
-        /// </summary>
-        public static bool FlipVerticallyOnSave { set => Stbi.flip_vertically_on_write(value ? 1 : 0); }
+        public static bool FlipVerticallyOnLoad { set => Stbi.set_flip_vertically_on_load(1); }
 
         /// <summary>
         /// Set to unpremultiply images on load.
@@ -151,51 +77,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); }
-
-        /// <summary>
-        /// Force a filter on PNG filter when saving.
-        /// </summary>
-        /// <remarks>
-        /// -1 for auto, 0 through 5 to pick a filter. Higher is more. Not thread safe.
-        /// </remarks>
-        public static int WriteForcePngFilter
-        {
-            get => Stbi.write_force_png_filter;
-            set
-            {
-                if (value < -1 || value > 5)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), "The PNG filter must be in the range 0 to 5, or -1 for auto.");
-                }
-
-                Stbi.write_force_png_filter = value;
-            }
-        }
-
-        /// <summary>
-        /// Change the PNG compression level on save.
-        /// </summary>
-        /// <remarks>
-        /// Higher is more. Defaults to 8. Not thread safe.
-        /// </remarks>
-        public static int WritePngCompressionLevel
-        {
-            get => Stbi.write_png_compression_level;
-            set => Stbi.write_png_compression_level = value;
-        }
-
-        /// <summary>
-        /// Enable run length encoding on TGA images on save.
-        /// </summary>
-        /// <remarks>
-        /// Not thread safe.
-        /// </remarks>
-        public static bool WriteTgaEnableRLE
-        {
-            get => Stbi.write_tga_with_rle != 0;
-            set => Stbi.write_tga_with_rle = value ? 1 : 0;
-        }
+        public static bool UnpremultiplyOnLoad { set => Stbi.set_unpremultiply_on_load(1); }
 
         /// <summary>
         /// Try loading an image, without raising exceptions.
@@ -203,29 +85,27 @@ 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)
+        public static bool TryLoad(out StbImage image, Stream stream, StbiImageFormat format = StbiImageFormat.Default, bool isFloat = 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 (isFloat)
             {
-                if (asFloat)
-                {
-                    imagePtr = (IntPtr)Stbi.loadf_from_callbacks(cb, null, &x, &y, &iFormat, (int)format);
-                }
-                else
-                {
-                    imagePtr = (IntPtr)Stbi.load_from_callbacks(cb, null, &x, &y, &iFormat, (int)format);
-                }
+                imagePtr = (IntPtr)Stbi.loadf_from_callbacks(&cb, null, &x, &y, &iFormat, (int)format);
+            }
+            else
+            {
+                imagePtr = (IntPtr)Stbi.load_from_callbacks(&cb, null, &x, &y, &iFormat, (int)format);
             }
 
             if (imagePtr != IntPtr.Zero)
             {
-                image = new StbImage(imagePtr, x, y, (StbiImageFormat)iFormat, asFloat);
+                image = new StbImage(imagePtr, x, y, (StbiImageFormat)iFormat, isFloat);
                 return true;
             }
             else
@@ -241,26 +121,26 @@ 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)
+        public static bool TryLoad<T>(out StbImage image, ReadOnlySpan<T> span, StbiImageFormat format = StbiImageFormat.Default, bool isFloat = false)
+            where T : unmanaged
         {
             IntPtr imagePtr = IntPtr.Zero;
             int x, y, iFormat;
             fixed (byte *ptr = MemoryMarshal.AsBytes(span))
             {
-                if (asFloat)
+                if (isFloat)
                 {
-                    imagePtr = (IntPtr)Stbi.loadf_from_memory(ptr, span.Length, &x, &y, &iFormat, (int)format);
+                    imagePtr = (IntPtr)Stbi.loadf_from_memory(ptr, span.Length * sizeof(T), &x, &y, &iFormat, (int)format);
                 }
                 else
                 {
-                    imagePtr = (IntPtr)Stbi.load_from_memory(ptr, span.Length, &x, &y, &iFormat, (int)format);
+                    imagePtr = (IntPtr)Stbi.load_from_memory(ptr, span.Length * sizeof(T), &x, &y, &iFormat, (int)format);
                 }
 
                 if (imagePtr != IntPtr.Zero)
                 {
-                    image = new StbImage(imagePtr, x, y, (StbiImageFormat)iFormat, asFloat);
+                    image = new StbImage(imagePtr, x, y, (StbiImageFormat)iFormat, isFloat);
                     return true;
                 }
                 else
@@ -276,16 +156,15 @@ 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)
+        public static StbImage Load(Stream stream, StbiImageFormat format = StbiImageFormat.Default, bool isFloat = false)
         {
-            if (TryLoad(out StbImage? image, stream, format, asFloat))
+            if (TryLoad(out StbImage image, stream, format, isFloat))
             {
                 return image;
             }
 
-            string reason = Marshal.PtrToStringUTF8((IntPtr)Stbi.failure_reason())!;
+            string reason = Marshal.PtrToStringUTF8((IntPtr)Stbi.failure_reason());
             throw new Exception($"Failed to load image: {reason}");
         }
 
@@ -294,16 +173,16 @@ 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)
+        public static StbImage Load<T>(ReadOnlySpan<T> span, StbiImageFormat format = StbiImageFormat.Default, bool isFloat = false)
+            where T : unmanaged
         {
-            if (TryLoad(out StbImage? image, span, format, asFloat))
+            if (TryLoad(out StbImage image, span, format, isFloat))
             {
                 return image;
             }
 
-            string reason = Marshal.PtrToStringUTF8((IntPtr)Stbi.failure_reason())!;
+            string reason = Marshal.PtrToStringUTF8((IntPtr)Stbi.failure_reason());
             throw new Exception($"Failed to load image: {reason}");
         }
 
@@ -319,12 +198,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)
-            {
-                result = Stbi.info_from_callbacks(cb, null, &x, &y, &iFormat);
-            }
+            int result = Stbi.info_from_callbacks(&cb, null, &x, &y, &iFormat);
 
             width = x;
             height = y;
@@ -353,223 +230,5 @@ namespace ReFuel.Stb
                 return result != 0;
             }
         }
-
-        private static int Components(StbiImageFormat format) => format switch
-        {
-            StbiImageFormat.Grey => 1,
-            StbiImageFormat.GreyAlpha => 2,
-            StbiImageFormat.Rgb => 3,
-            StbiImageFormat.Rgba => 4,
-            _ => throw new ArgumentException("Expected a fully qualified format.")
-        };
-
-        private static byte[] ConvertFloatToByte<T>(ReadOnlySpan<T> source, int width, int height, int components)
-            where T : unmanaged
-        {
-            byte[] conversion = new byte[width * height * components];
-            ReadOnlySpan<float> dataAsFloat = MemoryMarshal.Cast<T, float>(source);
-
-            for (int i = 0; i<conversion.Length; i++)
-            {
-                conversion[i] = (byte) Math.Clamp(MathF.Round(dataAsFloat[i]* 255), 0, 255);
-            }
-
-            return conversion;
-        }
-
-        private static float[] ConvertByteToFloat<T>(ReadOnlySpan<T> source, int width, int height, int components)
-            where T : unmanaged
-        {
-            float[] conversion = new float[width * height * components];
-            ReadOnlySpan<byte> dataAsByte = MemoryMarshal.Cast<T, byte>(source);
-
-            for (int i = 0; i < conversion.Length; i++)
-            {
-                conversion[i] = Math.Clamp(dataAsByte[i]/255f, 0f, 1f);
-            }
-
-            return conversion;
-        }
-
-        /// <summary>
-        /// Write any image to a PNG file.
-        /// </summary>
-        /// <typeparam name="T">Any packed byte or float array structure.</typeparam>
-        /// <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="destination">The destination stream.</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. Affected by global non-thread safe options.
-        /// </remarks>
-        public static void WritePng<T>(ReadOnlySpan<T> data, int width, int height, StbiImageFormat format, Stream destination, bool isFloat = false)
-            where T : unmanaged
-        {
-            int components = Components(format);
-            ReadOnlySpan<byte> source;
-            byte[]? conversion;
-
-            if (isFloat)
-            {
-                conversion = ConvertFloatToByte(data, width, height, components);
-                source = conversion;
-            }
-            else
-            {
-                source = MemoryMarshal.AsBytes(data);
-            }
-
-            StbiWriteStreamWrapper wrapper = new StbiWriteStreamWrapper(destination);
-
-            fixed (byte *ptr = source)
-                Stbi.write_png_to_func(wrapper, null, width, height, components, ptr, width * components);
-        }
-
-        /// <summary>
-        /// Write any image to a BMP file.
-        /// </summary>
-        /// <typeparam name="T">Any packed byte or float array structure.</typeparam>
-        /// <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="destination">The destination stream.</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.
-        /// </remarks>
-        public static void WriteBmp<T>(ReadOnlySpan<T> data, int width, int height, StbiImageFormat format, Stream destination, bool isFloat = false)
-            where T : unmanaged
-        {
-            int components = Components(format);
-            ReadOnlySpan<byte> source;
-            byte[]? conversion;
-
-            if (isFloat)
-            {
-                conversion = ConvertFloatToByte(data, width, height, components);
-                source = conversion;
-            }
-            else
-            {
-                source = MemoryMarshal.AsBytes(data);
-            }
-
-            StbiWriteStreamWrapper wrapper = new StbiWriteStreamWrapper(destination);
-
-            fixed (byte* ptr = source)
-                Stbi.write_bmp_to_func(wrapper, null, width, height, components, ptr);
-        }
-
-        /// <summary>
-        /// Write any image to a TGA file.
-        /// </summary>
-        /// <typeparam name="T">Any packed byte or float array structure.</typeparam>
-        /// <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="destination">The destination stream.</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. Affected by global non-thread safe options.
-        /// </remarks>
-        public static void WriteTga<T>(ReadOnlySpan<T> data, int width, int height, StbiImageFormat format, Stream destination, bool isFloat = false)
-            where T : unmanaged
-        {
-            int components = Components(format);
-            ReadOnlySpan<byte> source;
-            byte[]? conversion;
-
-            if (isFloat)
-            {
-                conversion = ConvertFloatToByte(data, width, height, components);
-                source = conversion;
-            }
-            else
-            {
-                source = MemoryMarshal.AsBytes(data);
-            }
-
-            StbiWriteStreamWrapper wrapper = new StbiWriteStreamWrapper(destination);
-
-            fixed (byte* ptr = source)
-                Stbi.write_tga_to_func(wrapper, null, width, height, components, ptr);
-        }
-
-        /// <summary>
-        /// Write any image to a PNG file.
-        /// </summary>
-        /// <typeparam name="T">Any packed byte or float array structure.</typeparam>
-        /// <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="destination">The destination stream.</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 float format. Affected by global non-thread safe options.
-        /// </remarks>
-        public static void WriteHdr<T>(ReadOnlySpan<T> data, int width, int height, StbiImageFormat format, Stream destination, bool isFloat = false)
-            where T : unmanaged
-        {
-            int components = Components(format);
-            ReadOnlySpan<float> source;
-            float[]? conversion;
-
-            if (!isFloat)
-            {
-                conversion = ConvertByteToFloat(data, width, height, components);
-                source = conversion;
-            }
-            else
-            {
-                source = MemoryMarshal.Cast<T, float>(data);
-            }
-
-            StbiWriteStreamWrapper wrapper = new StbiWriteStreamWrapper(destination);
-
-            fixed (float* ptr = source)
-                Stbi.write_hdr_to_func(wrapper, null, width, height, components, ptr);
-        }
-
-        /// <summary>
-        /// Write any image to a PNG file.
-        /// </summary>
-        /// <typeparam name="T">Any packed byte or float array structure.</typeparam>
-        /// <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="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.
-        /// </remarks>
-        public static void WriteJpg<T>(ReadOnlySpan<T> data, int width, int height, StbiImageFormat format, Stream destination, int quality = 90, bool isFloat = false)
-            where T : unmanaged
-        {
-            int components = Components(format);
-            ReadOnlySpan<byte> source;
-            byte[]? conversion;
-
-            if (isFloat)
-            {
-                conversion = ConvertFloatToByte(data, width, height, components);
-                source = conversion;
-            }
-            else
-            {
-                source = MemoryMarshal.AsBytes(data);
-            }
-
-            StbiWriteStreamWrapper wrapper = new StbiWriteStreamWrapper(destination);
-
-            fixed (byte* ptr = source)
-                Stbi.write_jpg_to_func(wrapper, null, width, height, components, ptr, quality);
-        }
     }
 }

Stbi.Manual.cs

@@ -1,16 +1,14 @@
 using System;
+using System.IO;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Reflection;
 
-namespace ReFuel.Stb.Native
+namespace ReFuel.Stb
 {
-    /// <summary>
-    /// Direct access to the native STBI function calls.
-    /// </summary>
     public unsafe static partial class Stbi
     {
         private delegate void FailedAssertProc(byte *expression, byte *file, int line, byte *function);
-        private static IntPtr stbiHandle;
 
         private static readonly string[] LibraryNames = new string[] 
         {
@@ -31,33 +29,22 @@ namespace ReFuel.Stb.Native
         static Stbi()
         {
             NativeLibrary.SetDllImportResolver(Assembly.GetExecutingAssembly(), Resolver);
-
-            // Dummy call to fail_reason so we have a handle to STBI.
-            failure_reason();
-
-            // Load global address pointers.
-
-            _tga_with_rle_ptr = (int*)NativeLibrary.GetExport(stbiHandle, "stbi_write_tga_with_rle");
-            _png_compression_level_ptr = (int*)NativeLibrary.GetExport(stbiHandle, "stbi_write_png_compression_level");
-            _force_png_filter_ptr = (int*)NativeLibrary.GetExport(stbiHandle, "stbi_write_force_png_filter");
         }
 
         private static IntPtr Resolver(string libraryName, Assembly assembly, DllImportSearchPath? searchPath)
         {
             if (libraryName != "stbi")
                 return IntPtr.Zero;
-            else if (stbiHandle != IntPtr.Zero)
-                return stbiHandle;
 
             foreach (string name in LibraryNames)
             {
-                if (NativeLibrary.TryLoad(name, assembly, searchPath, out stbiHandle))
+                if (NativeLibrary.TryLoad(name, assembly, searchPath, out IntPtr handle))
                 {
-                    return stbiHandle;
+                    return handle;
                 }
             }
 
-            return stbiHandle = NativeLibrary.Load(libraryName);
+            return NativeLibrary.Load(libraryName);
         }
     }
 }

Stbi.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace ReFuel.Stb.Native
+namespace ReFuel.Stb
 {
     public enum StbiEnum : uint
     {

StbiImageFormat.cs

@@ -1,10 +1,5 @@
-using ReFuel.Stb.Native;
-
 namespace ReFuel.Stb
 {
-    /// <summary>
-    /// Enumeration of supported STBI image formats.
-    /// </summary>
     public enum StbiImageFormat
     {
         Default     = (int)StbiEnum.STBI_default,

StbiStreamWrapper.cs

@@ -1,45 +1,17 @@
-using ReFuel.Stb.Native;
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
 
 namespace ReFuel.Stb
 {
-    /// <summary>
-    /// Pointer to STBI stream read function.
-    /// </summary>
-    /// <param name="userdata">User provided userdata pointer.</param>
-    /// <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.
-    /// </summary>
     public unsafe class StbiStreamWrapper : IDisposable
     {
-        public readonly stbi_io_callbacks Callbacks;
-
-        private readonly Stream _stream;
-        private readonly bool _keepOpen;
+        private Stream _stream;
+        private bool _keepOpen;
         private bool _isDisposed;
 
         private StbiReadProc _readCb;
@@ -56,11 +28,14 @@ namespace ReFuel.Stb
             _readCb = ReadCb;
             _skipCb = SkipCb;
             _eofCb = EofCb;
+        }
 
-            Callbacks = default;
-            Callbacks.read = Marshal.GetFunctionPointerForDelegate<StbiReadProc>(_readCb);
-            Callbacks.skip = Marshal.GetFunctionPointerForDelegate<StbiSkipProc>(_skipCb);
-            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)
@@ -90,33 +65,4 @@ namespace ReFuel.Stb
             _isDisposed = true;
         }
     }
-
-    /// <summary>
-    /// An easy to use stream wrapper for STBI image write functions.
-    /// </summary>
-    /// <remarks>Keep object alive for the duration of the write operation.</remarks>
-    public class StbiWriteStreamWrapper
-    {
-        private readonly Stream _stream;
-        private readonly StbiWriteProc _cb;
-
-        public IntPtr Callback { get; }
-
-        public StbiWriteStreamWrapper(Stream stream)
-        {
-            _stream = stream;
-            unsafe
-            {
-                _cb = WriteCb;
-            }
-            Callback = Marshal.GetFunctionPointerForDelegate(_cb);
-        }
-
-        private unsafe void WriteCb(void *context, void *data, int size)
-        {
-            _stream.Write(new ReadOnlySpan<byte>((byte*)data, size));
-        }
-
-        public static implicit operator IntPtr(in StbiWriteStreamWrapper wrapper) => wrapper.Callback;
-    }
 }

StbiWrite.cs

@@ -1,22 +1,15 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace ReFuel.Stb.Native
+namespace ReFuel.Stb
 {
-    /// <summary>
-    /// Procedure to STBI image write function.
-    /// </summary>
-    /// <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
     {
         private static readonly int* _tga_with_rle_ptr;
         private static readonly int* _png_compression_level_ptr;
-        private static readonly int* _force_png_filter_ptr;
+        private static readonly int* _forced_png_filter_ptr;
 
         public static int write_tga_with_rle
         {
@@ -32,8 +25,8 @@ namespace ReFuel.Stb.Native
 
         public static int write_force_png_filter
         {
-            get => *_force_png_filter_ptr;
-            set => *_force_png_filter_ptr = value;
+            get => *_forced_png_filter_ptr;
+            set => *_forced_png_filter_ptr = value;
         }
 
         [DllImport("stbi", CallingConvention = CallingConvention.Cdecl, EntryPoint = "stbi_write_png_to_func")]

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

rf_stbi.h

@@ -7,7 +7,6 @@
 #define STBI_NO_THREAD_LOCALS 1
 #include "stb/stb_image.h"
 
-#define STBIWDEF RFEXTERN
 #define STBI_WRITE_NO_STDIO 1
 #include "stb/stb_image_write.h"
 

stb

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