sync back stuff

LoneWandererProductions · LoneWandererProductions · commit 0e87b9178129 · 2026-02-24T10:19:12.000+01:00
diff --git a/CommonControls.Images/ColorPicker.xaml.cs b/CommonControls.Images/ColorPicker.xaml.cs
@@ -48,7 +48,7 @@ public sealed partial class ColorPicker : INotifyPropertyChanged
         public event PropertyChangedEventHandler? PropertyChanged;
 
         /// <summary>
-        ///
+        /// 
         /// </summary>
         /// <param name="colorHsv">The color HSV.</param>
         public delegate void DelegateColor(ColorHsv colorHsv);
diff --git a/CommonControls.Images/CommonControls.Images.csproj b/CommonControls.Images/CommonControls.Images.csproj
@@ -12,7 +12,6 @@
 
 
   <ItemGroup>
-    <ProjectReference Include="..\ExtendedSystemObjects\ExtendedSystemObjects.csproj" />
     <ProjectReference Include="..\Imaging\Imaging.csproj" />
   </ItemGroup>
 
diff --git a/CommonControls.Images/ImageZoom.xaml b/CommonControls.Images/ImageZoom.xaml
@@ -5,7 +5,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:imag="clr-namespace:Imaging;assembly=Imaging"
+    xmlns:imag="clr-namespace:Imaging.Gifs;assembly=Imaging"
     mc:Ignorable="d"
     Name="ImgZoom"
     d:DesignHeight="450" d:DesignWidth="800">
diff --git a/CommonControls.Images/ImageZoom.xaml.cs b/CommonControls.Images/ImageZoom.xaml.cs
@@ -116,8 +116,15 @@ public sealed partial class ImageZoom : IDisposable
         /// <param name="point">The point.</param>
         public delegate void DelegatePoint(Point point);
 
+        /// <summary>
+        /// Delegate for the Selection Frames.
+        /// </summary>
+        /// <param name="frames">The frames.</param>
         public delegate void DelegateMultiFrame(List<SelectionFrame> frames);
 
+        /// <summary>
+        /// Occurs when [selected multi frames].
+        /// </summary>
         public event DelegateMultiFrame SelectedMultiFrames;
 
         /// <summary>
@@ -146,7 +153,7 @@ public sealed partial class ImageZoom : IDisposable
                 new PropertyMetadata(OnSelectionToolChanged));
 
         /// <summary>
-        ///     The autoplay gif Property
+        ///     The auto play gif Property
         /// </summary>
         public static readonly DependencyProperty AutoplayGif = DependencyProperty.Register(nameof(AutoplayGifImage),
             typeof(bool),
diff --git a/CommonControls.Images/Thumbnails.xaml.cs b/CommonControls.Images/Thumbnails.xaml.cs
@@ -990,4 +990,4 @@ private void Dispose(bool disposing)
             Dispose(false);
         }
     }
-}
+}
diff --git a/ImageCompare/AnalysisProcessing.cs b/ImageCompare/AnalysisProcessing.cs
@@ -15,6 +15,7 @@
 using System.Threading.Tasks;
 using ExtendedSystemObjects;
 using Imaging;
+using Imaging.Cifs;
 using Imaging.Enums;
 using Imaging.Interfaces;
 
diff --git a/Imaging/Cifs/Cif.cs b/Imaging/Cifs/Cif.cs
@@ -1,6 +1,6 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Imaging
+ * PROJECT:     Imaging.Cifs
  * FILE:        Cif.cs
  * PURPOSE:     Custom Image Format object, that contains all attributes and basic information
  * PROGRAMER:   Peter Geinitz (Wayfarer)
@@ -17,7 +17,7 @@
 using System.Linq;
 using Imaging.Interfaces;
 
