v0.12.0

saucecontrol · Apr 11, 2021 · 9bada99 · 9bada99
1 parent c6f1828
commit 9bada99
Show file tree

Hide file tree

Showing 19 changed files with 137 additions and 126 deletions.
diff --git a/doc/docfx.json b/doc/docfx.json
@@ -5,13 +5,13 @@
         {
           "src": "../",
           "files": [
-            "out/bin/MagicScaler/Dist/netcoreapp3.0/PhotoSauce.MagicScaler.dll"
+            "out/bin/MagicScaler/Dist/netcoreapp3.1/PhotoSauce.MagicScaler.dll"
           ]
         }
       ],
       "dest": "../out/doc/api",
       "properties": {
-          "TargetFramework": "netcoreapp3.0",
+          "TargetFramework": "netcoreapp3.1",
           "Configuration": "Dist"
       }
     }
@@ -35,7 +35,7 @@
     "markdownEngineName": "markdig",
     "postProcessors": "ExtractSearchIndex",
     "globalMetadata": {
-      "_appFooter": "<span>Copyright © 2020 Clinton Ingram<br>Generated with <strong>DocFX</strong></span>",
+      "_appFooter": "<span>Copyright © 2021 Clinton Ingram<br>Generated with <strong>DocFX</strong></span>",
       "_appTitle": "PhotoSauce Documentation",
       "_enableSearch": true,
       "_enableNewTab": false,

diff --git a/doc/images/IMG_2301-ImageSharp.jpg b/doc/images/IMG_2301-ImageSharp.jpg
diff --git a/doc/images/IMG_2301-MagicScaler.jpg b/doc/images/IMG_2301-MagicScaler.jpg
diff --git a/doc/images/IMG_2301-NetVips.jpg b/doc/images/IMG_2301-NetVips.jpg
diff --git a/doc/images/IMG_2301-SkiaSharpCanvas.jpg b/doc/images/IMG_2301-SkiaSharpCanvas.jpg
diff --git a/doc/images/IMG_2445-ImageSharp.jpg b/doc/images/IMG_2445-ImageSharp.jpg
diff --git a/doc/images/IMG_2445-MagicScaler.jpg b/doc/images/IMG_2445-MagicScaler.jpg
diff --git a/doc/images/IMG_2445-NetVips.jpg b/doc/images/IMG_2445-NetVips.jpg
diff --git a/doc/images/IMG_2445-SkiaSharpCanvas.jpg b/doc/images/IMG_2445-SkiaSharpCanvas.jpg
diff --git a/doc/images/IMG_2525-ImageSharp.jpg b/doc/images/IMG_2525-ImageSharp.jpg
diff --git a/doc/images/IMG_2525-MagicScaler.jpg b/doc/images/IMG_2525-MagicScaler.jpg
diff --git a/doc/images/IMG_2525-NetVips.jpg b/doc/images/IMG_2525-NetVips.jpg
diff --git a/doc/images/IMG_2525-SkiaSharpCanvas.jpg b/doc/images/IMG_2525-SkiaSharpCanvas.jpg
diff --git a/doc/images/sample-ImageSharp.jpg b/doc/images/sample-ImageSharp.jpg
diff --git a/doc/images/sample-NetVips.jpg b/doc/images/sample-NetVips.jpg
diff --git a/doc/images/sample-SkiaSharpCanvas.jpg b/doc/images/sample-SkiaSharpCanvas.jpg
diff --git a/readme.md b/readme.md
diff --git a/src/MagicScaler/Magic/OctreeQuantizer.cs b/src/MagicScaler/Magic/OctreeQuantizer.cs
@@ -1112,6 +1112,10 @@ private static void initFreeList(Span<ushort> listBuff)
 			Unsafe.InitBlockUnaligned(ref listPtr, 0, reserveNodes * sizeof(ushort));
 		}
 
+		// TODO Check/log RyuJIT issue. All the static methods on the node structs should be instance methods or simply direct
+		// accesses to the fixed fields, but the JIT currently inserts extraneous null checks on pointer deref when inlining them.
+		// For the same reason, the fields are not used in the methods; we cast the node to the field type and offset manually.
+		// Related: https://github.com/dotnet/runtime/issues/37727
 		[StructLayout(LayoutKind.Explicit)]
 		private struct HistogramNode
 		{
@@ -1128,8 +1132,6 @@ private struct HistogramNode
 
 			public static ReadOnlySpan<byte> SumsMask => new byte[] { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f };
 
-			// TODO Check/log RyuJIT issue. All the following static methods should be instance methods
-			// but the JIT currently inserts extraneous null checks on pointer deref when inlining them.
 			[MethodImpl(MethodImplOptions.AggressiveInlining)]
 			public static void AddSample(HistogramNode* node, uint bgr)
 			{
@@ -1213,7 +1215,7 @@ private struct PaletteMapNode
 			[FieldOffset(0)]
 			public fixed byte PaletteIndices[8];
 			[FieldOffset(12)]
-			public int LeafValue;
+			public uint LeafValue;
 
 			[MethodImpl(MethodImplOptions.AggressiveInlining)]
 			public static bool HasChildren(PaletteMapNode* node)

diff --git a/src/WebRSize/WebRSize.csproj b/src/WebRSize/WebRSize.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<VersionPrefix>0.6.2</VersionPrefix>
+		<VersionPrefix>0.6.3</VersionPrefix>
 		<TargetFrameworks>net472</TargetFrameworks>
 		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net461</TargetFrameworks>
 	</PropertyGroup>