Update packages

waacton · waacton · commit a2d4cec3b622 · 2025-08-31T12:41:49.000+01:00
diff --git a/Example.Diagrams/Example.Diagrams.csproj b/Example.Diagrams/Example.Diagrams.csproj
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="ScottPlot" Version="5.0.55" />
+      <PackageReference Include="ScottPlot" Version="5.0.56" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Example.Gradients/Example.Gradients.csproj b/Example.Gradients/Example.Gradients.csproj
@@ -13,8 +13,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp" Version="3.1.8" />
-      <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
+      <PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
+      <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Example.Heatmaps/Example.Heatmaps.csproj b/Example.Heatmaps/Example.Heatmaps.csproj
@@ -13,8 +13,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp" Version="3.1.8" />
-      <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
+      <PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
+      <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Unicolour.Tests/IccConversionTests.cs b/Unicolour.Tests/IccConversionTests.cs
@@ -9,7 +9,7 @@
 namespace Wacton.Unicolour.Tests;
 
 /*
- * test data extracted from ICC's demonstration implementation of iccMAX
+ * test data extracted from ICC reference implementation of iccMAX
  * (https://github.com/InternationalColorConsortium/DemoIccMAX)
  * if these values are wrong because the ICC can't write software
  * that conforms to their own complex specification
diff --git a/Unicolour.sln.DotSettings b/Unicolour.sln.DotSettings
@@ -1,13 +1,19 @@
 ﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=achromatopsia/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=berns/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=chromaticities/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=chromaticity/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ciecam/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=cieluv/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ciexyz/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=cividis/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=clut/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=colourmap/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=colourmaps/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=companding/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=cubehelix/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=deuteranomaly/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=deuteranopia/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ebner/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=fairchild/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hpluv/@EntryIndexedValue">True</s:Boolean>
@@ -16,10 +22,13 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ictcp/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=jzazbz/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=jzczhz/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=kries/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=kubelka/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=lchab/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=lchuv/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=luts/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=metamerism/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=monochromacy/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=munk/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=munsell/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=nord/@EntryIndexedValue">True</s:Boolean>
@@ -32,7 +41,14 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=oklrab/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=oklrch/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=planckian/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=premultipied/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=protanomaly/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=protanopia/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=secam/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=spectrally/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=tristimulus/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=tritanomaly/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=tritanopia/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unicolour/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=viridis/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=vlag/@EntryIndexedValue">True</s:Boolean>
diff --git a/Unicolour/Adaptation.cs b/Unicolour/Adaptation.cs
@@ -3,7 +3,7 @@ namespace Wacton.Unicolour;
 // http://www.brucelindbloom.com/index.html?Eqn_ChromAdapt.html
 public static class Adaptation
 {
-    // HPE for LMS conversion is the matrix originallu used in the von Kries transformation for chromatic adaptation
+    // HPE for LMS conversion is the matrix originally used in the von Kries transformation for chromatic adaptation
     // doesn't matter that it's D65-relative; during adaptation both source & destination use D65 as a common relative space
     public static readonly double[,] VonKries = Lms.HuntPointerEstevez.Data;
     
diff --git a/Unicolour/Icc/DataTypes.cs b/Unicolour/Icc/DataTypes.cs
@@ -107,10 +107,10 @@ internal static XyzType ReadXyzType(this Stream stream)
         return new XyzType(x, y, z);
     }
     
-    internal static double[] ToArray(this (double x, double y, double z) tuple)
-    {
-        return new [] { tuple.x, tuple.y, tuple.z };
-    }
+    // internal static double[] ToArray(this (double x, double y, double z) tuple)
+    // {
+    //     return new [] { tuple.x, tuple.y, tuple.z };
+    // }
 }
 
 // the ICC specification distinguishes between "XyzNumber" and "XyzType"
diff --git a/Unicolour/Icc/Transform.cs b/Unicolour/Icc/Transform.cs
@@ -24,7 +24,7 @@ internal abstract class Transform
      * - "If the spectral viewing conditions are set to use D50 with 2 degree observer, then the standard V4 XYZ illuminant values will be used.
      *    Otherwise the header illuminant XYZ values get used"
      */
-    private double[] PcsIlluminant => RefWhite; 
+    private static double[] PcsIlluminant => RefWhite; 
 
     private readonly bool hasPerceptualHandling;
     

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ namespace Wacton.Unicolour;`
`3`	`3`	`// http://www.brucelindbloom.com/index.html?Eqn_ChromAdapt.html`
`4`	`4`	`public static class Adaptation`
`5`	`5`	`{`
`6`		`- // HPE for LMS conversion is the matrix originallu used in the von Kries transformation for chromatic adaptation`
	`6`	`+ // HPE for LMS conversion is the matrix originally used in the von Kries transformation for chromatic adaptation`
`7`	`7`	`// doesn't matter that it's D65-relative; during adaptation both source & destination use D65 as a common relative space`
`8`	`8`	`public static readonly double[,] VonKries = Lms.HuntPointerEstevez.Data;`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,10 @@ internal static XyzType ReadXyzType(this Stream stream)`
`107`	`107`	`return new XyzType(x, y, z);`
`108`	`108`	`}`
`109`	`109`
`110`		`- internal static double[] ToArray(this (double x, double y, double z) tuple)`
`111`		`- {`
`112`		`- return new [] { tuple.x, tuple.y, tuple.z };`
`113`		`- }`
	`110`	`+ // internal static double[] ToArray(this (double x, double y, double z) tuple)`
	`111`	`+ // {`
	`112`	`+ // return new [] { tuple.x, tuple.y, tuple.z };`
	`113`	`+ // }`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`// the ICC specification distinguishes between "XyzNumber" and "XyzType"`