-namespace Imaging
+namespace Imaging.Cifs
 {
     /// <summary>
     ///     Image in Cif format, with various further Tools
diff --git a/Imaging/Cifs/CifImageData.cs b/Imaging/Cifs/CifImageData.cs
@@ -1,6 +1,6 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Imaging
+ * PROJECT:     Imaging.Cifs
  * FILE:        CifImageData.cs
  * PURPOSE:     The Parser Object that will hold the actual Image Data
  * PROGRAMER:   Peter Geinitz (Wayfarer)
@@ -11,7 +11,7 @@
 using System.Drawing;
 using System.Linq;
 
-namespace Imaging
+namespace Imaging.Cifs
 {
     /// <summary>
     /// Image Data Parser Object.
diff --git a/Imaging/Cifs/CifMetadata.cs b/Imaging/Cifs/CifMetadata.cs
@@ -1,6 +1,6 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Imaging
+ * PROJECT:     Imaging.Cifs
  * FILE:        CifMetadata.cs
  * PURPOSE:     The Parser Object that will hold the actual meta Image Data
  * PROGRAMER:   Peter Geinitz (Wayfarer)
@@ -9,7 +9,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Imaging
+namespace Imaging.Cifs
 {
     /// <summary>
     ///     Meta Data of Cif Images
diff --git a/Imaging/Cifs/CifProcessing.cs b/Imaging/Cifs/CifProcessing.cs
@@ -1,6 +1,6 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Imaging
+ * PROJECT:     Imaging.Cifs
  * FILE:        CifProcessing.cs
  * PURPOSE:     Processing of our custom Image Format, with custom compression
  * PROGRAMER:   Peter Geinitz (Wayfarer)
@@ -13,7 +13,7 @@
 using DataFormatter;
 using ExtendedSystemObjects;
 
-namespace Imaging
+namespace Imaging.Cifs
 {
     //TODO add checksum Fun and custom image Exceptions
 
diff --git a/Imaging/Cifs/CustomImageFormat.cs b/Imaging/Cifs/CustomImageFormat.cs
@@ -1,6 +1,6 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Imaging
+ * PROJECT:     Imaging.Cifs
  * FILE:        ICustomImageFormat.cs
  * PURPOSE:     Implementation and main entry of our custom Image Format
  *              Main use is a small save footprint and Image Color manipulation on a large scale
@@ -16,7 +16,7 @@
 
 //TODO Checksum in line 1. Max Numbers, custom exception class
 // check sum for repairs perhaps?
-namespace Imaging
+namespace Imaging.Cifs
 {
     /// <inheritdoc />
     /// <summary>
diff --git a/Imaging/Cifs/PointId.cs b/Imaging/Cifs/PointId.cs
@@ -1,6 +1,6 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Imaging
+ * PROJECT:     Imaging.Cifs
  * FILE:        PointId.cs
  * PURPOSE:     A more clever way to handle some 2D coordinate Stuff
  * PROGRAMER:   Peter Geinitz (Wayfarer)
@@ -16,7 +16,7 @@
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
-namespace Imaging
+namespace Imaging.Cifs
 {
     /// <inheritdoc />
     /// <summary>
diff --git a/Imaging/Gifs/FrameInfo.cs b/Imaging/Gifs/FrameInfo.cs
@@ -0,0 +1,44 @@
+﻿/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     Imaging.Gifs
+ * FILE:        FrameInfo.cs
+ * PURPOSE:     Class Container that holds all informations about the frames of the gif in question.
+ * PROGRAMER:   Peter Geinitz (Wayfarer)
+ */
+
+
+using System.Drawing;
+
+namespace Imaging.Gifs
+{
+    /// <summary>
+    ///     Infos about the frame and timing
+    /// </summary>
+    public sealed class FrameInfo
+    {
+        /// <summary>
+        ///     Gets or sets the description.
+        /// </summary>
+        /// <value>
+        ///     The description.
+        /// </value>
+        public string Description { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the delay time.
+        /// </summary>
+        /// <value>
+        ///     The delay time.
+        /// </value>
+        public double DelayTime { get; init; } // Delay time in seconds
+
+
+        /// <summary>
+        ///     Gets or sets the image.
+        /// </summary>
+        /// <value>
+        ///     The image.
+        /// </value>
+        public Bitmap Image { get; set; } // Image of the frame
+    }
+}
diff --git a/Imaging/Gifs/ImageGif.cs b/Imaging/Gifs/ImageGif.cs
@@ -1,6 +1,6 @@
 ﻿/*
 * COPYRIGHT:   See COPYING in the top level directory
-* PROJECT:     Imaging
+* PROJECT:     Imaging.Gifs
 * FILE:        ImageGifThreaded.cs
 * PURPOSE:     Extends Image Control to play GIFs asynchronously on its own thread
 * PROGRAMMER:  Peter Geinitz (Wayfarer)
@@ -13,7 +13,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 
-namespace Imaging
+namespace Imaging.Gifs
 {
     /// <summary>
     /// Image control capable of playing animated GIFs in a self-contained way.
diff --git a/Imaging/Gifs/ImageGifHandler.cs b/Imaging/Gifs/ImageGifHandler.cs
@@ -1,6 +1,6 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Imaging
+ * PROJECT:     Imaging.Gifs
  * FILE:        ImageGifHandler.cs
  * PURPOSE:     Some processing stuff for Gif Images, not perfect, the files are slightly bigger though.
  * PROGRAMER:   Peter Geinitz (Wayfarer)
@@ -27,7 +27,7 @@
 using Imaging.Helpers;
 using PixelFormat = System.Drawing.Imaging.PixelFormat;
 
-namespace Imaging
+namespace Imaging.Gifs
 {
     /// <summary>
     ///     Central Entry class for all things related to gifs
@@ -41,7 +41,7 @@ public static class ImageGifHandler
         /// <returns>Status of cleanup</returns>
         [System.Runtime.InteropServices.DllImport("gdi32.dll")]
         [return: System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.Bool)]
-        internal static extern bool DeleteObject(IntPtr hObject);
+        internal static extern bool DeleteObject(nint hObject);
 
         /// <summary>
         ///     Gets the image information.
@@ -206,12 +206,12 @@ private static void GifCreator(IEnumerable<Bitmap> btm, string target, int delay
 
             foreach (var bmpImage in btm)
             {
-                IntPtr hBitmap = bmpImage.GetHbitmap();
+                nint hBitmap = bmpImage.GetHbitmap();
                 try
                 {
                     var src = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(
                         hBitmap,
-                        IntPtr.Zero,
+                        nint.Zero,
                         Int32Rect.Empty,
                         BitmapSizeOptions.FromEmptyOptions());
 
@@ -240,12 +240,12 @@ private static void GifCreator(IEnumerable<(Bitmap Image, int DelayMs)> frames,
 
             foreach (var frame in frames)
             {
-                IntPtr hBitmap = frame.Image.GetHbitmap();
+                nint hBitmap = frame.Image.GetHbitmap();
                 try
                 {
                     var src = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(
                         hBitmap,
-                        IntPtr.Zero,
+                        nint.Zero,
                         Int32Rect.Empty,
                         BitmapSizeOptions.FromEmptyOptions());
 
diff --git a/Imaging/Gifs/ImageGifInfo.cs b/Imaging/Gifs/ImageGifInfo.cs
@@ -1,6 +1,6 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Imaging
+ * PROJECT:     Imaging.Gifs
  * FILE:        ImageGifInfo.cs
  * PURPOSE:     Class Container that holds all informations about the gif in question.
  * PROGRAMER:   Peter Geinitz (Wayfarer)
@@ -11,10 +11,9 @@
 
 
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 
-namespace Imaging
+namespace Imaging.Gifs
 {
     /// <summary>
     ///     Gif Information
@@ -125,35 +124,4 @@ public sealed class ImageGifInfo
         /// </value>
         public long Size { get; set; }
     }
-
-    /// <summary>
-    ///     Infos about the frame and timing
-    /// </summary>
-    public sealed class FrameInfo
-    {
-        /// <summary>
-        ///     Gets or sets the description.
-        /// </summary>
-        /// <value>
-        ///     The description.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the delay time.
-        /// </summary>
-        /// <value>
-        ///     The delay time.
-        /// </value>
-        public double DelayTime { get; init; } // Delay time in seconds
-
-
-        /// <summary>
-        ///     Gets or sets the image.
-        /// </summary>
-        /// <value>
-        ///     The image.
-        /// </value>
-        public Bitmap Image { get; set; } // Image of the frame
-    }
 }
diff --git a/Imaging/Gifs/ImageGifMetadataExtractor.cs b/Imaging/Gifs/ImageGifMetadataExtractor.cs
@@ -1,6 +1,6 @@
 ﻿/*
 * COPYRIGHT:   See COPYING in the top level directory
-* PROJECT:     Imaging
+* PROJECT:     Imaging.Gifs
 * FILE:        ImageGifMetadataExtractor.cs
 * PURPOSE:     Get all the info of a gif
 * PROGRAMER:   Peter Geinitz (Wayfarer)
@@ -9,7 +9,7 @@
 using System;
 using System.IO;
 
-namespace Imaging
+namespace Imaging.Gifs
 {
     /// <summary>
     ///     Information about the gif
@@ -54,7 +54,7 @@ internal static class ImageGifMetadataExtractor
             metadata.HasGlobalColorTable = (packedFields & ImagingResources.GlobalColorTableFlag) != 0;
             metadata.ColorResolution = ((packedFields & ImagingResources.ColorResolutionMask) >> 4) + 1;
             metadata.GlobalColorTableSize = metadata.HasGlobalColorTable
-                ? 3 * (1 << ((packedFields & ImagingResources.TableSizeMask) + 1))
+                ? 3 * (1 << (packedFields & ImagingResources.TableSizeMask) + 1)
                 : 0;
 
             if (metadata.HasGlobalColorTable)
@@ -137,7 +137,7 @@ internal static class ImageGifMetadataExtractor
                             packed = reader.ReadByte();
                             if ((packed & ImagingResources.LocalColorTableFlag) != 0)
                             {
-                                var tableSize = 3 * (1 << ((packed & ImagingResources.TableSizeMask) + 1));
+                                var tableSize = 3 * (1 << (packed & ImagingResources.TableSizeMask) + 1);
                                 reader.BaseStream.Seek(tableSize, SeekOrigin.Current);
                             }
 
diff --git a/Imaging/Helpers/ImageStream.cs b/Imaging/Helpers/ImageStream.cs
@@ -22,6 +22,7 @@
 using System.Runtime.InteropServices;
 using ExtendedSystemObjects;
 using Imaging.Enums;
+using Mathematics;
 using Mathematics.Constants;
 
 namespace Imaging.Helpers
diff --git a/Imaging/Helpers/ImageStreamHsv.cs b/Imaging/Helpers/ImageStreamHsv.cs
@@ -8,6 +8,7 @@
 
 using System;
 using System.Drawing;
+using static OpenTK.Graphics.OpenGL.GL;
 
 namespace Imaging.Helpers
 {
diff --git a/Imaging/Helpers/TextureStream.cs b/Imaging/Helpers/TextureStream.cs
diff --git a/Imaging/ImageRender.cs b/Imaging/ImageRender.cs
diff --git a/Imaging/ImagingFacade.cs b/Imaging/ImagingFacade.cs
diff --git a/Imaging/ImagingResources.cs b/Imaging/ImagingResources.cs
diff --git a/Imaging/Interfaces/ICustomImageFormat.cs b/Imaging/Interfaces/ICustomImageFormat.cs
diff --git a/Imaging/Interfaces/IImageRender.cs b/Imaging/Interfaces/IImageRender.cs
diff --git a/ImagingTests/ImagingTests.cs b/ImagingTests/ImagingTests.cs

Original file line number	Diff line number	Diff line change
`@@ -990,4 +990,4 @@ private void Dispose(bool disposing)`
`990`	`990`	`Dispose(false);`
`991`	`991`	`}`
`992`	`992`	`}`
`993`		`-}`
	`993`	`+}`