From 5e6f3795624ec0b53a2b47611121e93c58052be6 Mon Sep 17 00:00:00 2001 From: dirk Date: Sun, 30 Oct 2016 10:41:37 +0100 Subject: [PATCH] Changed PixelAccessor to use IPackedPixel. --- src/ImageSharp/Common/Helpers/ImageMaths.cs | 2 +- src/ImageSharp/Filters/Processors/AlphaProcessor.cs | 2 +- .../Filters/Processors/BackgroundColorProcessor.cs | 2 +- .../Binarization/BinaryThresholdProcessor.cs | 2 +- src/ImageSharp/Filters/Processors/BlendProcessor.cs | 2 +- .../Filters/Processors/BrightnessProcessor.cs | 2 +- .../Processors/ColorMatrix/BlackWhiteProcessor.cs | 2 +- .../ColorBlindness/AchromatomalyProcessor.cs | 2 +- .../ColorBlindness/AchromatopsiaProcessor.cs | 2 +- .../ColorBlindness/DeuteranomalyProcessor.cs | 2 +- .../ColorBlindness/DeuteranopiaProcessor.cs | 2 +- .../ColorBlindness/ProtanomalyProcessor.cs | 2 +- .../ColorBlindness/ProtanopiaProcessor.cs | 2 +- .../ColorBlindness/TritanomalyProcessor.cs | 2 +- .../ColorBlindness/TritanopiaProcessor.cs | 2 +- .../Processors/ColorMatrix/ColorMatrixFilter.cs | 2 +- .../ColorMatrix/GrayscaleBt601Processor.cs | 2 +- .../ColorMatrix/GrayscaleBt709Processor.cs | 2 +- .../Filters/Processors/ColorMatrix/HueProcessor.cs | 2 +- .../Processors/ColorMatrix/IColorMatrixFilter.cs | 2 +- .../Processors/ColorMatrix/KodachromeProcessor.cs | 2 +- .../Processors/ColorMatrix/LomographProcessor.cs | 2 +- .../Processors/ColorMatrix/PolaroidProcessor.cs | 2 +- .../Processors/ColorMatrix/SaturationProcessor.cs | 2 +- .../Filters/Processors/ColorMatrix/SepiaProcessor.cs | 2 +- .../Filters/Processors/ContrastProcessor.cs | 2 +- src/ImageSharp/Filters/Processors/GlowProcessor.cs | 2 +- src/ImageSharp/Filters/Processors/IImageFilter.cs | 2 +- src/ImageSharp/Filters/Processors/ImageFilter.cs | 2 +- src/ImageSharp/Filters/Processors/InvertProcessor.cs | 2 +- .../Filters/Processors/VignetteProcessor.cs | 2 +- src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs | 8 ++++---- src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs | 8 ++++---- src/ImageSharp/Formats/Gif/GifEncoderCore.cs | 4 ++-- src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs | 8 ++++---- src/ImageSharp/Formats/Png/PngDecoderCore.cs | 6 +++--- src/ImageSharp/Formats/Png/PngEncoderCore.cs | 4 ++-- src/ImageSharp/Image/IImageBase.cs | 2 +- src/ImageSharp/Image/IImageFrame.cs | 2 +- src/ImageSharp/Image/ImageBase.cs | 2 +- src/ImageSharp/Image/ImageFrame.cs | 2 +- src/ImageSharp/Image/PixelAccessor.cs | 2 +- src/ImageSharp/ImageProcessor.cs | 2 +- src/ImageSharp/Samplers/Options/ResizeHelper.cs | 12 ++++++------ .../Processors/Convolution/Convolution2DFilter.cs | 2 +- .../Processors/Convolution/ConvolutionFilter.cs | 2 +- .../EdgeDetection/EdgeDetector2DFilter.cs | 2 +- .../Convolution/EdgeDetection/EdgeDetectorFilter.cs | 2 +- .../Convolution/EdgeDetection/IEdgeDetectorFilter.cs | 2 +- .../Convolution/EdgeDetection/KayyaliProcessor.cs | 2 +- .../EdgeDetection/Laplacian3X3Processor.cs | 2 +- .../EdgeDetection/Laplacian5X5Processor.cs | 2 +- .../EdgeDetection/LaplacianOfGaussianProcessor.cs | 2 +- .../Convolution/EdgeDetection/PrewittProcessor.cs | 2 +- .../EdgeDetection/RobertsCrossProcessor.cs | 2 +- .../Convolution/EdgeDetection/ScharrProcessor.cs | 2 +- .../Convolution/EdgeDetection/SobelProcessor.cs | 2 +- src/ImageSharp/Samplers/Processors/CropProcessor.cs | 2 +- src/ImageSharp/Samplers/Processors/IImageSampler.cs | 2 +- src/ImageSharp/Samplers/Processors/ImageSampler.cs | 2 +- .../Samplers/Processors/Matrix3x2Processor.cs | 2 +- .../Samplers/Processors/OilPaintingProcessor.cs | 2 +- .../Samplers/Processors/PixelateProcessor.cs | 2 +- .../Processors/ResamplingWeightedProcessor.cs | 2 +- src/ImageSharp/Samplers/Processors/SkewProcessor.cs | 2 +- 65 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/ImageSharp/Common/Helpers/ImageMaths.cs b/src/ImageSharp/Common/Helpers/ImageMaths.cs index 9a32eb5c1f..9b3c623825 100644 --- a/src/ImageSharp/Common/Helpers/ImageMaths.cs +++ b/src/ImageSharp/Common/Helpers/ImageMaths.cs @@ -165,7 +165,7 @@ namespace ImageSharp /// The . /// public static Rectangle GetFilteredBoundingRectangle(ImageBase bitmap, float componentValue, RgbaComponent channel = RgbaComponent.B) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { const float Epsilon = .00001f; diff --git a/src/ImageSharp/Filters/Processors/AlphaProcessor.cs b/src/ImageSharp/Filters/Processors/AlphaProcessor.cs index f425d9c731..08c05acdd2 100644 --- a/src/ImageSharp/Filters/Processors/AlphaProcessor.cs +++ b/src/ImageSharp/Filters/Processors/AlphaProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class AlphaProcessor : ImageFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/BackgroundColorProcessor.cs b/src/ImageSharp/Filters/Processors/BackgroundColorProcessor.cs index b03f9d6c29..44a1227f3a 100644 --- a/src/ImageSharp/Filters/Processors/BackgroundColorProcessor.cs +++ b/src/ImageSharp/Filters/Processors/BackgroundColorProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class BackgroundColorProcessor : ImageFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/Binarization/BinaryThresholdProcessor.cs b/src/ImageSharp/Filters/Processors/Binarization/BinaryThresholdProcessor.cs index 7721e09994..09c6a96f3d 100644 --- a/src/ImageSharp/Filters/Processors/Binarization/BinaryThresholdProcessor.cs +++ b/src/ImageSharp/Filters/Processors/Binarization/BinaryThresholdProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class BinaryThresholdProcessor : ImageFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/BlendProcessor.cs b/src/ImageSharp/Filters/Processors/BlendProcessor.cs index 5f7f5270e3..4f326361fe 100644 --- a/src/ImageSharp/Filters/Processors/BlendProcessor.cs +++ b/src/ImageSharp/Filters/Processors/BlendProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class BlendProcessor : ImageFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/BrightnessProcessor.cs b/src/ImageSharp/Filters/Processors/BrightnessProcessor.cs index ae8a12bce2..b74759b6b2 100644 --- a/src/ImageSharp/Filters/Processors/BrightnessProcessor.cs +++ b/src/ImageSharp/Filters/Processors/BrightnessProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class BrightnessProcessor : ImageFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/BlackWhiteProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/BlackWhiteProcessor.cs index e801963132..cbb351aafd 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/BlackWhiteProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/BlackWhiteProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class BlackWhiteProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs index 1958abf78c..012954c2ff 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class AchromatomalyProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs index 5dd1f60a07..6ce50ba433 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class AchromatopsiaProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs index d23629c508..e1fbac60a5 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class DeuteranomalyProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs index a2357548e0..35e76b235d 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class DeuteranopiaProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs index e88f306d2d..38199b9563 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class ProtanomalyProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs index 4a4cb85eed..19936a8496 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class ProtanopiaProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs index 9f310a3632..84d22c78a6 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class TritanomalyProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs index 98939d1c94..82d7415b74 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class TritanopiaProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorMatrixFilter.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorMatrixFilter.cs index 625aa4d124..be6f277e04 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/ColorMatrixFilter.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/ColorMatrixFilter.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public abstract class ColorMatrixFilter : ImageFilter, IColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/GrayscaleBt601Processor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/GrayscaleBt601Processor.cs index 4a3ec7896e..d6c1762e8e 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/GrayscaleBt601Processor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/GrayscaleBt601Processor.cs @@ -14,7 +14,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class GrayscaleBt601Processor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/GrayscaleBt709Processor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/GrayscaleBt709Processor.cs index e9b06b056a..6fbde6418e 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/GrayscaleBt709Processor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/GrayscaleBt709Processor.cs @@ -12,7 +12,7 @@ namespace ImageSharp.Processors /// ITU-R Recommendation BT.709 . /// public class GrayscaleBt709Processor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/HueProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/HueProcessor.cs index 05189951d5..a829331c92 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/HueProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/HueProcessor.cs @@ -14,7 +14,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class HueProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/IColorMatrixFilter.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/IColorMatrixFilter.cs index 59296a3eb4..ede66fd715 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/IColorMatrixFilter.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/IColorMatrixFilter.cs @@ -14,7 +14,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public interface IColorMatrixFilter : IImageFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/KodachromeProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/KodachromeProcessor.cs index d0d9249a07..a4f58cc415 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/KodachromeProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/KodachromeProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class KodachromeProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/LomographProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/LomographProcessor.cs index 3460e935e2..628c130871 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/LomographProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/LomographProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class LomographProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/PolaroidProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/PolaroidProcessor.cs index 1082f0d454..72fc0a98df 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/PolaroidProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/PolaroidProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class PolaroidProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/SaturationProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/SaturationProcessor.cs index c579cec997..60f7c78157 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/SaturationProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/SaturationProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class SaturationProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ColorMatrix/SepiaProcessor.cs b/src/ImageSharp/Filters/Processors/ColorMatrix/SepiaProcessor.cs index 226a9d17b8..80be3bf4c4 100644 --- a/src/ImageSharp/Filters/Processors/ColorMatrix/SepiaProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ColorMatrix/SepiaProcessor.cs @@ -14,7 +14,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class SepiaProcessor : ColorMatrixFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ContrastProcessor.cs b/src/ImageSharp/Filters/Processors/ContrastProcessor.cs index 9730c026c5..fbcaaa1cdc 100644 --- a/src/ImageSharp/Filters/Processors/ContrastProcessor.cs +++ b/src/ImageSharp/Filters/Processors/ContrastProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. long, float. public class ContrastProcessor : ImageFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/GlowProcessor.cs b/src/ImageSharp/Filters/Processors/GlowProcessor.cs index 51dbb31a5c..d671d1d6f0 100644 --- a/src/ImageSharp/Filters/Processors/GlowProcessor.cs +++ b/src/ImageSharp/Filters/Processors/GlowProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class GlowProcessor : ImageFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/IImageFilter.cs b/src/ImageSharp/Filters/Processors/IImageFilter.cs index edef207001..fc0a7625b0 100644 --- a/src/ImageSharp/Filters/Processors/IImageFilter.cs +++ b/src/ImageSharp/Filters/Processors/IImageFilter.cs @@ -11,7 +11,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public interface IImageFilter : IImageProcessor - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/ImageFilter.cs b/src/ImageSharp/Filters/Processors/ImageFilter.cs index bff2ab872b..34bfdb1fb1 100644 --- a/src/ImageSharp/Filters/Processors/ImageFilter.cs +++ b/src/ImageSharp/Filters/Processors/ImageFilter.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public abstract class ImageFilter : ImageProcessor, IImageFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/InvertProcessor.cs b/src/ImageSharp/Filters/Processors/InvertProcessor.cs index 5846f3e085..d010eaf364 100644 --- a/src/ImageSharp/Filters/Processors/InvertProcessor.cs +++ b/src/ImageSharp/Filters/Processors/InvertProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class InvertProcessor : ImageFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Filters/Processors/VignetteProcessor.cs b/src/ImageSharp/Filters/Processors/VignetteProcessor.cs index b768d88612..b60e496476 100644 --- a/src/ImageSharp/Filters/Processors/VignetteProcessor.cs +++ b/src/ImageSharp/Filters/Processors/VignetteProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class VignetteProcessor : ImageFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs index 8aa2c34416..0e8975d8a0 100644 --- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs +++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs @@ -196,7 +196,7 @@ namespace ImageSharp.Formats /// The number of bits per pixel. /// Whether the bitmap is inverted. private void ReadRgbPalette(TColor[] imageData, byte[] colors, int width, int height, int bits, bool inverted) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { // Pixels per byte (bits per pixel) @@ -259,7 +259,7 @@ namespace ImageSharp.Formats /// The height of the bitmap. /// Whether the bitmap is inverted. private void ReadRgb16(TColor[] imageData, int width, int height, bool inverted) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { // We divide here as we will store the colors in our floating point format. @@ -310,7 +310,7 @@ namespace ImageSharp.Formats /// The height of the bitmap. /// Whether the bitmap is inverted. private void ReadRgb24(TColor[] imageData, int width, int height, bool inverted) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { int alignment; @@ -350,7 +350,7 @@ namespace ImageSharp.Formats /// The height of the bitmap. /// Whether the bitmap is inverted. private void ReadRgb32(TColor[] imageData, int width, int height, bool inverted) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { int alignment; diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs index 24082c7731..c34da8ab75 100644 --- a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs +++ b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs @@ -33,7 +33,7 @@ namespace ImageSharp.Formats /// The to encode the image data to. /// The public void Encode(ImageBase image, Stream stream, BmpBitsPerPixel bitsPerPixel) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { Guard.NotNull(image, nameof(image)); @@ -126,7 +126,7 @@ namespace ImageSharp.Formats /// The containing pixel data. /// private void WriteImage(EndianBinaryWriter writer, ImageBase image) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { using (PixelAccessor pixels = image.Lock()) @@ -152,7 +152,7 @@ namespace ImageSharp.Formats /// The containing the stream to write to. /// The containing pixel data. private void Write32Bit(EndianBinaryWriter writer, PixelAccessor pixels) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { for (int y = pixels.Height - 1; y >= 0; y--) @@ -180,7 +180,7 @@ namespace ImageSharp.Formats /// The containing the stream to write to. /// The containing pixel data. private void Write24Bit(EndianBinaryWriter writer, PixelAccessor pixels) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { for (int y = pixels.Height - 1; y >= 0; y--) diff --git a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs index c4b7e1566e..746e27ff72 100644 --- a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs +++ b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs @@ -227,7 +227,7 @@ namespace ImageSharp.Formats /// The stream to write to. /// The index of the color in the color palette to make transparent. private void WriteGraphicalControlExtension(ImageBase image, EndianBinaryWriter writer, int transparencyIndex) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { // TODO: Check transparency logic. @@ -275,7 +275,7 @@ namespace ImageSharp.Formats /// The to be encoded. /// The stream to write to. private void WriteImageDescriptor(ImageBase image, EndianBinaryWriter writer) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { writer.Write(GifConstants.ImageDescriptorLabel); // 2c diff --git a/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs index 736abdcf0c..bd745eda86 100644 --- a/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs +++ b/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs @@ -353,7 +353,7 @@ namespace ImageSharp.Formats // toYCbCr converts the 8x8 region of m whose top-left corner is p to its // YCbCr values. private void ToYCbCr(PixelAccessor pixels, int x, int y, Block yBlock, Block cbBlock, Block crBlock) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { int xmax = pixels.Width - 1; @@ -736,7 +736,7 @@ namespace ImageSharp.Formats /// /// The pixel accessor providing acces to the image pixels. private void WriteSOS(PixelAccessor pixels) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { // TODO: We should allow grayscale writing. @@ -761,7 +761,7 @@ namespace ImageSharp.Formats /// /// The pixel accessor providing acces to the image pixels. private void Encode444(PixelAccessor pixels) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { Block b = new Block(); @@ -787,7 +787,7 @@ namespace ImageSharp.Formats /// /// The pixel accessor providing acces to the image pixels. private void Encode420(PixelAccessor pixels) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { Block b = new Block(); diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs index e6275ac6a8..b702bfca9a 100644 --- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs +++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs @@ -227,7 +227,7 @@ namespace ImageSharp.Formats /// The containing data. /// The pixel data. private void ReadScanlines(MemoryStream dataStream, TColor[] pixels) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { this.bytesPerPixel = this.CalculateBytesPerPixel(); @@ -260,7 +260,7 @@ namespace ImageSharp.Formats /// The pixel data. /// The image pixels. private void DecodePixelData(byte[] pixelData, TColor[] pixels) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { byte[] previousScanline = new byte[this.bytesPerScanline]; @@ -322,7 +322,7 @@ namespace ImageSharp.Formats /// The current image row. /// The image pixels private void ProcessDefilteredScanline(byte[] defilteredScanline, int row, TColor[] pixels) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { switch (this.PngColorType) diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs index 059d7d0e0b..7f71906692 100644 --- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs +++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs @@ -248,7 +248,7 @@ namespace ImageSharp.Formats /// The packed format. uint, long, float. /// The image to encode. private void CollectGrayscaleBytes(ImageBase image) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { // Copy the pixels across from the image. @@ -292,7 +292,7 @@ namespace ImageSharp.Formats /// The packed format. uint, long, float. /// The image to encode. private void CollectColorBytes(ImageBase image) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { // Copy the pixels across from the image. diff --git a/src/ImageSharp/Image/IImageBase.cs b/src/ImageSharp/Image/IImageBase.cs index 2e4c58f08b..fdd82099f6 100644 --- a/src/ImageSharp/Image/IImageBase.cs +++ b/src/ImageSharp/Image/IImageBase.cs @@ -11,7 +11,7 @@ namespace ImageSharp /// The pixel format. /// The packed format. uint, long, float. public interface IImageBase : IImageBase - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Image/IImageFrame.cs b/src/ImageSharp/Image/IImageFrame.cs index eebdfe4b6e..f6f856b22c 100644 --- a/src/ImageSharp/Image/IImageFrame.cs +++ b/src/ImageSharp/Image/IImageFrame.cs @@ -11,7 +11,7 @@ namespace ImageSharp /// The pixel format. /// The packed format. uint, long, float. public interface IImageFrame : IImageBase - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { } diff --git a/src/ImageSharp/Image/ImageBase.cs b/src/ImageSharp/Image/ImageBase.cs index 0a0b5f4b4e..10c8c114aa 100644 --- a/src/ImageSharp/Image/ImageBase.cs +++ b/src/ImageSharp/Image/ImageBase.cs @@ -16,7 +16,7 @@ namespace ImageSharp /// The packed format. uint, long, float. [DebuggerDisplay("Image: {Width}x{Height}")] public abstract class ImageBase : IImageBase - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Image/ImageFrame.cs b/src/ImageSharp/Image/ImageFrame.cs index 97140a3844..fa576c4eba 100644 --- a/src/ImageSharp/Image/ImageFrame.cs +++ b/src/ImageSharp/Image/ImageFrame.cs @@ -11,7 +11,7 @@ namespace ImageSharp /// The pixel format. /// The packed format. uint, long, float. public class ImageFrame : ImageBase - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Image/PixelAccessor.cs b/src/ImageSharp/Image/PixelAccessor.cs index d7e08d5daf..d6f6772645 100644 --- a/src/ImageSharp/Image/PixelAccessor.cs +++ b/src/ImageSharp/Image/PixelAccessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp /// The pixel format. /// The packed format. uint, long, float. public unsafe class PixelAccessor : IDisposable - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/ImageProcessor.cs b/src/ImageSharp/ImageProcessor.cs index 0414444d7e..17395218de 100644 --- a/src/ImageSharp/ImageProcessor.cs +++ b/src/ImageSharp/ImageProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public abstract class ImageProcessor : IImageProcessor - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Options/ResizeHelper.cs b/src/ImageSharp/Samplers/Options/ResizeHelper.cs index 758594a087..33aa325280 100644 --- a/src/ImageSharp/Samplers/Options/ResizeHelper.cs +++ b/src/ImageSharp/Samplers/Options/ResizeHelper.cs @@ -25,7 +25,7 @@ namespace ImageSharp /// The . /// public static Rectangle CalculateTargetLocationAndBounds(ImageBase source, ResizeOptions options) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { switch (options.Mode) @@ -58,7 +58,7 @@ namespace ImageSharp /// The . /// private static Rectangle CalculateCropRectangle(ImageBase source, ResizeOptions options) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { int width = options.Size.Width; @@ -179,7 +179,7 @@ namespace ImageSharp /// The . /// private static Rectangle CalculatePadRectangle(ImageBase source, ResizeOptions options) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { int width = options.Size.Width; @@ -262,7 +262,7 @@ namespace ImageSharp /// The . /// private static Rectangle CalculateBoxPadRectangle(ImageBase source, ResizeOptions options) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { int width = options.Size.Width; @@ -351,7 +351,7 @@ namespace ImageSharp /// The . /// private static Rectangle CalculateMaxRectangle(ImageBase source, ResizeOptions options) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { int width = options.Size.Width; @@ -394,7 +394,7 @@ namespace ImageSharp /// The . /// private static Rectangle CalculateMinRectangle(ImageBase source, ResizeOptions options) - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { int width = options.Size.Width; diff --git a/src/ImageSharp/Samplers/Processors/Convolution/Convolution2DFilter.cs b/src/ImageSharp/Samplers/Processors/Convolution/Convolution2DFilter.cs index 7f6a44ea7d..1b77e41eb6 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/Convolution2DFilter.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/Convolution2DFilter.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class Convolution2DFilter : ImageSampler - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Convolution/ConvolutionFilter.cs b/src/ImageSharp/Samplers/Processors/Convolution/ConvolutionFilter.cs index d87b55b9d0..c94bee764c 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/ConvolutionFilter.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/ConvolutionFilter.cs @@ -14,7 +14,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class ConvolutionFilter : ImageSampler - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/EdgeDetector2DFilter.cs b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/EdgeDetector2DFilter.cs index acd8a29ca1..a689415f6a 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/EdgeDetector2DFilter.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/EdgeDetector2DFilter.cs @@ -12,7 +12,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public abstract class EdgeDetector2DFilter : ImageSampler, IEdgeDetectorFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/EdgeDetectorFilter.cs b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/EdgeDetectorFilter.cs index 4722378d7e..a565dbfc17 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/EdgeDetectorFilter.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/EdgeDetectorFilter.cs @@ -11,7 +11,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public abstract class EdgeDetectorFilter : ImageSampler, IEdgeDetectorFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/IEdgeDetectorFilter.cs b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/IEdgeDetectorFilter.cs index f37797fec1..700201ea4d 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/IEdgeDetectorFilter.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/IEdgeDetectorFilter.cs @@ -11,7 +11,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public interface IEdgeDetectorFilter : IImageSampler, IEdgeDetectorFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { } diff --git a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs index ead8f7b3c7..cbe45f8b62 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The packed format. uint, long, float. [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")] public class KayyaliProcessor : EdgeDetector2DFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs index cd18d90cb6..9fbf716749 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The packed format. uint, long, float. [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")] public class Laplacian3X3Processor : EdgeDetectorFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs index ab4cefa718..fdff0ec3af 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The packed format. uint, long, float. [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")] public class Laplacian5X5Processor : EdgeDetectorFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs index 9adfb9425a..75e0efbd27 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The packed format. uint, long, float. [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")] public class LaplacianOfGaussianProcessor : EdgeDetectorFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/PrewittProcessor.cs b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/PrewittProcessor.cs index db0c7ac616..70b763e63f 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/PrewittProcessor.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/PrewittProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The packed format. uint, long, float. [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")] public class PrewittProcessor : EdgeDetector2DFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs index efbb3a57ca..8eb3aac3bf 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The packed format. uint, long, float. [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")] public class RobertsCrossProcessor : EdgeDetector2DFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/ScharrProcessor.cs b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/ScharrProcessor.cs index 86cefda22d..22e7d80847 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/ScharrProcessor.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/ScharrProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The packed format. uint, long, float. [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")] public class ScharrProcessor : EdgeDetector2DFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/SobelProcessor.cs b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/SobelProcessor.cs index 0235479bf8..7d9521c691 100644 --- a/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/SobelProcessor.cs +++ b/src/ImageSharp/Samplers/Processors/Convolution/EdgeDetection/SobelProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The packed format. uint, long, float. [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")] public class SobelProcessor : EdgeDetector2DFilter - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/CropProcessor.cs b/src/ImageSharp/Samplers/Processors/CropProcessor.cs index 03fb0b283a..0e8510837a 100644 --- a/src/ImageSharp/Samplers/Processors/CropProcessor.cs +++ b/src/ImageSharp/Samplers/Processors/CropProcessor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class CropProcessor : ImageSampler - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/IImageSampler.cs b/src/ImageSharp/Samplers/Processors/IImageSampler.cs index bc2f3197a5..891a810d14 100644 --- a/src/ImageSharp/Samplers/Processors/IImageSampler.cs +++ b/src/ImageSharp/Samplers/Processors/IImageSampler.cs @@ -11,7 +11,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public interface IImageSampler : IImageProcessor - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/ImageSampler.cs b/src/ImageSharp/Samplers/Processors/ImageSampler.cs index 28341b3fe8..98ffe3b881 100644 --- a/src/ImageSharp/Samplers/Processors/ImageSampler.cs +++ b/src/ImageSharp/Samplers/Processors/ImageSampler.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public abstract class ImageSampler : ImageProcessor, IImageSampler - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/Matrix3x2Processor.cs b/src/ImageSharp/Samplers/Processors/Matrix3x2Processor.cs index 938f50bada..a9b460d43f 100644 --- a/src/ImageSharp/Samplers/Processors/Matrix3x2Processor.cs +++ b/src/ImageSharp/Samplers/Processors/Matrix3x2Processor.cs @@ -13,7 +13,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public abstract class Matrix3x2Processor : ImageSampler - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/OilPaintingProcessor.cs b/src/ImageSharp/Samplers/Processors/OilPaintingProcessor.cs index 6a9362b509..ee0d4121aa 100644 --- a/src/ImageSharp/Samplers/Processors/OilPaintingProcessor.cs +++ b/src/ImageSharp/Samplers/Processors/OilPaintingProcessor.cs @@ -16,7 +16,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class OilPaintingProcessor : ImageSampler - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/PixelateProcessor.cs b/src/ImageSharp/Samplers/Processors/PixelateProcessor.cs index df5c030cea..2c18759091 100644 --- a/src/ImageSharp/Samplers/Processors/PixelateProcessor.cs +++ b/src/ImageSharp/Samplers/Processors/PixelateProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class PixelateProcessor : ImageSampler - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/ResamplingWeightedProcessor.cs b/src/ImageSharp/Samplers/Processors/ResamplingWeightedProcessor.cs index 20631494a3..1d9d3da352 100644 --- a/src/ImageSharp/Samplers/Processors/ResamplingWeightedProcessor.cs +++ b/src/ImageSharp/Samplers/Processors/ResamplingWeightedProcessor.cs @@ -14,7 +14,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public abstract class ResamplingWeightedProcessor : ImageSampler - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { /// diff --git a/src/ImageSharp/Samplers/Processors/SkewProcessor.cs b/src/ImageSharp/Samplers/Processors/SkewProcessor.cs index 27156d49d8..b21301a875 100644 --- a/src/ImageSharp/Samplers/Processors/SkewProcessor.cs +++ b/src/ImageSharp/Samplers/Processors/SkewProcessor.cs @@ -15,7 +15,7 @@ namespace ImageSharp.Processors /// The pixel format. /// The packed format. uint, long, float. public class SkewProcessor : Matrix3x2Processor - where TColor : struct, IPackedVector + where TColor : struct, IPackedPixel where TPacked : struct { ///