From 0a4aac26ec04e96e747fd4b20143c1a6bdaa43ec Mon Sep 17 00:00:00 2001 From: Piero Viano Date: Sun, 13 Nov 2022 00:35:21 +0200 Subject: [PATCH] Add support for Bitmap on Windows 5.0 and 6.0 --- .../Classes/FreeImageBitmap.cs | 32 +++++++++---------- .../Classes/MemoryArray.cs | 2 +- .../Classes/MetadataTag.cs | 4 +-- .../FreeImage-dotnet-core.csproj | 12 +++++-- .../FreeImageStaticImports.cs | 2 +- src/FreeImage-dotnet-core/FreeImageWrapper.cs | 18 +++++------ src/FreeImage-dotnet-core/Structs/BITMAP.cs | 2 +- .../Structs/BITMAPINFO.cs | 2 +- .../Structs/BITMAPINFOHEADER.cs | 2 +- .../Structs/FI16RGB555.cs | 2 +- .../Structs/FI16RGB565.cs | 2 +- src/FreeImage-dotnet-core/Structs/FI1BIT.cs | 2 +- src/FreeImage-dotnet-core/Structs/FI4BIT.cs | 2 +- src/FreeImage-dotnet-core/Structs/FIBITMAP.cs | 2 +- .../Structs/FICOMPLEX.cs | 2 +- .../Structs/FIICCPROFILE.cs | 2 +- src/FreeImage-dotnet-core/Structs/FIMEMORY.cs | 2 +- .../Structs/FIMETADATA.cs | 2 +- .../Structs/FIMULTIBITMAP.cs | 2 +- src/FreeImage-dotnet-core/Structs/FIRGB16.cs | 2 +- src/FreeImage-dotnet-core/Structs/FIRGBA16.cs | 2 +- src/FreeImage-dotnet-core/Structs/FIRGBAF.cs | 2 +- src/FreeImage-dotnet-core/Structs/FIRGBF.cs | 2 +- .../Structs/FIRational.cs | 2 +- src/FreeImage-dotnet-core/Structs/FITAG.cs | 2 +- .../Structs/FIURational.cs | 2 +- src/FreeImage-dotnet-core/Structs/Plugin.cs | 2 +- src/FreeImage-dotnet-core/Structs/RGBQUAD.cs | 2 +- .../Structs/RGBTRIPLE.cs | 2 +- .../Structs/fi_handle.cs | 2 +- 30 files changed, 63 insertions(+), 55 deletions(-) diff --git a/src/FreeImage-dotnet-core/Classes/FreeImageBitmap.cs b/src/FreeImage-dotnet-core/Classes/FreeImageBitmap.cs index 0bbf88c..a7bba4a 100644 --- a/src/FreeImage-dotnet-core/Classes/FreeImageBitmap.cs +++ b/src/FreeImage-dotnet-core/Classes/FreeImageBitmap.cs @@ -45,7 +45,7 @@ using System.Diagnostics; using System.Reflection; -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER using System.Runtime.Serialization; #endif @@ -54,7 +54,7 @@ namespace FreeImageAPI /// /// Encapsulates a FreeImage-bitmap. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, Guid("64a4c935-b757-499c-ab8c-6110316a9e51")] public class FreeImageBitmap : MarshalByRefObject, ICloneable, IDisposable, IEnumerable, ISerializable #else @@ -234,7 +234,7 @@ public FreeImageBitmap(FreeImageBitmap original, int width, int height) AddMemoryPressure(); } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Initializes a new instance of the class @@ -610,7 +610,7 @@ public FreeImageBitmap(Type type, string resource) { } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Initializes a new instance of the class bases on the specified size @@ -921,7 +921,7 @@ public FreeImageBitmap(int width, int height, int stride, int bpp, FREE_IMAGE_TY AddMemoryPressure(); } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Initializes a new instance of the class. @@ -967,7 +967,7 @@ public FreeImageBitmap(SerializationInfo info, StreamingContext context) #region Operators -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Converts a instance to a instance. @@ -1554,7 +1554,7 @@ public int[] PropertyIdList } } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Gets all the property items (pieces of metadata) stored in this . @@ -1766,7 +1766,7 @@ public RectangleF GetBounds(ref GraphicsUnit pageUnit) (float)FreeImage.GetHeight(dib)); } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Gets the specified property item from this . @@ -1835,7 +1835,7 @@ public FreeImageBitmap GetThumbnailImage(int maxPixelSize, bool convert) return result; } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Converts this instance to a instance. @@ -2557,7 +2557,7 @@ public void SelectActiveFrame(int frameIndex) } } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Creates a GDI bitmap object from this . @@ -2726,7 +2726,7 @@ public void SetResolution(float xDpi, float yDpi) FreeImage.SetResolutionY(dib, (uint)yDpi); } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// This function is not yet implemented. @@ -3771,7 +3771,7 @@ public override int GetHashCode() #region Static functions -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Returns a value that indicates whether the pixel format for this contains alpha information. @@ -3857,7 +3857,7 @@ public static FreeImageBitmap FromFile(string filename, bool useEmbeddedColorMan return new FreeImageBitmap(filename); } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Creates a from a handle to a GDI bitmap. @@ -3931,7 +3931,7 @@ public static FreeImageBitmap FromStream(Stream stream, bool useEmbeddedColorMan return new FreeImageBitmap(stream); } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Returns the color depth, in number of bits per pixel, @@ -4327,7 +4327,7 @@ private void LoadFromStream(Stream stream, FREE_IMAGE_FORMAT format, FREE_IMAGE_ /// /// Helper class to store informations for . /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER private sealed class SaveInformation : ICloneable #else private sealed class SaveInformation @@ -4420,7 +4420,7 @@ IEnumerator IEnumerable.GetEnumerator() return GetScanlines().GetEnumerator(); } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context) { diff --git a/src/FreeImage-dotnet-core/Classes/MemoryArray.cs b/src/FreeImage-dotnet-core/Classes/MemoryArray.cs index 8912d1a..9b9f11b 100644 --- a/src/FreeImage-dotnet-core/Classes/MemoryArray.cs +++ b/src/FreeImage-dotnet-core/Classes/MemoryArray.cs @@ -16,7 +16,7 @@ namespace FreeImageAPI /// Use instead of and /// instead of . /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER public unsafe class MemoryArray : IDisposable, ICloneable, ICollection, IEnumerable, IEquatable> where T : struct #else public unsafe class MemoryArray : IDisposable, ICollection, IEnumerable, IEquatable> where T : struct diff --git a/src/FreeImage-dotnet-core/Classes/MetadataTag.cs b/src/FreeImage-dotnet-core/Classes/MetadataTag.cs index a5992aa..4167e06 100644 --- a/src/FreeImage-dotnet-core/Classes/MetadataTag.cs +++ b/src/FreeImage-dotnet-core/Classes/MetadataTag.cs @@ -44,7 +44,7 @@ namespace FreeImageAPI.Metadata /// /// Manages metadata objects and operations. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER public sealed class MetadataTag : IComparable, IComparable, ICloneable, IEquatable, IDisposable #else public sealed class MetadataTag : IComparable, IComparable, IEquatable, IDisposable @@ -611,7 +611,7 @@ public bool AddToImage(FIBITMAP dib) return FreeImage.GetMetadata(_model, dib, _key, out tag); } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Gets a .NET PropertyItem for this metadata tag. diff --git a/src/FreeImage-dotnet-core/FreeImage-dotnet-core.csproj b/src/FreeImage-dotnet-core/FreeImage-dotnet-core.csproj index 06b6825..f2e7599 100644 --- a/src/FreeImage-dotnet-core/FreeImage-dotnet-core.csproj +++ b/src/FreeImage-dotnet-core/FreeImage-dotnet-core.csproj @@ -5,7 +5,7 @@ FreeImage dotnet core 4.3.6 - netstandard2.0;netstandard1.6;netstandard1.5;netstandard1.4;netstandard1.3;net461;net46;net452;net451;net45;net40 + netstandard2.0;netstandard1.6;netstandard1.5;netstandard1.4;netstandard1.3;net6.0-windows;net5.0-windows;net461;net46;net452;net451;net45;net40 true FreeImage-dotnet-core FreeImage-dotnet-core @@ -16,7 +16,7 @@ git https://github.com/matgr1/FreeImage-dotnet-core True - 4.3.6 + 4.3.7 This is a clone of the FreeImage .NET project (http://freeimage.sourceforge.net/) modified to work with dotnet core. Note that all functions that use System.Drawing.Bitmap have been removed from the netstandard framework versions as there is no implementation for this class. FreeImage native binaries are included in the nuget package for Windows x86/x64, Ubuntu x64 (^16.04), and OSX x64 (^10.10). @@ -79,6 +79,14 @@ This is for FreeImage version 3.17.0 (The version number of this package no long + + + + + + + + diff --git a/src/FreeImage-dotnet-core/FreeImageStaticImports.cs b/src/FreeImage-dotnet-core/FreeImageStaticImports.cs index d850815..60db733 100644 --- a/src/FreeImage-dotnet-core/FreeImageStaticImports.cs +++ b/src/FreeImage-dotnet-core/FreeImageStaticImports.cs @@ -42,7 +42,7 @@ namespace FreeImageAPI { public static partial class FreeImage { -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER // this isn't really valid... could be Mono on another platform... how do we tell in this case? public const bool IsWindows = true; #else diff --git a/src/FreeImage-dotnet-core/FreeImageWrapper.cs b/src/FreeImage-dotnet-core/FreeImageWrapper.cs index 53ba71b..f060ce3 100644 --- a/src/FreeImage-dotnet-core/FreeImageWrapper.cs +++ b/src/FreeImage-dotnet-core/FreeImageWrapper.cs @@ -168,7 +168,7 @@ internal static Assembly GetFreeImageAssembly() internal static Assembly GetAssembly(Type type) { -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER return Assembly.GetAssembly(type); #else return type.GetTypeInfo().Assembly; @@ -215,7 +215,7 @@ public static void ValidateAvailability() { throw new FreeImageException("FreeImage library not found", e); } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER catch (EntryPointNotFoundException e) { throw new FreeImageException("FreeImage entry point not found", e); @@ -573,7 +573,7 @@ public static FIBITMAP AllocateExT(FREE_IMAGE_TYPE type, int width, int heigh } } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Converts a FreeImage bitmap to a .NET . @@ -931,7 +931,7 @@ public static unsafe FIBITMAP ConvertFromRawBits( return dib; } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Saves a .NET to a file. @@ -1084,7 +1084,7 @@ public static FIBITMAP LoadEx(string filename, FREE_IMAGE_LOAD_FLAGS flags, ref return dib; } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Loads a .NET from a file. @@ -2281,7 +2281,7 @@ public static FREE_IMAGE_FORMAT GetFileTypeFromStream(Stream stream) #region Pixel access functions -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Retrieves an hBitmap for a FreeImage bitmap. @@ -2779,7 +2779,7 @@ public static bool GetFormatParameters( return result; } -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Returns the for the specified @@ -5144,7 +5144,7 @@ public static unsafe void CopyMemory(Array dest, Array src, long len) internal static string ColorToString(Color color) { -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER return string.Format( System.Globalization.CultureInfo.CurrentCulture, "{{Name={0}, ARGB=({1}, {2}, {3}, {4})}}", @@ -5249,7 +5249,7 @@ internal static bool CheckColorType(FREE_IMAGE_TYPE imageType, T color) #region Dll-Imports -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER /// /// Retrieves a handle to a display device context (DC) for the client area of a specified window /// or for the entire screen. You can use the returned handle in subsequent GDI functions to draw in the DC. diff --git a/src/FreeImage-dotnet-core/Structs/BITMAP.cs b/src/FreeImage-dotnet-core/Structs/BITMAP.cs index 207f962..74f133b 100644 --- a/src/FreeImage-dotnet-core/Structs/BITMAP.cs +++ b/src/FreeImage-dotnet-core/Structs/BITMAP.cs @@ -67,7 +67,7 @@ namespace FreeImageAPI /// Each device has a unique color format. To transfer a bitmap from one device to another, /// use the GetDIBits and SetDIBits functions. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/BITMAPINFO.cs b/src/FreeImage-dotnet-core/Structs/BITMAPINFO.cs index fd761cc..382e2da 100644 --- a/src/FreeImage-dotnet-core/Structs/BITMAPINFO.cs +++ b/src/FreeImage-dotnet-core/Structs/BITMAPINFO.cs @@ -60,7 +60,7 @@ namespace FreeImageAPI /// Unless the application has exclusive use and control of the bitmap, the bitmap color table /// should contain explicit RGB values. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/BITMAPINFOHEADER.cs b/src/FreeImage-dotnet-core/Structs/BITMAPINFOHEADER.cs index 0fb2cd7..5d271b4 100644 --- a/src/FreeImage-dotnet-core/Structs/BITMAPINFOHEADER.cs +++ b/src/FreeImage-dotnet-core/Structs/BITMAPINFOHEADER.cs @@ -47,7 +47,7 @@ namespace FreeImageAPI /// BITMAPINFOHEADER structure and a color table to provide a complete /// definition of the dimensions and colors of a DIB. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FI16RGB555.cs b/src/FreeImage-dotnet-core/Structs/FI16RGB555.cs index 718b159..8ac85ae 100644 --- a/src/FreeImage-dotnet-core/Structs/FI16RGB555.cs +++ b/src/FreeImage-dotnet-core/Structs/FI16RGB555.cs @@ -70,7 +70,7 @@ namespace FreeImageAPI /// Color another = fi16rgb.Color; /// /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FI16RGB565.cs b/src/FreeImage-dotnet-core/Structs/FI16RGB565.cs index 8c07010..c9d7778 100644 --- a/src/FreeImage-dotnet-core/Structs/FI16RGB565.cs +++ b/src/FreeImage-dotnet-core/Structs/FI16RGB565.cs @@ -70,7 +70,7 @@ namespace FreeImageAPI /// Color another = fi16rgb.Color; /// /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FI1BIT.cs b/src/FreeImage-dotnet-core/Structs/FI1BIT.cs index a393f19..fa58689 100644 --- a/src/FreeImage-dotnet-core/Structs/FI1BIT.cs +++ b/src/FreeImage-dotnet-core/Structs/FI1BIT.cs @@ -9,7 +9,7 @@ namespace FreeImageAPI /// The FI1BIT structure represents a single bit. /// It's value can be 0 or 1. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [DebuggerDisplay("{value}"), Serializable] #else diff --git a/src/FreeImage-dotnet-core/Structs/FI4BIT.cs b/src/FreeImage-dotnet-core/Structs/FI4BIT.cs index 246caf0..2d85af4 100644 --- a/src/FreeImage-dotnet-core/Structs/FI4BIT.cs +++ b/src/FreeImage-dotnet-core/Structs/FI4BIT.cs @@ -9,7 +9,7 @@ namespace FreeImageAPI /// The FI4BIT structure represents the half of a . /// It's valuerange is between 0 and 15. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [DebuggerDisplay("{value}"), Serializable] #else diff --git a/src/FreeImage-dotnet-core/Structs/FIBITMAP.cs b/src/FreeImage-dotnet-core/Structs/FIBITMAP.cs index af46dea..46d5e6a 100644 --- a/src/FreeImage-dotnet-core/Structs/FIBITMAP.cs +++ b/src/FreeImage-dotnet-core/Structs/FIBITMAP.cs @@ -46,7 +46,7 @@ namespace FreeImageAPI /// access to either a singlepage bitmap or exactly one page of /// a multipage bitmap. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FICOMPLEX.cs b/src/FreeImage-dotnet-core/Structs/FICOMPLEX.cs index b80e386..205fe43 100644 --- a/src/FreeImage-dotnet-core/Structs/FICOMPLEX.cs +++ b/src/FreeImage-dotnet-core/Structs/FICOMPLEX.cs @@ -42,7 +42,7 @@ namespace FreeImageAPI /// The FICOMPLEX structure describes a color consisting of a real and an imaginary part. /// Each part is using 4 bytes of data. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FIICCPROFILE.cs b/src/FreeImage-dotnet-core/Structs/FIICCPROFILE.cs index 4fac562..839df52 100644 --- a/src/FreeImage-dotnet-core/Structs/FIICCPROFILE.cs +++ b/src/FreeImage-dotnet-core/Structs/FIICCPROFILE.cs @@ -41,7 +41,7 @@ namespace FreeImageAPI /// /// This Structure contains ICC-Profile data. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FIMEMORY.cs b/src/FreeImage-dotnet-core/Structs/FIMEMORY.cs index 19da866..0092a64 100644 --- a/src/FreeImage-dotnet-core/Structs/FIMEMORY.cs +++ b/src/FreeImage-dotnet-core/Structs/FIMEMORY.cs @@ -41,7 +41,7 @@ namespace FreeImageAPI /// /// The FIMEMORY structure is a handle to an opened memory stream. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FIMETADATA.cs b/src/FreeImage-dotnet-core/Structs/FIMETADATA.cs index cccb926..5d0d555 100644 --- a/src/FreeImage-dotnet-core/Structs/FIMETADATA.cs +++ b/src/FreeImage-dotnet-core/Structs/FIMETADATA.cs @@ -49,7 +49,7 @@ namespace FreeImageAPI /// When the FIMETADATA handle is no longer used, it needs to be freed by the /// function. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FIMULTIBITMAP.cs b/src/FreeImage-dotnet-core/Structs/FIMULTIBITMAP.cs index 59d6b28..13c7231 100644 --- a/src/FreeImage-dotnet-core/Structs/FIMULTIBITMAP.cs +++ b/src/FreeImage-dotnet-core/Structs/FIMULTIBITMAP.cs @@ -41,7 +41,7 @@ namespace FreeImageAPI /// /// The FIMULTIBITMAP structure is a handle to a FreeImage multipaged bimtap. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FIRGB16.cs b/src/FreeImage-dotnet-core/Structs/FIRGB16.cs index 025baa8..04770b0 100644 --- a/src/FreeImage-dotnet-core/Structs/FIRGB16.cs +++ b/src/FreeImage-dotnet-core/Structs/FIRGB16.cs @@ -97,7 +97,7 @@ namespace FreeImageAPI /// Color another = firgb16.Color; /// /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FIRGBA16.cs b/src/FreeImage-dotnet-core/Structs/FIRGBA16.cs index ef953ea..522fdf9 100644 --- a/src/FreeImage-dotnet-core/Structs/FIRGBA16.cs +++ b/src/FreeImage-dotnet-core/Structs/FIRGBA16.cs @@ -93,7 +93,7 @@ namespace FreeImageAPI /// Color another = firgba16.Color; /// /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FIRGBAF.cs b/src/FreeImage-dotnet-core/Structs/FIRGBAF.cs index 5bb4e84..0735d77 100644 --- a/src/FreeImage-dotnet-core/Structs/FIRGBAF.cs +++ b/src/FreeImage-dotnet-core/Structs/FIRGBAF.cs @@ -94,7 +94,7 @@ namespace FreeImageAPI /// Color another = firgbaf.Color; /// /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FIRGBF.cs b/src/FreeImage-dotnet-core/Structs/FIRGBF.cs index f2fb0b6..3038d61 100644 --- a/src/FreeImage-dotnet-core/Structs/FIRGBF.cs +++ b/src/FreeImage-dotnet-core/Structs/FIRGBF.cs @@ -98,7 +98,7 @@ namespace FreeImageAPI /// Color another = firgbf.Color; /// /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FIRational.cs b/src/FreeImage-dotnet-core/Structs/FIRational.cs index a855b0c..c6d5b9d 100644 --- a/src/FreeImage-dotnet-core/Structs/FIRational.cs +++ b/src/FreeImage-dotnet-core/Structs/FIRational.cs @@ -54,7 +54,7 @@ namespace FreeImageAPI /// The structure can be converted into all .NET standard types either implicit or /// explicit. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential), ComVisible(true)] #else [StructLayout(LayoutKind.Sequential), ComVisible(true)] diff --git a/src/FreeImage-dotnet-core/Structs/FITAG.cs b/src/FreeImage-dotnet-core/Structs/FITAG.cs index 2055324..2ce37fc 100644 --- a/src/FreeImage-dotnet-core/Structs/FITAG.cs +++ b/src/FreeImage-dotnet-core/Structs/FITAG.cs @@ -41,7 +41,7 @@ namespace FreeImageAPI /// /// The FITAG structure is a handle to a FreeImage metadata tag. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/FIURational.cs b/src/FreeImage-dotnet-core/Structs/FIURational.cs index d84bbe4..0825350 100644 --- a/src/FreeImage-dotnet-core/Structs/FIURational.cs +++ b/src/FreeImage-dotnet-core/Structs/FIURational.cs @@ -54,7 +54,7 @@ namespace FreeImageAPI /// The structure can be converted into all .NET standard types either implicit or /// explicit. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential), ComVisible(true)] #else [StructLayout(LayoutKind.Sequential), ComVisible(true)] diff --git a/src/FreeImage-dotnet-core/Structs/Plugin.cs b/src/FreeImage-dotnet-core/Structs/Plugin.cs index 62cba72..7faeda4 100644 --- a/src/FreeImage-dotnet-core/Structs/Plugin.cs +++ b/src/FreeImage-dotnet-core/Structs/Plugin.cs @@ -42,7 +42,7 @@ namespace FreeImageAPI.Plugins /// /// The structure contains functionpointers that make up a FreeImage plugin. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/RGBQUAD.cs b/src/FreeImage-dotnet-core/Structs/RGBQUAD.cs index 5981117..cd4dbb6 100644 --- a/src/FreeImage-dotnet-core/Structs/RGBQUAD.cs +++ b/src/FreeImage-dotnet-core/Structs/RGBQUAD.cs @@ -93,7 +93,7 @@ namespace FreeImageAPI /// Color another = rgbq.Color; /// /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Explicit)] #else [StructLayout(LayoutKind.Explicit)] diff --git a/src/FreeImage-dotnet-core/Structs/RGBTRIPLE.cs b/src/FreeImage-dotnet-core/Structs/RGBTRIPLE.cs index c91fecc..5ae3768 100644 --- a/src/FreeImage-dotnet-core/Structs/RGBTRIPLE.cs +++ b/src/FreeImage-dotnet-core/Structs/RGBTRIPLE.cs @@ -97,7 +97,7 @@ namespace FreeImageAPI /// Color another = rgbt.Color; /// /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)] diff --git a/src/FreeImage-dotnet-core/Structs/fi_handle.cs b/src/FreeImage-dotnet-core/Structs/fi_handle.cs index 53ee6b7..a1f2c7c 100644 --- a/src/FreeImage-dotnet-core/Structs/fi_handle.cs +++ b/src/FreeImage-dotnet-core/Structs/fi_handle.cs @@ -79,7 +79,7 @@ namespace FreeImageAPI.IO /// This way we can implement a fi_handle that works with managed an unmanaged /// code. /// -#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 +#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER [Serializable, StructLayout(LayoutKind.Sequential)] #else [StructLayout(LayoutKind.Sequential)]