Fix CMYK PSD color preview

PhotoLocator/BitmapOperations/FloatBitmap.cs

@@ -53,7 +53,7 @@ public FloatBitmap(BitmapSource source, double gamma)
 
         public override string ToString()
         {
-            return Stride + " x " + Height;
+            return $"{Width}x{Height}x{PlaneCount}";
         }
 
         public void New(int width, int height, int planes)
@@ -463,7 +463,7 @@ public void ProcessElementWise(FloatBitmap other, Func<float, float, float> oper
                     });
                 }
                 else
-                    throw new InvalidOperationException("Unsupported number of planes");
+                    throw new InvalidOperationException("Unsupported number of planes " + PlaneCount);
             }
         }
 

PhotoLocator/BitmapOperations/IIRSmoothOperation.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Diagnostics;
+using System.Threading.Tasks;
 
 namespace PhotoLocator.BitmapOperations
 {
@@ -8,6 +9,7 @@ public static void Apply(FloatBitmap plane, float filterSize)
         {
             if (filterSize == 0)
                 return;
+            Debug.Assert(plane.PlaneCount == 1);
             filterSize /= 4f;
             var scale = 1f / (1f + filterSize);
             unsafe

PhotoLocator/PictureFileFormats/PhotoshopFileFormatHandler.cs

@@ -24,6 +24,7 @@ public static BitmapSource LoadFromStream(Stream stream, Rotation rotation, int
             var psd = new PsdFile(stream, new LoadContext());
             foreach (var psdLayer in (new[] { psd.BaseLayer }).Concat(psd.Layers))
             {
+                ct.ThrowIfCancellationRequested();
                 if (psdLayer != psd.BaseLayer && (!psdLayer.Visible || psdLayer.Opacity == 0) 
                     || psdLayer.Rect.Width == 0 || psdLayer.Rect.Height == 0)
                     continue;
@@ -67,7 +68,7 @@ public static BitmapSource CreateLayerBitmap(PsdFile psd, Layer layer)
                 if (psd.BitDepth == 8)
                 {
                     var pixels = new byte[layer.Rect.Width * layer.Rect.Height * 4];
-                    Parallel.For(0, 4, ch => GetChannelPixels8(layer.Channels.GetId(ch), pixels, ch, 4));
+                    Parallel.For(0, 4, ch => GetChannelPixels8Inverted(layer.Channels.GetId(ch), pixels, ch, 4));
                     return BitmapSource.Create(layer.Rect.Width, layer.Rect.Height, 96, 96, PixelFormats.Cmyk32, null,
                         pixels, layer.Rect.Width * 4);
                 }
@@ -83,6 +84,14 @@ private static void GetChannelPixels8(Channel channel, byte[] dest, int offset,
                 dest[iDst] = source[iSrc];
         }
 
+        private static void GetChannelPixels8Inverted(Channel channel, byte[] dest, int offset, int dist)
+        {
+            var size = channel.Rect.Width * channel.Rect.Height;
+            var source = channel.ImageData;
+            for (int iSrc = 0, iDst = offset; iSrc < size; iSrc++, iDst += dist)
+                dest[iDst] = (byte)(255 - source[iSrc]);
+        }
+
         private static void GetChannelPixels16(Channel channel, byte[] dest, int offset, int dist)
         {
             dist -= 2;

PhotoshopImageLoader/PhotoLocator.PhotoshopImageLoader.csproj

@@ -46,12 +46,6 @@
     <Compile Include="..\PsdPlugin\PsdFile\Util.cs" Link="PsdFile\Util.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="PsdFile\Compression\" />
-    <Folder Include="PsdFile\ImageResources\" />
-    <Folder Include="PsdFile\Layers\LayerInfo\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="System.Drawing.Common" Version="10.0.1" />
   </ItemGroup>