diff --git a/ImageProcessor.sln b/ImageProcessorCore.sln similarity index 83% rename from ImageProcessor.sln rename to ImageProcessorCore.sln index 35ec0a49d0..a4df907b45 100644 --- a/ImageProcessor.sln +++ b/ImageProcessorCore.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessor", "src\ImageProcessor\ImageProcessor.xproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessorCore", "src\ImageProcessorCore\ImageProcessorCore.xproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessor.Tests", "tests\ImageProcessor.Tests\ImageProcessor.Tests.xproj", "{F836E8E6-B4D9-4208-8346-140C74678B91}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessorCore.Tests", "tests\ImageProcessorCore.Tests\ImageProcessorCore.Tests.xproj", "{F836E8E6-B4D9-4208-8346-140C74678B91}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ImageProcessor.sln.DotSettings b/ImageProcessorCore.sln.DotSettings similarity index 100% rename from ImageProcessor.sln.DotSettings rename to ImageProcessorCore.sln.DotSettings diff --git a/README.md b/README.md index 30494e6a90..b97a204714 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ImageProcessor -**This branch contains the new cross platform version of ImageProcessor**. +## This branch contains the new cross platform version ImageProcessorCore. This is a complete rewrite from the ground up to allow the processing of images without the use of `System.Drawing` using a cross-platform class library. It's still in early stages but progress has been pretty quick. @@ -9,11 +9,7 @@ This is a complete rewrite from the ground up to allow the processing of images ###Why am I writing this? -With NETCore there is currently no version of `System.Drawing` to allow continued progress of the existing ImageProcessor library. Progress developing a cross-platform update are restricted to the [CoreFXLab repo](https://github.com/dotnet/corefxlab/tree/master/src/System.Drawing.Graphics) where progress seems to be very slow. - -###Is this wise? - -Honestly... I don't know. I could be writing code that may be suddenly obsolete. There has been little [feedback](https://github.com/dotnet/corefxlab/issues/86#issuecomment-139930600) on questions I've asked but it's a nice learning process if anything and I will definitely be releasing the code for consumption. +With NETCore there is currently no version of `System.Drawing` to allow continued progress of the existing ImageProcessor library. ### Installation At present the code is pre-release but when ready it will be available on [Nuget](http://www.nuget.org). @@ -130,7 +126,7 @@ git clone https://github.com/JimBobSquarePants/ImageProcessor With this version the API will change dramatically. Without the constraints of `System.Drawing` I have been able to develop something much more flexible, easier to code against, and much, much less prone to memory leaks. Gone are using image classes which implements `IDisposable`, Gone are system wide proces locks with Images and processors thread safe usable in parallel processing utilizing all the availables cores. -Image methods are also fluent which allow chaining much like the `ImageFactory` class in V2 and below. +Image methods are also fluent which allow chaining much like the `ImageFactory` class in the Framework version. Here's an example of the code required to resize an image using the default Robidoux resampler then turn the colors into their greyscale equivalent using the BT709 standard matrix. diff --git a/appveyor.yml b/appveyor.yml index 0afc70d701..895790bf0f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: v3.0.0.{build} +version: v1.0.0.{build} os: Visual Studio 2015 install: @@ -8,8 +8,8 @@ install: assembly_info: patch: true file: '**\AssemblyInfo.*' - assembly_version: '3.0.0.{build}' - assembly_file_version: '3.0.0.{build}' + assembly_version: '1.0.0.{build}' + assembly_file_version: '1.0.0.{build}' before_build: - cmd: >- @@ -21,9 +21,9 @@ before_build: dnvm list - dnu restore src\ImageProcessor + dnu restore src\ImageProcessorCore - dnu restore tests\ImageProcessor.Tests + dnu restore tests\ImageProcessorCore.Tests cd build @@ -35,21 +35,21 @@ before_build: build_script: - cmd: >- - dnu build src\ImageProcessor + dnu build src\ImageProcessorCore - dnu build tests\ImageProcessor.Tests + dnu build tests\ImageProcessorCore.Tests - dnu pack src\ImageProcessor --configuration Release --out "artifacts\bin\ImageProcessor" + dnu pack src\ImageProcessorCore --configuration Release --out "artifacts\bin\ImageProcessorCore" test_script: - cmd: >- dnvm use 1.0.0-rc1-update1 -r coreclr -a x64 - cd tests/ImageProcessor.Tests + cd tests/ImageProcessorCore.Tests dnx test artifacts: -- path: artifacts\bin\ImageProcessor\**\*.nupkg +- path: artifacts\bin\ImageProcessorCore\**\*.nupkg deploy: # MyGet Deployment for builds & releases diff --git a/build/appveyor-project-version-patch.js b/build/appveyor-project-version-patch.js index 2af9f5a3c2..0a0e90ce7d 100644 --- a/build/appveyor-project-version-patch.js +++ b/build/appveyor-project-version-patch.js @@ -3,7 +3,6 @@ var semver = require('semver'); var file = '../src/imageprocessor/project.json'; var buildVersion = process.env.APPVEYOR_BUILD_VERSION.substring(1); -//var buildVersion = '3.0.0.23'; var findPoint = buildVersion.lastIndexOf("."); var basePackageVer = buildVersion.substring(0, findPoint); diff --git a/src/ImageProcessor/stylecop.json b/src/ImageProcessor/stylecop.json deleted file mode 100644 index 26b5b85181..0000000000 --- a/src/ImageProcessor/stylecop.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", - "settings": { - "documentationRules": { - "companyName": "James Jackson-South", - "copyrightText": "Copyright (c) {companyName} and contributors.\nLicensed under the {licenseName}.", - "variables": { - "licenseName": "Apache License, Version 2.0" - }, - "documentPrivateFields": true - } - } -} diff --git a/src/ImageProcessor/Colors/Color.cs b/src/ImageProcessorCore/Colors/Color.cs similarity index 99% rename from src/ImageProcessor/Colors/Color.cs rename to src/ImageProcessorCore/Colors/Color.cs index 44ed036e33..5b35205d94 100644 --- a/src/ImageProcessor/Colors/Color.cs +++ b/src/ImageProcessorCore/Colors/Color.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/Colors/ColorDefinitions.cs b/src/ImageProcessorCore/Colors/ColorDefinitions.cs similarity index 99% rename from src/ImageProcessor/Colors/ColorDefinitions.cs rename to src/ImageProcessorCore/Colors/ColorDefinitions.cs index 061b509dee..aaf99bb1b3 100644 --- a/src/ImageProcessor/Colors/ColorDefinitions.cs +++ b/src/ImageProcessorCore/Colors/ColorDefinitions.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { /// /// Represents a four-component color using red, green, blue, and alpha data. diff --git a/src/ImageProcessor/Colors/ColorTransforms.cs b/src/ImageProcessorCore/Colors/ColorTransforms.cs similarity index 98% rename from src/ImageProcessor/Colors/ColorTransforms.cs rename to src/ImageProcessorCore/Colors/ColorTransforms.cs index 43bc03251c..2a0da9407f 100644 --- a/src/ImageProcessor/Colors/ColorTransforms.cs +++ b/src/ImageProcessorCore/Colors/ColorTransforms.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; diff --git a/src/ImageProcessor/Colors/ColorspaceTransforms.cs b/src/ImageProcessorCore/Colors/ColorspaceTransforms.cs similarity index 99% rename from src/ImageProcessor/Colors/ColorspaceTransforms.cs rename to src/ImageProcessorCore/Colors/ColorspaceTransforms.cs index 334c967fbc..4e339ebe3c 100644 --- a/src/ImageProcessor/Colors/ColorspaceTransforms.cs +++ b/src/ImageProcessorCore/Colors/ColorspaceTransforms.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; diff --git a/src/ImageProcessor/Colors/Colorspaces/Bgra32.cs b/src/ImageProcessorCore/Colors/Colorspaces/Bgra32.cs similarity index 99% rename from src/ImageProcessor/Colors/Colorspaces/Bgra32.cs rename to src/ImageProcessorCore/Colors/Colorspaces/Bgra32.cs index 92843267ff..919b358f7a 100644 --- a/src/ImageProcessor/Colors/Colorspaces/Bgra32.cs +++ b/src/ImageProcessorCore/Colors/Colorspaces/Bgra32.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/Colors/Colorspaces/CieLab.cs b/src/ImageProcessorCore/Colors/Colorspaces/CieLab.cs similarity index 99% rename from src/ImageProcessor/Colors/Colorspaces/CieLab.cs rename to src/ImageProcessorCore/Colors/Colorspaces/CieLab.cs index d5875da072..2f684e45ca 100644 --- a/src/ImageProcessor/Colors/Colorspaces/CieLab.cs +++ b/src/ImageProcessorCore/Colors/Colorspaces/CieLab.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/Colors/Colorspaces/CieXyz.cs b/src/ImageProcessorCore/Colors/Colorspaces/CieXyz.cs similarity index 99% rename from src/ImageProcessor/Colors/Colorspaces/CieXyz.cs rename to src/ImageProcessorCore/Colors/Colorspaces/CieXyz.cs index ab63c868d0..a14c04bddf 100644 --- a/src/ImageProcessor/Colors/Colorspaces/CieXyz.cs +++ b/src/ImageProcessorCore/Colors/Colorspaces/CieXyz.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/Colors/Colorspaces/Cmyk.cs b/src/ImageProcessorCore/Colors/Colorspaces/Cmyk.cs similarity index 99% rename from src/ImageProcessor/Colors/Colorspaces/Cmyk.cs rename to src/ImageProcessorCore/Colors/Colorspaces/Cmyk.cs index 8e171b6b16..1d8e8d8529 100644 --- a/src/ImageProcessor/Colors/Colorspaces/Cmyk.cs +++ b/src/ImageProcessorCore/Colors/Colorspaces/Cmyk.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/Colors/Colorspaces/Hsl.cs b/src/ImageProcessorCore/Colors/Colorspaces/Hsl.cs similarity index 99% rename from src/ImageProcessor/Colors/Colorspaces/Hsl.cs rename to src/ImageProcessorCore/Colors/Colorspaces/Hsl.cs index aa6013ecde..e585ecf4d7 100644 --- a/src/ImageProcessor/Colors/Colorspaces/Hsl.cs +++ b/src/ImageProcessorCore/Colors/Colorspaces/Hsl.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/Colors/Colorspaces/Hsv.cs b/src/ImageProcessorCore/Colors/Colorspaces/Hsv.cs similarity index 99% rename from src/ImageProcessor/Colors/Colorspaces/Hsv.cs rename to src/ImageProcessorCore/Colors/Colorspaces/Hsv.cs index 47837dff55..8ce2183de2 100644 --- a/src/ImageProcessor/Colors/Colorspaces/Hsv.cs +++ b/src/ImageProcessorCore/Colors/Colorspaces/Hsv.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/Colors/Colorspaces/YCbCr.cs b/src/ImageProcessorCore/Colors/Colorspaces/YCbCr.cs similarity index 99% rename from src/ImageProcessor/Colors/Colorspaces/YCbCr.cs rename to src/ImageProcessorCore/Colors/Colorspaces/YCbCr.cs index 583b3d268f..5cef084ccf 100644 --- a/src/ImageProcessor/Colors/Colorspaces/YCbCr.cs +++ b/src/ImageProcessorCore/Colors/Colorspaces/YCbCr.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/Colors/IAlmostEquatable.cs b/src/ImageProcessorCore/Colors/IAlmostEquatable.cs similarity index 97% rename from src/ImageProcessor/Colors/IAlmostEquatable.cs rename to src/ImageProcessorCore/Colors/IAlmostEquatable.cs index c6500dbc2f..4677c3415f 100644 --- a/src/ImageProcessor/Colors/IAlmostEquatable.cs +++ b/src/ImageProcessorCore/Colors/IAlmostEquatable.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; diff --git a/src/ImageProcessor/Colors/RgbaComponent.cs b/src/ImageProcessorCore/Colors/RgbaComponent.cs similarity index 96% rename from src/ImageProcessor/Colors/RgbaComponent.cs rename to src/ImageProcessorCore/Colors/RgbaComponent.cs index 526e43d822..a4b668cb62 100644 --- a/src/ImageProcessor/Colors/RgbaComponent.cs +++ b/src/ImageProcessorCore/Colors/RgbaComponent.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { /// /// Enumerates the RGBA (red, green, blue, alpha) color components. diff --git a/src/ImageProcessor/Common/Exceptions/ImageFormatException.cs b/src/ImageProcessorCore/Common/Exceptions/ImageFormatException.cs similarity index 98% rename from src/ImageProcessor/Common/Exceptions/ImageFormatException.cs rename to src/ImageProcessorCore/Common/Exceptions/ImageFormatException.cs index ad766ce235..87fb381597 100644 --- a/src/ImageProcessor/Common/Exceptions/ImageFormatException.cs +++ b/src/ImageProcessorCore/Common/Exceptions/ImageFormatException.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; diff --git a/src/ImageProcessor/Common/Exceptions/ImageProcessingException.cs b/src/ImageProcessorCore/Common/Exceptions/ImageProcessingException.cs similarity index 98% rename from src/ImageProcessor/Common/Exceptions/ImageProcessingException.cs rename to src/ImageProcessorCore/Common/Exceptions/ImageProcessingException.cs index fe187e077e..7899dcf44c 100644 --- a/src/ImageProcessor/Common/Exceptions/ImageProcessingException.cs +++ b/src/ImageProcessorCore/Common/Exceptions/ImageProcessingException.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; diff --git a/src/ImageProcessor/Common/Extensions/ByteExtensions.cs b/src/ImageProcessorCore/Common/Extensions/ByteExtensions.cs similarity index 98% rename from src/ImageProcessor/Common/Extensions/ByteExtensions.cs rename to src/ImageProcessorCore/Common/Extensions/ByteExtensions.cs index aeca815602..b72ce9d26c 100644 --- a/src/ImageProcessor/Common/Extensions/ByteExtensions.cs +++ b/src/ImageProcessorCore/Common/Extensions/ByteExtensions.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; diff --git a/src/ImageProcessor/Common/Extensions/ComparableExtensions.cs b/src/ImageProcessorCore/Common/Extensions/ComparableExtensions.cs similarity index 99% rename from src/ImageProcessor/Common/Extensions/ComparableExtensions.cs rename to src/ImageProcessorCore/Common/Extensions/ComparableExtensions.cs index 5560d90d13..cb0288fb7b 100644 --- a/src/ImageProcessor/Common/Extensions/ComparableExtensions.cs +++ b/src/ImageProcessorCore/Common/Extensions/ComparableExtensions.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; diff --git a/src/ImageProcessor/Common/Extensions/EnumerableExtensions.cs b/src/ImageProcessorCore/Common/Extensions/EnumerableExtensions.cs similarity index 99% rename from src/ImageProcessor/Common/Extensions/EnumerableExtensions.cs rename to src/ImageProcessorCore/Common/Extensions/EnumerableExtensions.cs index b1f2f75248..107320412e 100644 --- a/src/ImageProcessor/Common/Extensions/EnumerableExtensions.cs +++ b/src/ImageProcessorCore/Common/Extensions/EnumerableExtensions.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.Collections.Generic; diff --git a/src/ImageProcessor/Common/Helpers/Guard.cs b/src/ImageProcessorCore/Common/Helpers/Guard.cs similarity index 98% rename from src/ImageProcessor/Common/Helpers/Guard.cs rename to src/ImageProcessorCore/Common/Helpers/Guard.cs index b04af61296..96c7023d43 100644 --- a/src/ImageProcessor/Common/Helpers/Guard.cs +++ b/src/ImageProcessorCore/Common/Helpers/Guard.cs @@ -10,8 +10,8 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("ImageProcessor.Tests")] -namespace ImageProcessor +[assembly: InternalsVisibleTo("ImageProcessorCore.Tests")] +namespace ImageProcessorCore { using System; using System.Diagnostics; diff --git a/src/ImageProcessor/Common/Helpers/ImageMaths.cs b/src/ImageProcessorCore/Common/Helpers/ImageMaths.cs similarity index 99% rename from src/ImageProcessor/Common/Helpers/ImageMaths.cs rename to src/ImageProcessorCore/Common/Helpers/ImageMaths.cs index d78f6723e6..207ff61a77 100644 --- a/src/ImageProcessor/Common/Helpers/ImageMaths.cs +++ b/src/ImageProcessorCore/Common/Helpers/ImageMaths.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.Numerics; diff --git a/src/ImageProcessor/Filters/Alpha.cs b/src/ImageProcessorCore/Filters/Alpha.cs similarity index 92% rename from src/ImageProcessor/Filters/Alpha.cs rename to src/ImageProcessorCore/Filters/Alpha.cs index 067fb3cc3a..5e2861bd27 100644 --- a/src/ImageProcessor/Filters/Alpha.cs +++ b/src/ImageProcessorCore/Filters/Alpha.cs @@ -3,16 +3,16 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; using System.Numerics; using System.Threading.Tasks; /// - /// An to change the Alpha of an . + /// An to change the Alpha of an . /// - public class Alpha : ParallelImageProcessor + public class Alpha : ParallelImageProcessorCore { /// /// Initializes a new instance of the class. diff --git a/src/ImageProcessor/Filters/BackgroundColor.cs b/src/ImageProcessorCore/Filters/BackgroundColor.cs similarity index 95% rename from src/ImageProcessor/Filters/BackgroundColor.cs rename to src/ImageProcessorCore/Filters/BackgroundColor.cs index 1683f964cf..a2a07f59c5 100644 --- a/src/ImageProcessor/Filters/BackgroundColor.cs +++ b/src/ImageProcessorCore/Filters/BackgroundColor.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; using System.Threading.Tasks; @@ -11,7 +11,7 @@ namespace ImageProcessor.Filters /// /// Sets the background color of the image. /// - public class BackgroundColor : ParallelImageProcessor + public class BackgroundColor : ParallelImageProcessorCore { /// /// The epsilon for comparing floating point numbers. diff --git a/src/ImageProcessor/Filters/Binarization/Threshold.cs b/src/ImageProcessorCore/Filters/Binarization/Threshold.cs similarity index 93% rename from src/ImageProcessor/Filters/Binarization/Threshold.cs rename to src/ImageProcessorCore/Filters/Binarization/Threshold.cs index 9e76a121fd..a234d1b385 100644 --- a/src/ImageProcessor/Filters/Binarization/Threshold.cs +++ b/src/ImageProcessorCore/Filters/Binarization/Threshold.cs @@ -3,18 +3,18 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; using System.Numerics; using System.Threading.Tasks; /// - /// An to perform binary threshold filtering against an + /// An to perform binary threshold filtering against an /// . The image will be converted to greyscale before thresholding /// occurs. /// - public class Threshold : ParallelImageProcessor + public class Threshold : ParallelImageProcessorCore { /// /// Initializes a new instance of the class. diff --git a/src/ImageProcessor/Filters/Blend.cs b/src/ImageProcessorCore/Filters/Blend.cs similarity index 96% rename from src/ImageProcessor/Filters/Blend.cs rename to src/ImageProcessorCore/Filters/Blend.cs index 3c2cb8405d..fcd186d117 100644 --- a/src/ImageProcessor/Filters/Blend.cs +++ b/src/ImageProcessorCore/Filters/Blend.cs @@ -3,14 +3,14 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Threading.Tasks; /// /// Combines two images together by blending the pixels. /// - public class Blend : ParallelImageProcessor + public class Blend : ParallelImageProcessorCore { /// /// The image to blend. diff --git a/src/ImageProcessor/Filters/Brightness.cs b/src/ImageProcessorCore/Filters/Brightness.cs similarity index 91% rename from src/ImageProcessor/Filters/Brightness.cs rename to src/ImageProcessorCore/Filters/Brightness.cs index 73c8b377fe..def8d02373 100644 --- a/src/ImageProcessor/Filters/Brightness.cs +++ b/src/ImageProcessorCore/Filters/Brightness.cs @@ -3,16 +3,16 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; using System.Numerics; using System.Threading.Tasks; /// - /// An to change the brightness of an . + /// An to change the brightness of an . /// - public class Brightness : ParallelImageProcessor + public class Brightness : ParallelImageProcessorCore { /// /// Initializes a new instance of the class. diff --git a/src/ImageProcessor/Filters/ColorMatrix/BlackWhite.cs b/src/ImageProcessorCore/Filters/ColorMatrix/BlackWhite.cs similarity index 95% rename from src/ImageProcessor/Filters/ColorMatrix/BlackWhite.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/BlackWhite.cs index b305b6d761..f0d2a366a9 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/BlackWhite.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/BlackWhite.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Numerics; diff --git a/src/ImageProcessor/Filters/ColorMatrix/ColorMatrixFilter.cs b/src/ImageProcessorCore/Filters/ColorMatrix/ColorMatrixFilter.cs similarity index 97% rename from src/ImageProcessor/Filters/ColorMatrix/ColorMatrixFilter.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/ColorMatrixFilter.cs index 40188950fe..7ed7ef16bc 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/ColorMatrixFilter.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/ColorMatrixFilter.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Numerics; using System.Threading.Tasks; @@ -11,7 +11,7 @@ namespace ImageProcessor.Filters /// /// The color matrix filter. /// - public abstract class ColorMatrixFilter : ParallelImageProcessor, IColorMatrixFilter + public abstract class ColorMatrixFilter : ParallelImageProcessorCore, IColorMatrixFilter { /// public abstract Matrix4x4 Matrix { get; } diff --git a/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt601.cs b/src/ImageProcessorCore/Filters/ColorMatrix/GreyscaleBt601.cs similarity index 96% rename from src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt601.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/GreyscaleBt601.cs index 0d5e3e58a2..49ee2642e9 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt601.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/GreyscaleBt601.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Numerics; diff --git a/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt709.cs b/src/ImageProcessorCore/Filters/ColorMatrix/GreyscaleBt709.cs similarity index 95% rename from src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt709.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/GreyscaleBt709.cs index 5b3128dd9f..da0533d746 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt709.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/GreyscaleBt709.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Numerics; diff --git a/src/ImageProcessor/Filters/ColorMatrix/GreyscaleMode.cs b/src/ImageProcessorCore/Filters/ColorMatrix/GreyscaleMode.cs similarity index 93% rename from src/ImageProcessor/Filters/ColorMatrix/GreyscaleMode.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/GreyscaleMode.cs index 16bff59062..27ddad9513 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/GreyscaleMode.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/GreyscaleMode.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// Provides enumeration over the various greyscale methods available. diff --git a/src/ImageProcessor/Filters/ColorMatrix/Hue.cs b/src/ImageProcessorCore/Filters/ColorMatrix/Hue.cs similarity index 98% rename from src/ImageProcessor/Filters/ColorMatrix/Hue.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/Hue.cs index a77f6ff091..4d1945ecf7 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/Hue.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/Hue.cs @@ -1,4 +1,4 @@ -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; using System.Numerics; diff --git a/src/ImageProcessor/Filters/ColorMatrix/IColorMatrixFilter.cs b/src/ImageProcessorCore/Filters/ColorMatrix/IColorMatrixFilter.cs similarity index 87% rename from src/ImageProcessor/Filters/ColorMatrix/IColorMatrixFilter.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/IColorMatrixFilter.cs index 3ac0bedc76..2f5d695ebf 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/IColorMatrixFilter.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/IColorMatrixFilter.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Numerics; @@ -11,7 +11,7 @@ namespace ImageProcessor.Filters /// Encapsulates properties and methods for creating processors that utilize a matrix to /// alter the image pixels. /// - public interface IColorMatrixFilter : IImageProcessor + public interface IColorMatrixFilter : IImageProcessorCore { /// /// Gets the used to alter the image. diff --git a/src/ImageProcessor/Filters/ColorMatrix/Kodachrome.cs b/src/ImageProcessorCore/Filters/ColorMatrix/Kodachrome.cs similarity index 94% rename from src/ImageProcessor/Filters/ColorMatrix/Kodachrome.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/Kodachrome.cs index b9c1e293df..03f248fd9b 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/Kodachrome.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/Kodachrome.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Numerics; diff --git a/src/ImageProcessor/Filters/ColorMatrix/Lomograph.cs b/src/ImageProcessorCore/Filters/ColorMatrix/Lomograph.cs similarity index 96% rename from src/ImageProcessor/Filters/ColorMatrix/Lomograph.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/Lomograph.cs index c6ea9ef30b..9567a80567 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/Lomograph.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/Lomograph.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Numerics; diff --git a/src/ImageProcessor/Filters/ColorMatrix/Polaroid.cs b/src/ImageProcessorCore/Filters/ColorMatrix/Polaroid.cs similarity index 97% rename from src/ImageProcessor/Filters/ColorMatrix/Polaroid.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/Polaroid.cs index 08961bf7af..dfd877ca22 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/Polaroid.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/Polaroid.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Numerics; diff --git a/src/ImageProcessor/Filters/ColorMatrix/Saturation.cs b/src/ImageProcessorCore/Filters/ColorMatrix/Saturation.cs similarity index 95% rename from src/ImageProcessor/Filters/ColorMatrix/Saturation.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/Saturation.cs index 42b80835d5..9729d68ac1 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/Saturation.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/Saturation.cs @@ -3,13 +3,13 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; using System.Numerics; /// - /// An to change the saturation of an . + /// An to change the saturation of an . /// public class Saturation : ColorMatrixFilter { diff --git a/src/ImageProcessor/Filters/ColorMatrix/Sepia.cs b/src/ImageProcessorCore/Filters/ColorMatrix/Sepia.cs similarity index 96% rename from src/ImageProcessor/Filters/ColorMatrix/Sepia.cs rename to src/ImageProcessorCore/Filters/ColorMatrix/Sepia.cs index cab932b253..2898e7b0ca 100644 --- a/src/ImageProcessor/Filters/ColorMatrix/Sepia.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/Sepia.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Numerics; diff --git a/src/ImageProcessor/Filters/Contrast.cs b/src/ImageProcessorCore/Filters/Contrast.cs similarity index 92% rename from src/ImageProcessor/Filters/Contrast.cs rename to src/ImageProcessorCore/Filters/Contrast.cs index 0b8e58ecf5..96c8a243a8 100644 --- a/src/ImageProcessor/Filters/Contrast.cs +++ b/src/ImageProcessorCore/Filters/Contrast.cs @@ -3,16 +3,16 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; using System.Numerics; using System.Threading.Tasks; /// - /// An to change the contrast of an . + /// An to change the contrast of an . /// - public class Contrast : ParallelImageProcessor + public class Contrast : ParallelImageProcessorCore { /// /// Initializes a new instance of the class. diff --git a/src/ImageProcessor/Filters/Convolution/BoxBlur.cs b/src/ImageProcessorCore/Filters/Convolution/BoxBlur.cs similarity index 98% rename from src/ImageProcessor/Filters/Convolution/BoxBlur.cs rename to src/ImageProcessorCore/Filters/Convolution/BoxBlur.cs index 0de41f22f3..f104140bd4 100644 --- a/src/ImageProcessor/Filters/Convolution/BoxBlur.cs +++ b/src/ImageProcessorCore/Filters/Convolution/BoxBlur.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// Applies a Box blur filter to the image. diff --git a/src/ImageProcessor/Filters/Convolution/Convolution2DFilter.cs b/src/ImageProcessorCore/Filters/Convolution/Convolution2DFilter.cs similarity index 98% rename from src/ImageProcessor/Filters/Convolution/Convolution2DFilter.cs rename to src/ImageProcessorCore/Filters/Convolution/Convolution2DFilter.cs index 6888959016..e01a7e39c0 100644 --- a/src/ImageProcessor/Filters/Convolution/Convolution2DFilter.cs +++ b/src/ImageProcessorCore/Filters/Convolution/Convolution2DFilter.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; using System.Threading.Tasks; @@ -11,7 +11,7 @@ namespace ImageProcessor.Filters /// /// Defines a filter that uses two one-dimensional matrices to perform convolution against an image. /// - public abstract class Convolution2DFilter : ParallelImageProcessor + public abstract class Convolution2DFilter : ParallelImageProcessorCore { /// /// Gets the horizontal gradient operator. diff --git a/src/ImageProcessor/Filters/Convolution/Convolution2PassFilter.cs b/src/ImageProcessorCore/Filters/Convolution/Convolution2PassFilter.cs similarity index 98% rename from src/ImageProcessor/Filters/Convolution/Convolution2PassFilter.cs rename to src/ImageProcessorCore/Filters/Convolution/Convolution2PassFilter.cs index 2ebddd4909..06f192f4bf 100644 --- a/src/ImageProcessor/Filters/Convolution/Convolution2PassFilter.cs +++ b/src/ImageProcessorCore/Filters/Convolution/Convolution2PassFilter.cs @@ -3,14 +3,14 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Threading.Tasks; /// /// Defines a filter that uses two one-dimensional matrices to perform two-pass convolution against an image. /// - public abstract class Convolution2PassFilter : ParallelImageProcessor + public abstract class Convolution2PassFilter : ParallelImageProcessorCore { /// /// Gets the horizontal gradient operator. diff --git a/src/ImageProcessor/Filters/Convolution/ConvolutionFilter.cs b/src/ImageProcessorCore/Filters/Convolution/ConvolutionFilter.cs similarity index 98% rename from src/ImageProcessor/Filters/Convolution/ConvolutionFilter.cs rename to src/ImageProcessorCore/Filters/Convolution/ConvolutionFilter.cs index f344885037..fa0e4b83c7 100644 --- a/src/ImageProcessor/Filters/Convolution/ConvolutionFilter.cs +++ b/src/ImageProcessorCore/Filters/Convolution/ConvolutionFilter.cs @@ -3,14 +3,14 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Threading.Tasks; /// /// Defines a filter that uses a 2 dimensional matrix to perform convolution against an image. /// - public abstract class ConvolutionFilter : ParallelImageProcessor + public abstract class ConvolutionFilter : ParallelImageProcessorCore { /// /// Gets the 2d gradient operator. diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/EdgeDetector2DFilter.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetector2DFilter.cs similarity index 95% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/EdgeDetector2DFilter.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetector2DFilter.cs index 053afb01c0..2b6391c76d 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/EdgeDetector2DFilter.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetector2DFilter.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// Defines a filter that detects edges within an image using two diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/EdgeDetectorFilter.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetectorFilter.cs similarity index 95% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/EdgeDetectorFilter.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetectorFilter.cs index 05eca3fd06..614ed5ab86 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/EdgeDetectorFilter.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetectorFilter.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// Defines a filter that detects edges within an image using a single diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/IEdgeDetectorFilter.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/IEdgeDetectorFilter.cs similarity index 84% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/IEdgeDetectorFilter.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/IEdgeDetectorFilter.cs index 2aa881a366..8986f87250 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/IEdgeDetectorFilter.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/IEdgeDetectorFilter.cs @@ -3,12 +3,12 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// Provides properties and methods allowing the detection of edges within an image. /// - public interface IEdgeDetectorFilter : IImageProcessor + public interface IEdgeDetectorFilter : IImageProcessorCore { /// /// Gets or sets a value indicating whether to convert the diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Kayyali.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Kayyali.cs similarity index 95% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/Kayyali.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Kayyali.cs index bec3f59eb0..2a8a193cd9 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Kayyali.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Kayyali.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// The Kayyali operator filter. diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Kirsch.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Kirsch.cs similarity index 95% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/Kirsch.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Kirsch.cs index 621fc4df9c..88904494e7 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Kirsch.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Kirsch.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// The Kirsch operator filter. diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Laplacian3X3.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Laplacian3X3.cs similarity index 94% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/Laplacian3X3.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Laplacian3X3.cs index 71b145a4f9..d4d1824aa8 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Laplacian3X3.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Laplacian3X3.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// The Laplacian 3 x 3 operator filter. diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Laplacian5X5.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Laplacian5X5.cs similarity index 95% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/Laplacian5X5.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Laplacian5X5.cs index b6c95e470b..1456206b0e 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Laplacian5X5.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Laplacian5X5.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// The Laplacian 5 x 5 operator filter. diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/LaplacianOfGaussian.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/LaplacianOfGaussian.cs similarity index 95% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/LaplacianOfGaussian.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/LaplacianOfGaussian.cs index eb56298772..3a7e4c2e34 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/LaplacianOfGaussian.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/LaplacianOfGaussian.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// The Laplacian of Gaussian operator filter. diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Prewitt.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Prewitt.cs similarity index 95% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/Prewitt.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Prewitt.cs index 36a1da89b5..0f0a99cc50 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Prewitt.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Prewitt.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// The Prewitt operator filter. diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/RobertsCross.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/RobertsCross.cs similarity index 95% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/RobertsCross.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/RobertsCross.cs index 25d3151bf3..6b80690916 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/RobertsCross.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/RobertsCross.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// The Roberts Cross operator filter. diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Scharr.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Scharr.cs similarity index 95% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/Scharr.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Scharr.cs index a165171261..bca9587fce 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Scharr.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Scharr.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// The Scharr operator filter. diff --git a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Sobel.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Sobel.cs similarity index 95% rename from src/ImageProcessor/Filters/Convolution/EdgeDetection/Sobel.cs rename to src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Sobel.cs index 6c74c0d7dc..4cf0b71493 100644 --- a/src/ImageProcessor/Filters/Convolution/EdgeDetection/Sobel.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/Sobel.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// The Sobel operator filter. diff --git a/src/ImageProcessor/Filters/Convolution/GuassianBlur.cs b/src/ImageProcessorCore/Filters/Convolution/GuassianBlur.cs similarity index 99% rename from src/ImageProcessor/Filters/Convolution/GuassianBlur.cs rename to src/ImageProcessorCore/Filters/Convolution/GuassianBlur.cs index 66c4ff4b11..aa0ef4f3c6 100644 --- a/src/ImageProcessor/Filters/Convolution/GuassianBlur.cs +++ b/src/ImageProcessorCore/Filters/Convolution/GuassianBlur.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; diff --git a/src/ImageProcessor/Filters/Convolution/GuassianSharpen.cs b/src/ImageProcessorCore/Filters/Convolution/GuassianSharpen.cs similarity index 99% rename from src/ImageProcessor/Filters/Convolution/GuassianSharpen.cs rename to src/ImageProcessorCore/Filters/Convolution/GuassianSharpen.cs index edc3924e68..44b0f9d40d 100644 --- a/src/ImageProcessor/Filters/Convolution/GuassianSharpen.cs +++ b/src/ImageProcessorCore/Filters/Convolution/GuassianSharpen.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; diff --git a/src/ImageProcessor/Filters/Glow.cs b/src/ImageProcessorCore/Filters/Glow.cs similarity index 95% rename from src/ImageProcessor/Filters/Glow.cs rename to src/ImageProcessorCore/Filters/Glow.cs index 313ea5f55f..01354aa103 100644 --- a/src/ImageProcessor/Filters/Glow.cs +++ b/src/ImageProcessorCore/Filters/Glow.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; using System.Numerics; @@ -12,7 +12,7 @@ namespace ImageProcessor.Filters /// /// Creates a glow effect on the image /// - public class Glow : ParallelImageProcessor + public class Glow : ParallelImageProcessorCore { /// /// Gets or sets the vignette color to apply. diff --git a/src/ImageProcessor/Filters/ImageFilterExtensions.cs b/src/ImageProcessorCore/Filters/ImageFilterExtensions.cs similarity index 99% rename from src/ImageProcessor/Filters/ImageFilterExtensions.cs rename to src/ImageProcessorCore/Filters/ImageFilterExtensions.cs index 2690188ab4..4a186e8c67 100644 --- a/src/ImageProcessor/Filters/ImageFilterExtensions.cs +++ b/src/ImageProcessorCore/Filters/ImageFilterExtensions.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { /// /// Extensions methods for to apply filters to the image. @@ -326,8 +326,8 @@ namespace ImageProcessor.Filters /// The . public static Image Greyscale(this Image source, Rectangle rectangle, GreyscaleMode mode = GreyscaleMode.Bt709, ProgressEventHandler progressHandler = null) { - IImageProcessor processor = mode == GreyscaleMode.Bt709 - ? (IImageProcessor)new GreyscaleBt709() + IImageProcessorCore processor = mode == GreyscaleMode.Bt709 + ? (IImageProcessorCore)new GreyscaleBt709() : new GreyscaleBt601(); processor.OnProgress += progressHandler; diff --git a/src/ImageProcessor/Filters/Invert.cs b/src/ImageProcessorCore/Filters/Invert.cs similarity index 88% rename from src/ImageProcessor/Filters/Invert.cs rename to src/ImageProcessorCore/Filters/Invert.cs index fbdd275959..609844738a 100644 --- a/src/ImageProcessor/Filters/Invert.cs +++ b/src/ImageProcessorCore/Filters/Invert.cs @@ -3,15 +3,15 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System.Numerics; using System.Threading.Tasks; /// - /// An to invert the colors of an . + /// An to invert the colors of an . /// - public class Invert : ParallelImageProcessor + public class Invert : ParallelImageProcessorCore { /// protected override void Apply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY) diff --git a/src/ImageProcessor/Filters/Pixelate.cs b/src/ImageProcessorCore/Filters/Pixelate.cs similarity index 94% rename from src/ImageProcessor/Filters/Pixelate.cs rename to src/ImageProcessorCore/Filters/Pixelate.cs index 44d047f5a3..97eba0ce16 100644 --- a/src/ImageProcessor/Filters/Pixelate.cs +++ b/src/ImageProcessorCore/Filters/Pixelate.cs @@ -3,16 +3,16 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; using System.Collections.Generic; using System.Threading.Tasks; /// - /// An to invert the colors of an . + /// An to invert the colors of an . /// - public class Pixelate : ParallelImageProcessor + public class Pixelate : ParallelImageProcessorCore { /// /// Initializes a new instance of the class. diff --git a/src/ImageProcessor/Filters/Vignette.cs b/src/ImageProcessorCore/Filters/Vignette.cs similarity index 95% rename from src/ImageProcessor/Filters/Vignette.cs rename to src/ImageProcessorCore/Filters/Vignette.cs index 245456d865..75673400db 100644 --- a/src/ImageProcessor/Filters/Vignette.cs +++ b/src/ImageProcessorCore/Filters/Vignette.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Filters +namespace ImageProcessorCore.Filters { using System; using System.Numerics; @@ -12,7 +12,7 @@ namespace ImageProcessor.Filters /// /// Creates a vignette effect on the image /// - public class Vignette : ParallelImageProcessor + public class Vignette : ParallelImageProcessorCore { /// /// Gets or sets the vignette color to apply. diff --git a/src/ImageProcessor/Formats/Bmp/BmpCompression.cs b/src/ImageProcessorCore/Formats/Bmp/BmpCompression.cs similarity index 98% rename from src/ImageProcessor/Formats/Bmp/BmpCompression.cs rename to src/ImageProcessorCore/Formats/Bmp/BmpCompression.cs index e9889492f1..de3c66495d 100644 --- a/src/ImageProcessor/Formats/Bmp/BmpCompression.cs +++ b/src/ImageProcessorCore/Formats/Bmp/BmpCompression.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Defines how the compression type of the image data diff --git a/src/ImageProcessor/Formats/Bmp/BmpDecoder.cs b/src/ImageProcessorCore/Formats/Bmp/BmpDecoder.cs similarity index 98% rename from src/ImageProcessor/Formats/Bmp/BmpDecoder.cs rename to src/ImageProcessorCore/Formats/Bmp/BmpDecoder.cs index 3c06a1a137..03d45f1122 100644 --- a/src/ImageProcessor/Formats/Bmp/BmpDecoder.cs +++ b/src/ImageProcessorCore/Formats/Bmp/BmpDecoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Bmp/BmpDecoderCore.cs b/src/ImageProcessorCore/Formats/Bmp/BmpDecoderCore.cs similarity index 99% rename from src/ImageProcessor/Formats/Bmp/BmpDecoderCore.cs rename to src/ImageProcessorCore/Formats/Bmp/BmpDecoderCore.cs index 4aa099a322..6ee30900df 100644 --- a/src/ImageProcessor/Formats/Bmp/BmpDecoderCore.cs +++ b/src/ImageProcessorCore/Formats/Bmp/BmpDecoderCore.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Bmp/BmpEncoder.cs b/src/ImageProcessorCore/Formats/Bmp/BmpEncoder.cs similarity index 99% rename from src/ImageProcessor/Formats/Bmp/BmpEncoder.cs rename to src/ImageProcessorCore/Formats/Bmp/BmpEncoder.cs index 3aef508367..f5f80e6891 100644 --- a/src/ImageProcessor/Formats/Bmp/BmpEncoder.cs +++ b/src/ImageProcessorCore/Formats/Bmp/BmpEncoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Bmp/BmpFileHeader.cs b/src/ImageProcessorCore/Formats/Bmp/BmpFileHeader.cs similarity index 97% rename from src/ImageProcessor/Formats/Bmp/BmpFileHeader.cs rename to src/ImageProcessorCore/Formats/Bmp/BmpFileHeader.cs index 073008989a..6f626ee703 100644 --- a/src/ImageProcessor/Formats/Bmp/BmpFileHeader.cs +++ b/src/ImageProcessorCore/Formats/Bmp/BmpFileHeader.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Stores general information about the Bitmap file. diff --git a/src/ImageProcessor/Formats/Bmp/BmpFormat.cs b/src/ImageProcessorCore/Formats/Bmp/BmpFormat.cs similarity index 93% rename from src/ImageProcessor/Formats/Bmp/BmpFormat.cs rename to src/ImageProcessorCore/Formats/Bmp/BmpFormat.cs index d73b0d203d..6f640c4b9e 100644 --- a/src/ImageProcessor/Formats/Bmp/BmpFormat.cs +++ b/src/ImageProcessorCore/Formats/Bmp/BmpFormat.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Encapsulates the means to encode and decode bitmap images. diff --git a/src/ImageProcessor/Formats/Bmp/BmpInfoHeader.cs b/src/ImageProcessorCore/Formats/Bmp/BmpInfoHeader.cs similarity index 98% rename from src/ImageProcessor/Formats/Bmp/BmpInfoHeader.cs rename to src/ImageProcessorCore/Formats/Bmp/BmpInfoHeader.cs index 9525ac0f8c..c21a52d21b 100644 --- a/src/ImageProcessor/Formats/Bmp/BmpInfoHeader.cs +++ b/src/ImageProcessorCore/Formats/Bmp/BmpInfoHeader.cs @@ -2,7 +2,7 @@ // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// This block of bytes tells the application detailed information diff --git a/src/ImageProcessor/Formats/Bmp/README.md b/src/ImageProcessorCore/Formats/Bmp/README.md similarity index 100% rename from src/ImageProcessor/Formats/Bmp/README.md rename to src/ImageProcessorCore/Formats/Bmp/README.md diff --git a/src/ImageProcessor/Formats/Gif/BitEncoder.cs b/src/ImageProcessorCore/Formats/Gif/BitEncoder.cs similarity index 99% rename from src/ImageProcessor/Formats/Gif/BitEncoder.cs rename to src/ImageProcessorCore/Formats/Gif/BitEncoder.cs index 882a1ea4a0..a0c633a194 100644 --- a/src/ImageProcessor/Formats/Gif/BitEncoder.cs +++ b/src/ImageProcessorCore/Formats/Gif/BitEncoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System.Collections.Generic; diff --git a/src/ImageProcessor/Formats/Gif/DisposalMethod.cs b/src/ImageProcessorCore/Formats/Gif/DisposalMethod.cs similarity index 96% rename from src/ImageProcessor/Formats/Gif/DisposalMethod.cs rename to src/ImageProcessorCore/Formats/Gif/DisposalMethod.cs index 8aa8fa0895..8c66d8b44a 100644 --- a/src/ImageProcessor/Formats/Gif/DisposalMethod.cs +++ b/src/ImageProcessorCore/Formats/Gif/DisposalMethod.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Provides enumeration for instructing the decoder what to do with the last image diff --git a/src/ImageProcessor/Formats/Gif/GifConstants.cs b/src/ImageProcessorCore/Formats/Gif/GifConstants.cs similarity index 98% rename from src/ImageProcessor/Formats/Gif/GifConstants.cs rename to src/ImageProcessorCore/Formats/Gif/GifConstants.cs index 0e243c4119..42949cf168 100644 --- a/src/ImageProcessor/Formats/Gif/GifConstants.cs +++ b/src/ImageProcessorCore/Formats/Gif/GifConstants.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Constants that define specific points within a gif. diff --git a/src/ImageProcessor/Formats/Gif/GifDecoder.cs b/src/ImageProcessorCore/Formats/Gif/GifDecoder.cs similarity index 98% rename from src/ImageProcessor/Formats/Gif/GifDecoder.cs rename to src/ImageProcessorCore/Formats/Gif/GifDecoder.cs index dde73506ec..1abbcb2fb7 100644 --- a/src/ImageProcessor/Formats/Gif/GifDecoder.cs +++ b/src/ImageProcessorCore/Formats/Gif/GifDecoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Gif/GifDecoderCore.cs b/src/ImageProcessorCore/Formats/Gif/GifDecoderCore.cs similarity index 99% rename from src/ImageProcessor/Formats/Gif/GifDecoderCore.cs rename to src/ImageProcessorCore/Formats/Gif/GifDecoderCore.cs index cffe4919d3..693f974c7a 100644 --- a/src/ImageProcessor/Formats/Gif/GifDecoderCore.cs +++ b/src/ImageProcessorCore/Formats/Gif/GifDecoderCore.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Gif/GifEncoder.cs b/src/ImageProcessorCore/Formats/Gif/GifEncoder.cs similarity index 99% rename from src/ImageProcessor/Formats/Gif/GifEncoder.cs rename to src/ImageProcessorCore/Formats/Gif/GifEncoder.cs index f1a8be4fff..981dfb241d 100644 --- a/src/ImageProcessor/Formats/Gif/GifEncoder.cs +++ b/src/ImageProcessorCore/Formats/Gif/GifEncoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Gif/GifFormat.cs b/src/ImageProcessorCore/Formats/Gif/GifFormat.cs similarity index 93% rename from src/ImageProcessor/Formats/Gif/GifFormat.cs rename to src/ImageProcessorCore/Formats/Gif/GifFormat.cs index 13576c8a43..572815630f 100644 --- a/src/ImageProcessor/Formats/Gif/GifFormat.cs +++ b/src/ImageProcessorCore/Formats/Gif/GifFormat.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Encapsulates the means to encode and decode gif images. diff --git a/src/ImageProcessor/Formats/Gif/LzwDecoder.cs b/src/ImageProcessorCore/Formats/Gif/LzwDecoder.cs similarity index 99% rename from src/ImageProcessor/Formats/Gif/LzwDecoder.cs rename to src/ImageProcessorCore/Formats/Gif/LzwDecoder.cs index 716b67d51b..a232e1819b 100644 --- a/src/ImageProcessor/Formats/Gif/LzwDecoder.cs +++ b/src/ImageProcessorCore/Formats/Gif/LzwDecoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Gif/LzwEncoder.cs b/src/ImageProcessorCore/Formats/Gif/LzwEncoder.cs similarity index 99% rename from src/ImageProcessor/Formats/Gif/LzwEncoder.cs rename to src/ImageProcessorCore/Formats/Gif/LzwEncoder.cs index 73fc18735e..4179ec46fa 100644 --- a/src/ImageProcessor/Formats/Gif/LzwEncoder.cs +++ b/src/ImageProcessorCore/Formats/Gif/LzwEncoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.Collections.Generic; diff --git a/src/ImageProcessor/Formats/Gif/Quantizer/IQuantizer.cs b/src/ImageProcessorCore/Formats/Gif/Quantizer/IQuantizer.cs similarity index 95% rename from src/ImageProcessor/Formats/Gif/Quantizer/IQuantizer.cs rename to src/ImageProcessorCore/Formats/Gif/Quantizer/IQuantizer.cs index 71c6324089..b54334a105 100644 --- a/src/ImageProcessor/Formats/Gif/Quantizer/IQuantizer.cs +++ b/src/ImageProcessorCore/Formats/Gif/Quantizer/IQuantizer.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Provides methods for allowing quantization of images pixels. diff --git a/src/ImageProcessor/Formats/Gif/Quantizer/OctreeQuantizer.cs b/src/ImageProcessorCore/Formats/Gif/Quantizer/OctreeQuantizer.cs similarity index 99% rename from src/ImageProcessor/Formats/Gif/Quantizer/OctreeQuantizer.cs rename to src/ImageProcessorCore/Formats/Gif/Quantizer/OctreeQuantizer.cs index 86f229da88..25c2171f91 100644 --- a/src/ImageProcessor/Formats/Gif/Quantizer/OctreeQuantizer.cs +++ b/src/ImageProcessorCore/Formats/Gif/Quantizer/OctreeQuantizer.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.Collections.Generic; diff --git a/src/ImageProcessor/Formats/Gif/Quantizer/QuantizedImage.cs b/src/ImageProcessorCore/Formats/Gif/Quantizer/QuantizedImage.cs similarity index 98% rename from src/ImageProcessor/Formats/Gif/Quantizer/QuantizedImage.cs rename to src/ImageProcessorCore/Formats/Gif/Quantizer/QuantizedImage.cs index 668d97d912..d46f5748f7 100644 --- a/src/ImageProcessor/Formats/Gif/Quantizer/QuantizedImage.cs +++ b/src/ImageProcessorCore/Formats/Gif/Quantizer/QuantizedImage.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.Threading.Tasks; diff --git a/src/ImageProcessor/Formats/Gif/Quantizer/Quantizer.cs b/src/ImageProcessorCore/Formats/Gif/Quantizer/Quantizer.cs similarity index 99% rename from src/ImageProcessor/Formats/Gif/Quantizer/Quantizer.cs rename to src/ImageProcessorCore/Formats/Gif/Quantizer/Quantizer.cs index 831b01d7df..9b8371e043 100644 --- a/src/ImageProcessor/Formats/Gif/Quantizer/Quantizer.cs +++ b/src/ImageProcessorCore/Formats/Gif/Quantizer/Quantizer.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System.Collections.Generic; diff --git a/src/ImageProcessor/Formats/Gif/README.md b/src/ImageProcessorCore/Formats/Gif/README.md similarity index 100% rename from src/ImageProcessor/Formats/Gif/README.md rename to src/ImageProcessorCore/Formats/Gif/README.md diff --git a/src/ImageProcessor/Formats/Gif/Sections/GifGraphicsControlExtension.cs b/src/ImageProcessorCore/Formats/Gif/Sections/GifGraphicsControlExtension.cs similarity index 97% rename from src/ImageProcessor/Formats/Gif/Sections/GifGraphicsControlExtension.cs rename to src/ImageProcessorCore/Formats/Gif/Sections/GifGraphicsControlExtension.cs index 9d3a1e904b..071dc62c84 100644 --- a/src/ImageProcessor/Formats/Gif/Sections/GifGraphicsControlExtension.cs +++ b/src/ImageProcessorCore/Formats/Gif/Sections/GifGraphicsControlExtension.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// The Graphic Control Extension contains parameters used when diff --git a/src/ImageProcessor/Formats/Gif/Sections/GifImageDescriptor.cs b/src/ImageProcessorCore/Formats/Gif/Sections/GifImageDescriptor.cs similarity index 98% rename from src/ImageProcessor/Formats/Gif/Sections/GifImageDescriptor.cs rename to src/ImageProcessorCore/Formats/Gif/Sections/GifImageDescriptor.cs index e9d63fb3c6..62737de660 100644 --- a/src/ImageProcessor/Formats/Gif/Sections/GifImageDescriptor.cs +++ b/src/ImageProcessorCore/Formats/Gif/Sections/GifImageDescriptor.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Each image in the Data Stream is composed of an Image Descriptor, diff --git a/src/ImageProcessor/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs b/src/ImageProcessorCore/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs similarity index 98% rename from src/ImageProcessor/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs rename to src/ImageProcessorCore/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs index 40cebff81f..8c0400f24d 100644 --- a/src/ImageProcessor/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs +++ b/src/ImageProcessorCore/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// The Logical Screen Descriptor contains the parameters diff --git a/src/ImageProcessor/Formats/IImageDecoder.cs b/src/ImageProcessorCore/Formats/IImageDecoder.cs similarity index 98% rename from src/ImageProcessor/Formats/IImageDecoder.cs rename to src/ImageProcessorCore/Formats/IImageDecoder.cs index 9a42991158..761f3a68a7 100644 --- a/src/ImageProcessor/Formats/IImageDecoder.cs +++ b/src/ImageProcessorCore/Formats/IImageDecoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System.IO; diff --git a/src/ImageProcessor/Formats/IImageEncoder.cs b/src/ImageProcessorCore/Formats/IImageEncoder.cs similarity index 98% rename from src/ImageProcessor/Formats/IImageEncoder.cs rename to src/ImageProcessorCore/Formats/IImageEncoder.cs index bda8dbb422..4acceff996 100644 --- a/src/ImageProcessor/Formats/IImageEncoder.cs +++ b/src/ImageProcessorCore/Formats/IImageEncoder.cs @@ -8,7 +8,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System.IO; diff --git a/src/ImageProcessor/Formats/IImageFormat.cs b/src/ImageProcessorCore/Formats/IImageFormat.cs similarity index 94% rename from src/ImageProcessor/Formats/IImageFormat.cs rename to src/ImageProcessorCore/Formats/IImageFormat.cs index 4908a5c1d1..62b4b78916 100644 --- a/src/ImageProcessor/Formats/IImageFormat.cs +++ b/src/ImageProcessorCore/Formats/IImageFormat.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Encapsulates a supported image format, providing means to encode and decode an image. diff --git a/src/ImageProcessor/Formats/Jpg/JpegDecoder.cs b/src/ImageProcessorCore/Formats/Jpg/JpegDecoder.cs similarity index 99% rename from src/ImageProcessor/Formats/Jpg/JpegDecoder.cs rename to src/ImageProcessorCore/Formats/Jpg/JpegDecoder.cs index 6b706a40f0..c26973314a 100644 --- a/src/ImageProcessor/Formats/Jpg/JpegDecoder.cs +++ b/src/ImageProcessorCore/Formats/Jpg/JpegDecoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Jpg/JpegEncoder.cs b/src/ImageProcessorCore/Formats/Jpg/JpegEncoder.cs similarity index 98% rename from src/ImageProcessor/Formats/Jpg/JpegEncoder.cs rename to src/ImageProcessorCore/Formats/Jpg/JpegEncoder.cs index abf96dd030..e73483b824 100644 --- a/src/ImageProcessor/Formats/Jpg/JpegEncoder.cs +++ b/src/ImageProcessorCore/Formats/Jpg/JpegEncoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Jpg/JpegFormat.cs b/src/ImageProcessorCore/Formats/Jpg/JpegFormat.cs similarity index 93% rename from src/ImageProcessor/Formats/Jpg/JpegFormat.cs rename to src/ImageProcessorCore/Formats/Jpg/JpegFormat.cs index fcfb50823f..ec9ceb6dc0 100644 --- a/src/ImageProcessor/Formats/Jpg/JpegFormat.cs +++ b/src/ImageProcessorCore/Formats/Jpg/JpegFormat.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Encapsulates the means to encode and decode jpeg images. diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/BitStream.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/BitStream.cs similarity index 99% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/BitStream.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/BitStream.cs index 3c78c63a20..45ddc1ee98 100644 --- a/src/ImageProcessor/Formats/Jpg/LibJpeg/BitStream.cs +++ b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/BitStream.cs @@ -8,7 +8,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/BitmapDestination.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/BitmapDestination.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/BitmapDestination.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/BitmapDestination.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/DensityUnit.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/DensityUnit.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/DensityUnit.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/DensityUnit.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/ComponentBuffer.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/ComponentBuffer.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/ComponentBuffer.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/ComponentBuffer.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/J_BUF_MODE.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/J_BUF_MODE.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/J_BUF_MODE.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/J_BUF_MODE.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/JpegUtils.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/JpegUtils.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/JpegUtils.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/JpegUtils.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/bitread_perm_state.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/bitread_perm_state.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/bitread_perm_state.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/bitread_perm_state.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/bitread_working_state.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/bitread_working_state.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/bitread_working_state.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/bitread_working_state.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/d_derived_tbl.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/d_derived_tbl.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/d_derived_tbl.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/d_derived_tbl.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/huff_entropy_decoder.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/huff_entropy_decoder.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/huff_entropy_decoder.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/huff_entropy_decoder.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/huff_entropy_encoder.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/huff_entropy_encoder.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/huff_entropy_encoder.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/huff_entropy_encoder.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_coef_controller.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_coef_controller.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_coef_controller.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_coef_controller.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_main_controller.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_main_controller.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_main_controller.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_main_controller.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_prep_controller.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_prep_controller.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_prep_controller.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_c_prep_controller.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_converter.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_converter.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_converter.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_converter.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_deconverter.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_deconverter.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_deconverter.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_deconverter.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_quantizer.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_quantizer.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_quantizer.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_color_quantizer.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_comp_master.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_comp_master.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_comp_master.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_comp_master.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_coef_controller.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_coef_controller.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_coef_controller.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_coef_controller.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_main_controller.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_main_controller.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_main_controller.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_main_controller.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_post_controller.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_post_controller.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_post_controller.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_d_post_controller.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_decomp_master.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_decomp_master.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_decomp_master.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_decomp_master.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_downsampler.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_downsampler.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_downsampler.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_downsampler.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_entropy_decoder.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_entropy_decoder.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_entropy_decoder.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_entropy_decoder.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_entropy_encoder.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_entropy_encoder.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_entropy_encoder.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_entropy_encoder.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_forward_dct.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_forward_dct.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_forward_dct.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_forward_dct.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_input_controller.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_input_controller.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_input_controller.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_input_controller.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_inverse_dct.cs.REMOVED.git-id b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_inverse_dct.cs.REMOVED.git-id similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_inverse_dct.cs.REMOVED.git-id rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_inverse_dct.cs.REMOVED.git-id diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_marker_reader.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_marker_reader.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_marker_reader.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_marker_reader.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_marker_writer.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_marker_writer.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_marker_writer.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_marker_writer.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_scan_info.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_scan_info.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_scan_info.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_scan_info.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_upsampler.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_upsampler.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_upsampler.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/jpeg_upsampler.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_1pass_cquantizer.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_1pass_cquantizer.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_1pass_cquantizer.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_1pass_cquantizer.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_2pass_cquantizer.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_2pass_cquantizer.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_2pass_cquantizer.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_2pass_cquantizer.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_c_coef_controller.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_c_coef_controller.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_c_coef_controller.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_c_coef_controller.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_destination_mgr.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_destination_mgr.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_destination_mgr.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_destination_mgr.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_merged_upsampler.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_merged_upsampler.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_merged_upsampler.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_merged_upsampler.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_source_mgr.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_source_mgr.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_source_mgr.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_source_mgr.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_trans_c_coef_controller.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_trans_c_coef_controller.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_trans_c_coef_controller.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_trans_c_coef_controller.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_upsampler.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_upsampler.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/my_upsampler.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/my_upsampler.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/phuff_entropy_decoder.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/phuff_entropy_decoder.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/phuff_entropy_decoder.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/phuff_entropy_decoder.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/phuff_entropy_encoder.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/phuff_entropy_encoder.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/Internal/phuff_entropy_encoder.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/Internal/phuff_entropy_encoder.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/JBLOCK.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/JBLOCK.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/JBLOCK.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/JBLOCK.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/JHUFF_TBL.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/JHUFF_TBL.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/JHUFF_TBL.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/JHUFF_TBL.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/JPEG_MARKER.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/JPEG_MARKER.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/JPEG_MARKER.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/JPEG_MARKER.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/JQUANT_TBL.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/JQUANT_TBL.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/JQUANT_TBL.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/JQUANT_TBL.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/J_COLOR_SPACE.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/J_COLOR_SPACE.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/J_COLOR_SPACE.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/J_COLOR_SPACE.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/J_DCT_METHOD.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/J_DCT_METHOD.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/J_DCT_METHOD.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/J_DCT_METHOD.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/J_DITHER_MODE.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/J_DITHER_MODE.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/J_DITHER_MODE.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/J_DITHER_MODE.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/J_MESSAGE_CODE.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/J_MESSAGE_CODE.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/J_MESSAGE_CODE.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/J_MESSAGE_CODE.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/JpegConstants.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/JpegConstants.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/JpegConstants.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/JpegConstants.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/ReadResult.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/ReadResult.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/ReadResult.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/ReadResult.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_common_struct.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_common_struct.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_common_struct.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_common_struct.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_component_info.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_component_info.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_component_info.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_component_info.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_compress_struct.cs.REMOVED.git-id b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_compress_struct.cs.REMOVED.git-id similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_compress_struct.cs.REMOVED.git-id rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_compress_struct.cs.REMOVED.git-id diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_decompress_struct.cs.REMOVED.git-id b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_decompress_struct.cs.REMOVED.git-id similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_decompress_struct.cs.REMOVED.git-id rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_decompress_struct.cs.REMOVED.git-id diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_destination_mgr.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_destination_mgr.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_destination_mgr.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_destination_mgr.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_error_mgr.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_error_mgr.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_error_mgr.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_error_mgr.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_marker_struct.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_marker_struct.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_marker_struct.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_marker_struct.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_progress_mgr.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_progress_mgr.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_progress_mgr.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_progress_mgr.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_source_mgr.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_source_mgr.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jpeg_source_mgr.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jpeg_source_mgr.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jvirt_array.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jvirt_array.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Classic/jvirt_array.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Classic/jvirt_array.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/CompressionParameters.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/CompressionParameters.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/CompressionParameters.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/CompressionParameters.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/DecompressionParameters.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/DecompressionParameters.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/DecompressionParameters.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/DecompressionParameters.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/DecompressorToJpegImage.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/DecompressorToJpegImage.cs similarity index 99% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/DecompressorToJpegImage.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/DecompressorToJpegImage.cs index bc1c7cce25..e3fd5ce32a 100644 --- a/src/ImageProcessor/Formats/Jpg/LibJpeg/DecompressorToJpegImage.cs +++ b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/DecompressorToJpegImage.cs @@ -13,7 +13,7 @@ namespace BitMiracle.LibJpeg using System; using System.IO; - using ImageProcessor; + using ImageProcessorCore; /// /// Decompresses a jpeg image. diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Enumerations.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Enumerations.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Enumerations.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Enumerations.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/IDecompressDestination.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/IDecompressDestination.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/IDecompressDestination.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/IDecompressDestination.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/IRawImage.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/IRawImage.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/IRawImage.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/IRawImage.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Jpeg.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Jpeg.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Jpeg.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Jpeg.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/JpegImage.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/JpegImage.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/JpegImage.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/JpegImage.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/LoadedImageAttributes.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/LoadedImageAttributes.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/LoadedImageAttributes.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/LoadedImageAttributes.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/RawImage.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/RawImage.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/RawImage.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/RawImage.cs diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Sample.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Sample.cs similarity index 98% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Sample.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Sample.cs index 16a214c6e6..69b0fa79c6 100644 --- a/src/ImageProcessor/Formats/Jpg/LibJpeg/Sample.cs +++ b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Sample.cs @@ -4,7 +4,7 @@ using System.Text; namespace BitMiracle.LibJpeg { - using ImageProcessor.Formats; + using ImageProcessorCore.Formats; /// /// Represents a "sample" (you can understand it as a "pixel") of image. diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/SampleRow.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/SampleRow.cs similarity index 99% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/SampleRow.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/SampleRow.cs index b5e712767f..a2c56c901b 100644 --- a/src/ImageProcessor/Formats/Jpg/LibJpeg/SampleRow.cs +++ b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/SampleRow.cs @@ -4,7 +4,7 @@ using System.Text; namespace BitMiracle.LibJpeg { - using ImageProcessor.Formats; + using ImageProcessorCore.Formats; /// /// Represents a row of image - collection of samples. diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/Utils.cs b/src/ImageProcessorCore/Formats/Jpg/LibJpeg/Utils.cs similarity index 100% rename from src/ImageProcessor/Formats/Jpg/LibJpeg/Utils.cs rename to src/ImageProcessorCore/Formats/Jpg/LibJpeg/Utils.cs diff --git a/src/ImageProcessor/Formats/Jpg/README.md b/src/ImageProcessorCore/Formats/Jpg/README.md similarity index 100% rename from src/ImageProcessor/Formats/Jpg/README.md rename to src/ImageProcessorCore/Formats/Jpg/README.md diff --git a/src/ImageProcessor/Formats/Png/GrayscaleReader.cs b/src/ImageProcessorCore/Formats/Png/GrayscaleReader.cs similarity index 98% rename from src/ImageProcessor/Formats/Png/GrayscaleReader.cs rename to src/ImageProcessorCore/Formats/Png/GrayscaleReader.cs index 1d91c8a457..87f074e0bd 100644 --- a/src/ImageProcessor/Formats/Png/GrayscaleReader.cs +++ b/src/ImageProcessorCore/Formats/Png/GrayscaleReader.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Color reader for reading grayscale colors from a png file. diff --git a/src/ImageProcessor/Formats/Png/IColorReader.cs b/src/ImageProcessorCore/Formats/Png/IColorReader.cs similarity index 96% rename from src/ImageProcessor/Formats/Png/IColorReader.cs rename to src/ImageProcessorCore/Formats/Png/IColorReader.cs index 42facc3312..68183fac72 100644 --- a/src/ImageProcessor/Formats/Png/IColorReader.cs +++ b/src/ImageProcessorCore/Formats/Png/IColorReader.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Encapsulates methods for color readers, which are responsible for reading diff --git a/src/ImageProcessor/Formats/Png/PaletteIndexReader.cs b/src/ImageProcessorCore/Formats/Png/PaletteIndexReader.cs similarity index 99% rename from src/ImageProcessor/Formats/Png/PaletteIndexReader.cs rename to src/ImageProcessorCore/Formats/Png/PaletteIndexReader.cs index 6128b12442..e10181923a 100644 --- a/src/ImageProcessor/Formats/Png/PaletteIndexReader.cs +++ b/src/ImageProcessorCore/Formats/Png/PaletteIndexReader.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// A color reader for reading palette indices from the png file. diff --git a/src/ImageProcessor/Formats/Png/PngChunk.cs b/src/ImageProcessorCore/Formats/Png/PngChunk.cs similarity index 97% rename from src/ImageProcessor/Formats/Png/PngChunk.cs rename to src/ImageProcessorCore/Formats/Png/PngChunk.cs index 5bee7c3753..31ea703a65 100644 --- a/src/ImageProcessor/Formats/Png/PngChunk.cs +++ b/src/ImageProcessorCore/Formats/Png/PngChunk.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Stores header information about a chunk. diff --git a/src/ImageProcessor/Formats/Png/PngChunkTypes.cs b/src/ImageProcessorCore/Formats/Png/PngChunkTypes.cs similarity index 98% rename from src/ImageProcessor/Formats/Png/PngChunkTypes.cs rename to src/ImageProcessorCore/Formats/Png/PngChunkTypes.cs index bfb12961ca..5c35b3d4d2 100644 --- a/src/ImageProcessor/Formats/Png/PngChunkTypes.cs +++ b/src/ImageProcessorCore/Formats/Png/PngChunkTypes.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Contains a list of possible chunk type identifiers. diff --git a/src/ImageProcessor/Formats/Png/PngColorTypeInformation.cs b/src/ImageProcessorCore/Formats/Png/PngColorTypeInformation.cs similarity index 98% rename from src/ImageProcessor/Formats/Png/PngColorTypeInformation.cs rename to src/ImageProcessorCore/Formats/Png/PngColorTypeInformation.cs index ec7c6fa66e..9909cf47cc 100644 --- a/src/ImageProcessor/Formats/Png/PngColorTypeInformation.cs +++ b/src/ImageProcessorCore/Formats/Png/PngColorTypeInformation.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; diff --git a/src/ImageProcessor/Formats/Png/PngDecoder.cs b/src/ImageProcessorCore/Formats/Png/PngDecoder.cs similarity index 98% rename from src/ImageProcessor/Formats/Png/PngDecoder.cs rename to src/ImageProcessorCore/Formats/Png/PngDecoder.cs index d9e87d898c..7e92f26145 100644 --- a/src/ImageProcessor/Formats/Png/PngDecoder.cs +++ b/src/ImageProcessorCore/Formats/Png/PngDecoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Png/PngDecoderCore.cs b/src/ImageProcessorCore/Formats/Png/PngDecoderCore.cs similarity index 99% rename from src/ImageProcessor/Formats/Png/PngDecoderCore.cs rename to src/ImageProcessorCore/Formats/Png/PngDecoderCore.cs index a75eadabe6..a8e3596b05 100644 --- a/src/ImageProcessor/Formats/Png/PngDecoderCore.cs +++ b/src/ImageProcessorCore/Formats/Png/PngDecoderCore.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.Collections.Generic; diff --git a/src/ImageProcessor/Formats/Png/PngEncoder.cs b/src/ImageProcessorCore/Formats/Png/PngEncoder.cs similarity index 99% rename from src/ImageProcessor/Formats/Png/PngEncoder.cs rename to src/ImageProcessorCore/Formats/Png/PngEncoder.cs index 9d23a09b63..cf79f5c679 100644 --- a/src/ImageProcessor/Formats/Png/PngEncoder.cs +++ b/src/ImageProcessorCore/Formats/Png/PngEncoder.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Png/PngFormat.cs b/src/ImageProcessorCore/Formats/Png/PngFormat.cs similarity index 93% rename from src/ImageProcessor/Formats/Png/PngFormat.cs rename to src/ImageProcessorCore/Formats/Png/PngFormat.cs index dc286a5106..38a0a7c384 100644 --- a/src/ImageProcessor/Formats/Png/PngFormat.cs +++ b/src/ImageProcessorCore/Formats/Png/PngFormat.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Encapsulates the means to encode and decode png images. diff --git a/src/ImageProcessor/Formats/Png/PngHeader.cs b/src/ImageProcessorCore/Formats/Png/PngHeader.cs similarity index 98% rename from src/ImageProcessor/Formats/Png/PngHeader.cs rename to src/ImageProcessorCore/Formats/Png/PngHeader.cs index dd0a9b116d..dfa30794a8 100644 --- a/src/ImageProcessor/Formats/Png/PngHeader.cs +++ b/src/ImageProcessorCore/Formats/Png/PngHeader.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Represents the png header chunk. diff --git a/src/ImageProcessor/Formats/Png/README.md b/src/ImageProcessorCore/Formats/Png/README.md similarity index 100% rename from src/ImageProcessor/Formats/Png/README.md rename to src/ImageProcessorCore/Formats/Png/README.md diff --git a/src/ImageProcessor/Formats/Png/TrueColorReader.cs b/src/ImageProcessorCore/Formats/Png/TrueColorReader.cs similarity index 98% rename from src/ImageProcessor/Formats/Png/TrueColorReader.cs rename to src/ImageProcessorCore/Formats/Png/TrueColorReader.cs index 74028967b9..47c39b029f 100644 --- a/src/ImageProcessor/Formats/Png/TrueColorReader.cs +++ b/src/ImageProcessorCore/Formats/Png/TrueColorReader.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Color reader for reading true colors from a png file. Only colors diff --git a/src/ImageProcessor/Formats/Png/Zlib/Adler32.cs b/src/ImageProcessorCore/Formats/Png/Zlib/Adler32.cs similarity index 99% rename from src/ImageProcessor/Formats/Png/Zlib/Adler32.cs rename to src/ImageProcessorCore/Formats/Png/Zlib/Adler32.cs index ae0d050697..f58ec34c2d 100644 --- a/src/ImageProcessor/Formats/Png/Zlib/Adler32.cs +++ b/src/ImageProcessorCore/Formats/Png/Zlib/Adler32.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; diff --git a/src/ImageProcessor/Formats/Png/Zlib/Crc32.cs b/src/ImageProcessorCore/Formats/Png/Zlib/Crc32.cs similarity index 99% rename from src/ImageProcessor/Formats/Png/Zlib/Crc32.cs rename to src/ImageProcessorCore/Formats/Png/Zlib/Crc32.cs index d2a3e66704..da42e8dae4 100644 --- a/src/ImageProcessor/Formats/Png/Zlib/Crc32.cs +++ b/src/ImageProcessorCore/Formats/Png/Zlib/Crc32.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; diff --git a/src/ImageProcessor/Formats/Png/Zlib/IChecksum.cs b/src/ImageProcessorCore/Formats/Png/Zlib/IChecksum.cs similarity index 98% rename from src/ImageProcessor/Formats/Png/Zlib/IChecksum.cs rename to src/ImageProcessorCore/Formats/Png/Zlib/IChecksum.cs index d3ef70ed4e..077a5ad2a6 100644 --- a/src/ImageProcessor/Formats/Png/Zlib/IChecksum.cs +++ b/src/ImageProcessorCore/Formats/Png/Zlib/IChecksum.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { /// /// Interface to compute a data checksum used by checked input/output streams. diff --git a/src/ImageProcessor/Formats/Png/Zlib/README.md b/src/ImageProcessorCore/Formats/Png/Zlib/README.md similarity index 100% rename from src/ImageProcessor/Formats/Png/Zlib/README.md rename to src/ImageProcessorCore/Formats/Png/Zlib/README.md diff --git a/src/ImageProcessor/Formats/Png/Zlib/ZlibDeflateStream.cs b/src/ImageProcessorCore/Formats/Png/Zlib/ZlibDeflateStream.cs similarity index 99% rename from src/ImageProcessor/Formats/Png/Zlib/ZlibDeflateStream.cs rename to src/ImageProcessorCore/Formats/Png/Zlib/ZlibDeflateStream.cs index efb57eed2c..a621542007 100644 --- a/src/ImageProcessor/Formats/Png/Zlib/ZlibDeflateStream.cs +++ b/src/ImageProcessorCore/Formats/Png/Zlib/ZlibDeflateStream.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/Formats/Png/Zlib/ZlibInflateStream.cs b/src/ImageProcessorCore/Formats/Png/Zlib/ZlibInflateStream.cs similarity index 99% rename from src/ImageProcessor/Formats/Png/Zlib/ZlibInflateStream.cs rename to src/ImageProcessorCore/Formats/Png/Zlib/ZlibInflateStream.cs index ebf19a2853..b0afac69cb 100644 --- a/src/ImageProcessor/Formats/Png/Zlib/ZlibInflateStream.cs +++ b/src/ImageProcessorCore/Formats/Png/Zlib/ZlibInflateStream.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Formats +namespace ImageProcessorCore.Formats { using System; using System.IO; diff --git a/src/ImageProcessor/IImage.cs b/src/ImageProcessorCore/IImage.cs similarity index 98% rename from src/ImageProcessor/IImage.cs rename to src/ImageProcessorCore/IImage.cs index 5276902d30..48236a245e 100644 --- a/src/ImageProcessor/IImage.cs +++ b/src/ImageProcessorCore/IImage.cs @@ -3,13 +3,13 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.Collections.Generic; using System.IO; - using ImageProcessor.Formats; + using ImageProcessorCore.Formats; /// /// Encapsulates an image, which consists of the pixel data for a graphics image and its attributes. diff --git a/src/ImageProcessor/IImageBase.cs b/src/ImageProcessorCore/IImageBase.cs similarity index 99% rename from src/ImageProcessor/IImageBase.cs rename to src/ImageProcessorCore/IImageBase.cs index bc920175a1..569dcecda9 100644 --- a/src/ImageProcessor/IImageBase.cs +++ b/src/ImageProcessorCore/IImageBase.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; diff --git a/src/ImageProcessor/IImageProcessor.cs b/src/ImageProcessorCore/IImageProcessor.cs similarity index 95% rename from src/ImageProcessor/IImageProcessor.cs rename to src/ImageProcessorCore/IImageProcessor.cs index eb24515c71..7eefb86e58 100644 --- a/src/ImageProcessor/IImageProcessor.cs +++ b/src/ImageProcessorCore/IImageProcessor.cs @@ -1,9 +1,9 @@ -// +// // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { /// /// A delegate which is called as progress is made processing an image. @@ -15,7 +15,7 @@ namespace ImageProcessor /// /// Encapsulates methods to alter the pixels of an image. /// - public interface IImageProcessor + public interface IImageProcessorCore { /// /// Event fires when each row of the source image has been processed. diff --git a/src/ImageProcessor/IO/BigEndianBitConverter.cs b/src/ImageProcessorCore/IO/BigEndianBitConverter.cs similarity index 98% rename from src/ImageProcessor/IO/BigEndianBitConverter.cs rename to src/ImageProcessorCore/IO/BigEndianBitConverter.cs index bbaaf4cf53..6c624c6a6b 100644 --- a/src/ImageProcessor/IO/BigEndianBitConverter.cs +++ b/src/ImageProcessorCore/IO/BigEndianBitConverter.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.IO +namespace ImageProcessorCore.IO { /// /// Implementation of EndianBitConverter which converts to/from big-endian diff --git a/src/ImageProcessor/IO/EndianBinaryReader.cs b/src/ImageProcessorCore/IO/EndianBinaryReader.cs similarity index 99% rename from src/ImageProcessor/IO/EndianBinaryReader.cs rename to src/ImageProcessorCore/IO/EndianBinaryReader.cs index 43cd50d836..e2fc14a050 100644 --- a/src/ImageProcessor/IO/EndianBinaryReader.cs +++ b/src/ImageProcessorCore/IO/EndianBinaryReader.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.IO +namespace ImageProcessorCore.IO { using System; using System.IO; diff --git a/src/ImageProcessor/IO/EndianBitConverter.cs b/src/ImageProcessorCore/IO/EndianBitConverter.cs similarity index 99% rename from src/ImageProcessor/IO/EndianBitConverter.cs rename to src/ImageProcessorCore/IO/EndianBitConverter.cs index a683c09c0b..d95527002b 100644 --- a/src/ImageProcessor/IO/EndianBitConverter.cs +++ b/src/ImageProcessorCore/IO/EndianBitConverter.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.IO +namespace ImageProcessorCore.IO { using System; using System.Diagnostics.CodeAnalysis; diff --git a/src/ImageProcessor/IO/Endianness.cs b/src/ImageProcessorCore/IO/Endianness.cs similarity index 94% rename from src/ImageProcessor/IO/Endianness.cs rename to src/ImageProcessorCore/IO/Endianness.cs index 4ac861af05..e8e4ef4c2d 100644 --- a/src/ImageProcessor/IO/Endianness.cs +++ b/src/ImageProcessorCore/IO/Endianness.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.IO +namespace ImageProcessorCore.IO { /// /// Endianness of a converter diff --git a/src/ImageProcessor/IO/LittleEndianBitConverter.cs b/src/ImageProcessorCore/IO/LittleEndianBitConverter.cs similarity index 98% rename from src/ImageProcessor/IO/LittleEndianBitConverter.cs rename to src/ImageProcessorCore/IO/LittleEndianBitConverter.cs index 58e1088602..70e65d9091 100644 --- a/src/ImageProcessor/IO/LittleEndianBitConverter.cs +++ b/src/ImageProcessorCore/IO/LittleEndianBitConverter.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.IO +namespace ImageProcessorCore.IO { /// /// Implementation of EndianBitConverter which converts to/from little-endian diff --git a/src/ImageProcessor/Image.cs b/src/ImageProcessorCore/Image.cs similarity index 99% rename from src/ImageProcessor/Image.cs rename to src/ImageProcessorCore/Image.cs index 12a55b9793..cfae7cdd0a 100644 --- a/src/ImageProcessor/Image.cs +++ b/src/ImageProcessorCore/Image.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.Collections.Generic; diff --git a/src/ImageProcessor/ImageBase.cs b/src/ImageProcessorCore/ImageBase.cs similarity index 99% rename from src/ImageProcessor/ImageBase.cs rename to src/ImageProcessorCore/ImageBase.cs index d425a9903e..09a0ad741a 100644 --- a/src/ImageProcessor/ImageBase.cs +++ b/src/ImageProcessorCore/ImageBase.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; diff --git a/src/ImageProcessor/ImageExtensions.cs b/src/ImageProcessorCore/ImageExtensions.cs similarity index 95% rename from src/ImageProcessor/ImageExtensions.cs rename to src/ImageProcessorCore/ImageExtensions.cs index 3fb1f767c9..a986462cfb 100644 --- a/src/ImageProcessor/ImageExtensions.cs +++ b/src/ImageProcessorCore/ImageExtensions.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.IO; @@ -55,7 +55,7 @@ namespace ImageProcessor /// The image this method extends. /// Any processors to apply to the image. /// The . - public static Image Process(this Image source, params IImageProcessor[] processors) + public static Image Process(this Image source, params IImageProcessorCore[] processors) { return Process(source, source.Bounds, processors); } @@ -70,10 +70,10 @@ namespace ImageProcessor /// /// Any processors to apply to the image. /// The . - public static Image Process(this Image source, Rectangle sourceRectangle, params IImageProcessor[] processors) + public static Image Process(this Image source, Rectangle sourceRectangle, params IImageProcessorCore[] processors) { // ReSharper disable once LoopCanBeConvertedToQuery - foreach (IImageProcessor filter in processors) + foreach (IImageProcessorCore filter in processors) { source = PerformAction(source, true, (sourceImage, targetImage) => filter.Apply(targetImage, sourceImage, sourceRectangle)); } @@ -89,7 +89,7 @@ namespace ImageProcessor /// The target image height. /// Any processors to apply to the image. /// The . - public static Image Process(this Image source, int width, int height, params IImageProcessor[] processors) + public static Image Process(this Image source, int width, int height, params IImageProcessorCore[] processors) { return Process(source, width, height, source.Bounds, default(Rectangle), processors); } @@ -113,10 +113,10 @@ namespace ImageProcessor /// /// Any processors to apply to the image. /// The . - public static Image Process(this Image source, int width, int height, Rectangle sourceRectangle, Rectangle targetRectangle, params IImageProcessor[] processors) + public static Image Process(this Image source, int width, int height, Rectangle sourceRectangle, Rectangle targetRectangle, params IImageProcessorCore[] processors) { // ReSharper disable once LoopCanBeConvertedToQuery - foreach (IImageProcessor filter in processors) + foreach (IImageProcessorCore filter in processors) { source = PerformAction(source, false, (sourceImage, targetImage) => filter.Apply(targetImage, sourceImage, width, height, targetRectangle, sourceRectangle)); } diff --git a/src/ImageProcessor/ImageFrame.cs b/src/ImageProcessorCore/ImageFrame.cs similarity index 97% rename from src/ImageProcessor/ImageFrame.cs rename to src/ImageProcessorCore/ImageFrame.cs index 8dbf7e6f43..e9ff7214bc 100644 --- a/src/ImageProcessor/ImageFrame.cs +++ b/src/ImageProcessorCore/ImageFrame.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; diff --git a/src/ImageProcessor/ImageProcessor.nuget.targets b/src/ImageProcessorCore/ImageProcessor.nuget.targets similarity index 100% rename from src/ImageProcessor/ImageProcessor.nuget.targets rename to src/ImageProcessorCore/ImageProcessor.nuget.targets diff --git a/src/ImageProcessor/ImageProcessor.xproj b/src/ImageProcessorCore/ImageProcessor.xproj similarity index 100% rename from src/ImageProcessor/ImageProcessor.xproj rename to src/ImageProcessorCore/ImageProcessor.xproj diff --git a/src/ImageProcessorCore/ImageProcessorCore.xproj b/src/ImageProcessorCore/ImageProcessorCore.xproj new file mode 100644 index 0000000000..48941be502 --- /dev/null +++ b/src/ImageProcessorCore/ImageProcessorCore.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 2aa31a1f-142c-43f4-8687-09abca4b3a26 + ImageProcessorCore + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + 2.0 + + + True + + + \ No newline at end of file diff --git a/src/ImageProcessor/ImageProperty.cs b/src/ImageProcessorCore/ImageProperty.cs similarity index 99% rename from src/ImageProcessor/ImageProperty.cs rename to src/ImageProcessorCore/ImageProperty.cs index 1dfca007b8..1d8f5bb8ef 100644 --- a/src/ImageProcessor/ImageProperty.cs +++ b/src/ImageProcessorCore/ImageProperty.cs @@ -10,7 +10,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace ImageProcessor +namespace ImageProcessorCore { using System; diff --git a/src/ImageProcessor/Numerics/Ellipse.cs b/src/ImageProcessorCore/Numerics/Ellipse.cs similarity index 99% rename from src/ImageProcessor/Numerics/Ellipse.cs rename to src/ImageProcessorCore/Numerics/Ellipse.cs index c4f9d130de..5d87d1247b 100644 --- a/src/ImageProcessor/Numerics/Ellipse.cs +++ b/src/ImageProcessorCore/Numerics/Ellipse.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/Numerics/Point.cs b/src/ImageProcessorCore/Numerics/Point.cs similarity index 99% rename from src/ImageProcessor/Numerics/Point.cs rename to src/ImageProcessorCore/Numerics/Point.cs index f0b030364f..12d0dc59b1 100644 --- a/src/ImageProcessor/Numerics/Point.cs +++ b/src/ImageProcessorCore/Numerics/Point.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/Numerics/Rectangle.cs b/src/ImageProcessorCore/Numerics/Rectangle.cs similarity index 99% rename from src/ImageProcessor/Numerics/Rectangle.cs rename to src/ImageProcessorCore/Numerics/Rectangle.cs index 42dcbe566f..6fe2c3a497 100644 --- a/src/ImageProcessor/Numerics/Rectangle.cs +++ b/src/ImageProcessorCore/Numerics/Rectangle.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/Numerics/Size.cs b/src/ImageProcessorCore/Numerics/Size.cs similarity index 99% rename from src/ImageProcessor/Numerics/Size.cs rename to src/ImageProcessorCore/Numerics/Size.cs index ba3a16e22c..4b416b2182 100644 --- a/src/ImageProcessor/Numerics/Size.cs +++ b/src/ImageProcessorCore/Numerics/Size.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.ComponentModel; diff --git a/src/ImageProcessor/ParallelImageProcessor.cs b/src/ImageProcessorCore/ParallelImageProcessor.cs similarity index 97% rename from src/ImageProcessor/ParallelImageProcessor.cs rename to src/ImageProcessorCore/ParallelImageProcessor.cs index 8eb8d6c869..6dce1b1bd0 100644 --- a/src/ImageProcessor/ParallelImageProcessor.cs +++ b/src/ImageProcessorCore/ParallelImageProcessor.cs @@ -1,9 +1,9 @@ -// +// // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { using System; using System.Threading; @@ -12,7 +12,7 @@ namespace ImageProcessor /// /// Allows the application of processors using parallel processing. /// - public abstract class ParallelImageProcessor : IImageProcessor + public abstract class ParallelImageProcessorCore : IImageProcessorCore { /// public event ProgressEventHandler OnProgress; diff --git a/src/ImageProcessor/ProgressEventArgs.cs b/src/ImageProcessorCore/ProgressEventArgs.cs similarity index 95% rename from src/ImageProcessor/ProgressEventArgs.cs rename to src/ImageProcessorCore/ProgressEventArgs.cs index ff62f38222..0f4c027f5e 100644 --- a/src/ImageProcessor/ProgressEventArgs.cs +++ b/src/ImageProcessorCore/ProgressEventArgs.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor +namespace ImageProcessorCore { /// /// Contains event data related to the progress made processing an image. diff --git a/src/ImageProcessor/Properties/AssemblyInfo.cs b/src/ImageProcessorCore/Properties/AssemblyInfo.cs similarity index 81% rename from src/ImageProcessor/Properties/AssemblyInfo.cs rename to src/ImageProcessorCore/Properties/AssemblyInfo.cs index c4037a8362..e093d9ba49 100644 --- a/src/ImageProcessor/Properties/AssemblyInfo.cs +++ b/src/ImageProcessorCore/Properties/AssemblyInfo.cs @@ -6,11 +6,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ImageProcessor")] +[assembly: AssemblyTitle("ImageProcessorCore")] [assembly: AssemblyDescription("A cross-platform library for processing of image files written in C#")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("James Jackson-South")] -[assembly: AssemblyProduct("ImageProcessor")] +[assembly: AssemblyProduct("ImageProcessorCore")] [assembly: AssemblyCopyright("Copyright (c) James Jackson-South and contributors.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -26,8 +26,8 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.0.0")] -[assembly: AssemblyFileVersion("3.0.0.0")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] // Ensure the internals can be tested. -[assembly: InternalsVisibleTo("ImageProcessor.Tests")] +[assembly: InternalsVisibleTo("ImageProcessorCore.Tests")] diff --git a/src/ImageProcessor/Samplers/Crop.cs b/src/ImageProcessorCore/Samplers/Crop.cs similarity index 92% rename from src/ImageProcessor/Samplers/Crop.cs rename to src/ImageProcessorCore/Samplers/Crop.cs index f34808671e..5299ca931f 100644 --- a/src/ImageProcessor/Samplers/Crop.cs +++ b/src/ImageProcessorCore/Samplers/Crop.cs @@ -3,14 +3,14 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { using System.Threading.Tasks; /// /// Provides methods to allow the cropping of an image. /// - public class Crop : ParallelImageProcessor + public class Crop : ParallelImageProcessorCore { /// protected override void Apply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY) diff --git a/src/ImageProcessor/Samplers/EntropyCrop.cs b/src/ImageProcessorCore/Samplers/EntropyCrop.cs similarity index 95% rename from src/ImageProcessor/Samplers/EntropyCrop.cs rename to src/ImageProcessorCore/Samplers/EntropyCrop.cs index d657d37eb8..2da438a6d9 100644 --- a/src/ImageProcessor/Samplers/EntropyCrop.cs +++ b/src/ImageProcessorCore/Samplers/EntropyCrop.cs @@ -3,18 +3,18 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { using System; using System.Threading.Tasks; - using ImageProcessor.Filters; + using ImageProcessorCore.Filters; /// /// Provides methods to allow the cropping of an image to preserve areas of highest /// entropy. /// - public class EntropyCrop : ParallelImageProcessor + public class EntropyCrop : ParallelImageProcessorCore { /// /// The rectangle for cropping diff --git a/src/ImageProcessor/Samplers/FlipType.cs b/src/ImageProcessorCore/Samplers/FlipType.cs similarity index 94% rename from src/ImageProcessor/Samplers/FlipType.cs rename to src/ImageProcessorCore/Samplers/FlipType.cs index c99ecf3326..066f86189f 100644 --- a/src/ImageProcessor/Samplers/FlipType.cs +++ b/src/ImageProcessorCore/Samplers/FlipType.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// Provides enumeration over how a image should be flipped. diff --git a/src/ImageProcessor/Samplers/ImageSampleExtensions.cs b/src/ImageProcessorCore/Samplers/ImageSampleExtensions.cs similarity index 99% rename from src/ImageProcessor/Samplers/ImageSampleExtensions.cs rename to src/ImageProcessorCore/Samplers/ImageSampleExtensions.cs index 1c0b34beee..6cff4bd2af 100644 --- a/src/ImageProcessor/Samplers/ImageSampleExtensions.cs +++ b/src/ImageProcessorCore/Samplers/ImageSampleExtensions.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// Extensions methods for to apply samplers to the image. diff --git a/src/ImageProcessor/Samplers/Resampler.cs b/src/ImageProcessorCore/Samplers/Resampler.cs similarity index 98% rename from src/ImageProcessor/Samplers/Resampler.cs rename to src/ImageProcessorCore/Samplers/Resampler.cs index 6c00a604dc..652bd56337 100644 --- a/src/ImageProcessor/Samplers/Resampler.cs +++ b/src/ImageProcessorCore/Samplers/Resampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { using System; using System.Collections.Generic; @@ -12,7 +12,7 @@ namespace ImageProcessor.Samplers /// /// Provides methods that allow the resampling of images using various algorithms. /// - public abstract class Resampler : ParallelImageProcessor + public abstract class Resampler : ParallelImageProcessorCore { /// /// Initializes a new instance of the class. diff --git a/src/ImageProcessor/Samplers/Resamplers/BicubicResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/BicubicResampler.cs similarity index 96% rename from src/ImageProcessor/Samplers/Resamplers/BicubicResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/BicubicResampler.cs index d5d9905fda..420806daf1 100644 --- a/src/ImageProcessor/Samplers/Resamplers/BicubicResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/BicubicResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the bicubic kernel algorithm W(x) as described on diff --git a/src/ImageProcessor/Samplers/Resamplers/BoxResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/BoxResampler.cs similarity index 95% rename from src/ImageProcessor/Samplers/Resamplers/BoxResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/BoxResampler.cs index 37106a8ffc..6ef5c0e351 100644 --- a/src/ImageProcessor/Samplers/Resamplers/BoxResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/BoxResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the box algorithm. Similar to nearest neighbour when upscaling. diff --git a/src/ImageProcessor/Samplers/Resamplers/CatmullRomResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/CatmullRomResampler.cs similarity index 94% rename from src/ImageProcessor/Samplers/Resamplers/CatmullRomResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/CatmullRomResampler.cs index 8038dcca63..804d310f92 100644 --- a/src/ImageProcessor/Samplers/Resamplers/CatmullRomResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/CatmullRomResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the Catmull-Rom algorithm. diff --git a/src/ImageProcessor/Samplers/Resamplers/HermiteResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/HermiteResampler.cs similarity index 94% rename from src/ImageProcessor/Samplers/Resamplers/HermiteResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/HermiteResampler.cs index a32c68ce40..62001d5100 100644 --- a/src/ImageProcessor/Samplers/Resamplers/HermiteResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/HermiteResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the hermite algorithm. diff --git a/src/ImageProcessor/Samplers/Resamplers/IResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/IResampler.cs similarity index 95% rename from src/ImageProcessor/Samplers/Resamplers/IResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/IResampler.cs index 64628ae52d..2879c34ac3 100644 --- a/src/ImageProcessor/Samplers/Resamplers/IResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/IResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// Encapsulates an interpolation algorithm for resampling images. diff --git a/src/ImageProcessor/Samplers/Resamplers/Lanczos3Resampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/Lanczos3Resampler.cs similarity index 95% rename from src/ImageProcessor/Samplers/Resamplers/Lanczos3Resampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/Lanczos3Resampler.cs index 40c5e9d20d..0939350181 100644 --- a/src/ImageProcessor/Samplers/Resamplers/Lanczos3Resampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/Lanczos3Resampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the Lanczos kernel algorithm as described on diff --git a/src/ImageProcessor/Samplers/Resamplers/Lanczos5Resampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/Lanczos5Resampler.cs similarity index 95% rename from src/ImageProcessor/Samplers/Resamplers/Lanczos5Resampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/Lanczos5Resampler.cs index 4fdcc85ebe..45dabda507 100644 --- a/src/ImageProcessor/Samplers/Resamplers/Lanczos5Resampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/Lanczos5Resampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the Lanczos kernel algorithm as described on diff --git a/src/ImageProcessor/Samplers/Resamplers/Lanczos8Resampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/Lanczos8Resampler.cs similarity index 95% rename from src/ImageProcessor/Samplers/Resamplers/Lanczos8Resampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/Lanczos8Resampler.cs index f8c0e026dc..5c58653bb2 100644 --- a/src/ImageProcessor/Samplers/Resamplers/Lanczos8Resampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/Lanczos8Resampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the Lanczos kernel algorithm as described on diff --git a/src/ImageProcessor/Samplers/Resamplers/MitchellNetravaliResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/MitchellNetravaliResampler.cs similarity index 95% rename from src/ImageProcessor/Samplers/Resamplers/MitchellNetravaliResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/MitchellNetravaliResampler.cs index abf227156c..794f10a105 100644 --- a/src/ImageProcessor/Samplers/Resamplers/MitchellNetravaliResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/MitchellNetravaliResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the mitchell algorithm as described on diff --git a/src/ImageProcessor/Samplers/Resamplers/NearestNeighborResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/NearestNeighborResampler.cs similarity index 94% rename from src/ImageProcessor/Samplers/Resamplers/NearestNeighborResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/NearestNeighborResampler.cs index 61f520a784..0135272894 100644 --- a/src/ImageProcessor/Samplers/Resamplers/NearestNeighborResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/NearestNeighborResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the nearest neighbour algorithm. This uses an unscaled filter diff --git a/src/ImageProcessor/Samplers/Resamplers/RobidouxResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/RobidouxResampler.cs similarity index 94% rename from src/ImageProcessor/Samplers/Resamplers/RobidouxResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/RobidouxResampler.cs index 4331d6cc88..c2cead95e6 100644 --- a/src/ImageProcessor/Samplers/Resamplers/RobidouxResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/RobidouxResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the Robidoux algorithm. diff --git a/src/ImageProcessor/Samplers/Resamplers/RobidouxSharpResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/RobidouxSharpResampler.cs similarity index 95% rename from src/ImageProcessor/Samplers/Resamplers/RobidouxSharpResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/RobidouxSharpResampler.cs index e4b3c09a42..b86ff86a88 100644 --- a/src/ImageProcessor/Samplers/Resamplers/RobidouxSharpResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/RobidouxSharpResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the Robidoux Sharp algorithm. diff --git a/src/ImageProcessor/Samplers/Resamplers/RobidouxSoftResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/RobidouxSoftResampler.cs similarity index 94% rename from src/ImageProcessor/Samplers/Resamplers/RobidouxSoftResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/RobidouxSoftResampler.cs index d065a83d4c..06b6178a0b 100644 --- a/src/ImageProcessor/Samplers/Resamplers/RobidouxSoftResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/RobidouxSoftResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the Robidoux Soft algorithm. diff --git a/src/ImageProcessor/Samplers/Resamplers/SplineResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/SplineResampler.cs similarity index 94% rename from src/ImageProcessor/Samplers/Resamplers/SplineResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/SplineResampler.cs index 257bc6ce9e..bf1d468422 100644 --- a/src/ImageProcessor/Samplers/Resamplers/SplineResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/SplineResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the spline algorithm. diff --git a/src/ImageProcessor/Samplers/Resamplers/TriangleResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/TriangleResampler.cs similarity index 95% rename from src/ImageProcessor/Samplers/Resamplers/TriangleResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/TriangleResampler.cs index 3b6c8bd97a..2fbd110f9a 100644 --- a/src/ImageProcessor/Samplers/Resamplers/TriangleResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/TriangleResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the triangle (bilinear) algorithm. diff --git a/src/ImageProcessor/Samplers/Resamplers/WelchResampler.cs b/src/ImageProcessorCore/Samplers/Resamplers/WelchResampler.cs similarity index 95% rename from src/ImageProcessor/Samplers/Resamplers/WelchResampler.cs rename to src/ImageProcessorCore/Samplers/Resamplers/WelchResampler.cs index a18677c284..d62c6cc070 100644 --- a/src/ImageProcessor/Samplers/Resamplers/WelchResampler.cs +++ b/src/ImageProcessorCore/Samplers/Resamplers/WelchResampler.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// The function implements the welch algorithm. diff --git a/src/ImageProcessor/Samplers/Resize.cs b/src/ImageProcessorCore/Samplers/Resize.cs similarity index 99% rename from src/ImageProcessor/Samplers/Resize.cs rename to src/ImageProcessorCore/Samplers/Resize.cs index 64061244e0..fa04a33948 100644 --- a/src/ImageProcessor/Samplers/Resize.cs +++ b/src/ImageProcessorCore/Samplers/Resize.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { using System.Threading.Tasks; diff --git a/src/ImageProcessor/Samplers/Rotate.cs b/src/ImageProcessorCore/Samplers/Rotate.cs similarity index 99% rename from src/ImageProcessor/Samplers/Rotate.cs rename to src/ImageProcessorCore/Samplers/Rotate.cs index 97491387fb..627f78c63c 100644 --- a/src/ImageProcessor/Samplers/Rotate.cs +++ b/src/ImageProcessorCore/Samplers/Rotate.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { using System.Threading.Tasks; diff --git a/src/ImageProcessor/Samplers/RotateFlip.cs b/src/ImageProcessorCore/Samplers/RotateFlip.cs similarity index 98% rename from src/ImageProcessor/Samplers/RotateFlip.cs rename to src/ImageProcessorCore/Samplers/RotateFlip.cs index 94478e112f..24aaba0ffb 100644 --- a/src/ImageProcessor/Samplers/RotateFlip.cs +++ b/src/ImageProcessorCore/Samplers/RotateFlip.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { using System; using System.Threading.Tasks; @@ -11,7 +11,7 @@ namespace ImageProcessor.Samplers /// /// Provides methods that allow the rotation and flipping of an image around its center point. /// - public class RotateFlip : ParallelImageProcessor + public class RotateFlip : ParallelImageProcessorCore { /// /// Initializes a new instance of the class. diff --git a/src/ImageProcessor/Samplers/RotateType.cs b/src/ImageProcessorCore/Samplers/RotateType.cs similarity index 95% rename from src/ImageProcessor/Samplers/RotateType.cs rename to src/ImageProcessorCore/Samplers/RotateType.cs index 4ebb7b1806..7a71d1710c 100644 --- a/src/ImageProcessor/Samplers/RotateType.cs +++ b/src/ImageProcessorCore/Samplers/RotateType.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageProcessor.Samplers +namespace ImageProcessorCore.Samplers { /// /// Provides enumeration over how the image should be rotated. diff --git a/src/ImageProcessor/project.json b/src/ImageProcessorCore/project.json similarity index 95% rename from src/ImageProcessor/project.json rename to src/ImageProcessorCore/project.json index 5cb2b12747..b25051ae26 100644 --- a/src/ImageProcessor/project.json +++ b/src/ImageProcessorCore/project.json @@ -1,6 +1,6 @@ { "version": "3.0.0-*", - "description": "ImageProcessor", + "description": "ImageProcessorCore", "authors": [ "James Jackson-South and contributors" ], diff --git a/tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs b/tests/ImageProcessorCore.Tests/Colors/ColorConversionTests.cs similarity index 99% rename from tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs rename to tests/ImageProcessorCore.Tests/Colors/ColorConversionTests.cs index b7c22e6e71..deb6eb0119 100644 --- a/tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs +++ b/tests/ImageProcessorCore.Tests/Colors/ColorConversionTests.cs @@ -8,7 +8,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace ImageProcessor.Tests +namespace ImageProcessorCore.Tests { using System; using System.Diagnostics.CodeAnalysis; diff --git a/tests/ImageProcessor.Tests/Colors/ColorSpacialTransformTests.cs b/tests/ImageProcessorCore.Tests/Colors/ColorSpacialTransformTests.cs similarity index 97% rename from tests/ImageProcessor.Tests/Colors/ColorSpacialTransformTests.cs rename to tests/ImageProcessorCore.Tests/Colors/ColorSpacialTransformTests.cs index faf8173f16..c2a8ac9025 100644 --- a/tests/ImageProcessor.Tests/Colors/ColorSpacialTransformTests.cs +++ b/tests/ImageProcessorCore.Tests/Colors/ColorSpacialTransformTests.cs @@ -1,4 +1,4 @@ -namespace ImageProcessor.Tests +namespace ImageProcessorCore.Tests { using Xunit; diff --git a/tests/ImageProcessor.Tests/Colors/ColorTests.cs b/tests/ImageProcessorCore.Tests/Colors/ColorTests.cs similarity index 98% rename from tests/ImageProcessor.Tests/Colors/ColorTests.cs rename to tests/ImageProcessorCore.Tests/Colors/ColorTests.cs index 10973b6c0d..9ab1e8da46 100644 --- a/tests/ImageProcessor.Tests/Colors/ColorTests.cs +++ b/tests/ImageProcessorCore.Tests/Colors/ColorTests.cs @@ -8,7 +8,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace ImageProcessor.Tests +namespace ImageProcessorCore.Tests { using Xunit; diff --git a/tests/ImageProcessor.Tests/Helpers/GuardTests.cs b/tests/ImageProcessorCore.Tests/Helpers/GuardTests.cs similarity index 99% rename from tests/ImageProcessor.Tests/Helpers/GuardTests.cs rename to tests/ImageProcessorCore.Tests/Helpers/GuardTests.cs index baef47c0ba..bb93f928ac 100644 --- a/tests/ImageProcessor.Tests/Helpers/GuardTests.cs +++ b/tests/ImageProcessorCore.Tests/Helpers/GuardTests.cs @@ -8,7 +8,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace ImageProcessor.Tests.Helpers +namespace ImageProcessorCore.Tests.Helpers { using System; using System.Diagnostics.CodeAnalysis; diff --git a/tests/ImageProcessor.Tests/ImageProcessor.Tests.xproj b/tests/ImageProcessorCore.Tests/ImageProcessorCore.Tests.xproj similarity index 100% rename from tests/ImageProcessor.Tests/ImageProcessor.Tests.xproj rename to tests/ImageProcessorCore.Tests/ImageProcessorCore.Tests.xproj diff --git a/tests/ImageProcessor.Tests/Numerics/PointTests.cs b/tests/ImageProcessorCore.Tests/Numerics/PointTests.cs similarity index 97% rename from tests/ImageProcessor.Tests/Numerics/PointTests.cs rename to tests/ImageProcessorCore.Tests/Numerics/PointTests.cs index 81dfe284c6..0108fa5905 100644 --- a/tests/ImageProcessor.Tests/Numerics/PointTests.cs +++ b/tests/ImageProcessorCore.Tests/Numerics/PointTests.cs @@ -8,7 +8,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace ImageProcessor.Tests +namespace ImageProcessorCore.Tests { using Xunit; diff --git a/tests/ImageProcessor.Tests/Numerics/RectangleTests.cs b/tests/ImageProcessorCore.Tests/Numerics/RectangleTests.cs similarity index 98% rename from tests/ImageProcessor.Tests/Numerics/RectangleTests.cs rename to tests/ImageProcessorCore.Tests/Numerics/RectangleTests.cs index baf10c0e21..3b76bfa51b 100644 --- a/tests/ImageProcessor.Tests/Numerics/RectangleTests.cs +++ b/tests/ImageProcessorCore.Tests/Numerics/RectangleTests.cs @@ -8,7 +8,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace ImageProcessor.Tests +namespace ImageProcessorCore.Tests { using Xunit; diff --git a/tests/ImageProcessor.Tests/Numerics/SizeTests.cs b/tests/ImageProcessorCore.Tests/Numerics/SizeTests.cs similarity index 97% rename from tests/ImageProcessor.Tests/Numerics/SizeTests.cs rename to tests/ImageProcessorCore.Tests/Numerics/SizeTests.cs index 75c572e980..3d90b2bceb 100644 --- a/tests/ImageProcessor.Tests/Numerics/SizeTests.cs +++ b/tests/ImageProcessorCore.Tests/Numerics/SizeTests.cs @@ -8,7 +8,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace ImageProcessor.Tests +namespace ImageProcessorCore.Tests { using Xunit; diff --git a/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/FilterTests.cs similarity index 93% rename from tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs rename to tests/ImageProcessorCore.Tests/Processors/Filters/FilterTests.cs index 8335d80242..5101212ad3 100644 --- a/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/FilterTests.cs @@ -1,16 +1,16 @@  -namespace ImageProcessor.Tests +namespace ImageProcessorCore.Tests { using System.Diagnostics; using System.IO; - using ImageProcessor.Filters; + using ImageProcessorCore.Filters; using Xunit; public class FilterTests : ProcessorTestBase { - public static readonly TheoryData Filters = new TheoryData + public static readonly TheoryData Filters = new TheoryData { { "Brightness-50", new Brightness(50) }, { "Brightness--50", new Brightness(-50) }, @@ -49,7 +49,7 @@ namespace ImageProcessor.Tests [Theory] [MemberData("Filters")] - public void FilterImage(string name, IImageProcessor processor) + public void FilterImage(string name, IImageProcessorCore processor) { if (!Directory.Exists("TestOutput/Filter")) { diff --git a/tests/ImageProcessor.Tests/Processors/Formats/EncoderDecoderTests.cs b/tests/ImageProcessorCore.Tests/Processors/Formats/EncoderDecoderTests.cs similarity index 98% rename from tests/ImageProcessor.Tests/Processors/Formats/EncoderDecoderTests.cs rename to tests/ImageProcessorCore.Tests/Processors/Formats/EncoderDecoderTests.cs index 374f00afba..0899955f46 100644 --- a/tests/ImageProcessor.Tests/Processors/Formats/EncoderDecoderTests.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Formats/EncoderDecoderTests.cs @@ -1,4 +1,4 @@ -namespace ImageProcessor.Tests +namespace ImageProcessorCore.Tests { using System.Diagnostics; using System.IO; diff --git a/tests/ImageProcessor.Tests/Processors/ProcessorTestBase.cs b/tests/ImageProcessorCore.Tests/Processors/ProcessorTestBase.cs similarity index 97% rename from tests/ImageProcessor.Tests/Processors/ProcessorTestBase.cs rename to tests/ImageProcessorCore.Tests/Processors/ProcessorTestBase.cs index 9a3e1181b0..d68034901e 100644 --- a/tests/ImageProcessor.Tests/Processors/ProcessorTestBase.cs +++ b/tests/ImageProcessorCore.Tests/Processors/ProcessorTestBase.cs @@ -5,7 +5,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace ImageProcessor.Tests +namespace ImageProcessorCore.Tests { using System.Collections.Generic; diff --git a/tests/ImageProcessor.Tests/Processors/Samplers/SamplerTests.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/SamplerTests.cs similarity index 99% rename from tests/ImageProcessor.Tests/Processors/Samplers/SamplerTests.cs rename to tests/ImageProcessorCore.Tests/Processors/Samplers/SamplerTests.cs index 4e34931593..c75ab4bed0 100644 --- a/tests/ImageProcessor.Tests/Processors/Samplers/SamplerTests.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/SamplerTests.cs @@ -1,9 +1,9 @@ -namespace ImageProcessor.Tests +namespace ImageProcessorCore.Tests { using System.Diagnostics; using System.IO; - using ImageProcessor.Samplers; + using ImageProcessorCore.Samplers; using Xunit; using Filters; diff --git a/tests/ImageProcessor.Tests/Properties/AssemblyInfo.cs b/tests/ImageProcessorCore.Tests/Properties/AssemblyInfo.cs similarity index 90% rename from tests/ImageProcessor.Tests/Properties/AssemblyInfo.cs rename to tests/ImageProcessorCore.Tests/Properties/AssemblyInfo.cs index a21728dc86..5d613e692e 100644 --- a/tests/ImageProcessor.Tests/Properties/AssemblyInfo.cs +++ b/tests/ImageProcessorCore.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ImageProcessor.Tests")] +[assembly: AssemblyTitle("ImageProcessorCore.Tests")] [assembly: AssemblyDescription("A library for on-the-fly processing of image files written in C#")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ImageProcessor")] +[assembly: AssemblyProduct("ImageProcessorCore")] [assembly: AssemblyCopyright("Copyright © James Jackson-South and contributors.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/tests/ImageProcessor.Tests/TestImages/Formats/Bmp/Car.bmp.REMOVED.git-id b/tests/ImageProcessorCore.Tests/TestImages/Formats/Bmp/Car.bmp.REMOVED.git-id similarity index 100% rename from tests/ImageProcessor.Tests/TestImages/Formats/Bmp/Car.bmp.REMOVED.git-id rename to tests/ImageProcessorCore.Tests/TestImages/Formats/Bmp/Car.bmp.REMOVED.git-id diff --git a/tests/ImageProcessor.Tests/TestImages/Formats/Gif/giphy.gif b/tests/ImageProcessorCore.Tests/TestImages/Formats/Gif/giphy.gif similarity index 100% rename from tests/ImageProcessor.Tests/TestImages/Formats/Gif/giphy.gif rename to tests/ImageProcessorCore.Tests/TestImages/Formats/Gif/giphy.gif diff --git a/tests/ImageProcessor.Tests/TestImages/Formats/Gif/rings.gif b/tests/ImageProcessorCore.Tests/TestImages/Formats/Gif/rings.gif similarity index 100% rename from tests/ImageProcessor.Tests/TestImages/Formats/Gif/rings.gif rename to tests/ImageProcessorCore.Tests/TestImages/Formats/Gif/rings.gif diff --git a/tests/ImageProcessor.Tests/TestImages/Formats/Jpg/Calliphora.jpg.REMOVED.git-id b/tests/ImageProcessorCore.Tests/TestImages/Formats/Jpg/Calliphora.jpg.REMOVED.git-id similarity index 100% rename from tests/ImageProcessor.Tests/TestImages/Formats/Jpg/Calliphora.jpg.REMOVED.git-id rename to tests/ImageProcessorCore.Tests/TestImages/Formats/Jpg/Calliphora.jpg.REMOVED.git-id diff --git a/tests/ImageProcessor.Tests/TestImages/Formats/Jpg/Floorplan.jpeg.REMOVED.git-id b/tests/ImageProcessorCore.Tests/TestImages/Formats/Jpg/Floorplan.jpeg.REMOVED.git-id similarity index 100% rename from tests/ImageProcessor.Tests/TestImages/Formats/Jpg/Floorplan.jpeg.REMOVED.git-id rename to tests/ImageProcessorCore.Tests/TestImages/Formats/Jpg/Floorplan.jpeg.REMOVED.git-id diff --git a/tests/ImageProcessor.Tests/TestImages/Formats/Jpg/gamma_dalai_lama_gray.jpg.REMOVED.git-id b/tests/ImageProcessorCore.Tests/TestImages/Formats/Jpg/gamma_dalai_lama_gray.jpg.REMOVED.git-id similarity index 100% rename from tests/ImageProcessor.Tests/TestImages/Formats/Jpg/gamma_dalai_lama_gray.jpg.REMOVED.git-id rename to tests/ImageProcessorCore.Tests/TestImages/Formats/Jpg/gamma_dalai_lama_gray.jpg.REMOVED.git-id diff --git a/tests/ImageProcessor.Tests/TestImages/Formats/Png/blur.png.REMOVED.git-id b/tests/ImageProcessorCore.Tests/TestImages/Formats/Png/blur.png.REMOVED.git-id similarity index 100% rename from tests/ImageProcessor.Tests/TestImages/Formats/Png/blur.png.REMOVED.git-id rename to tests/ImageProcessorCore.Tests/TestImages/Formats/Png/blur.png.REMOVED.git-id diff --git a/tests/ImageProcessor.Tests/TestImages/Formats/Png/splash.png.REMOVED.git-id b/tests/ImageProcessorCore.Tests/TestImages/Formats/Png/splash.png.REMOVED.git-id similarity index 100% rename from tests/ImageProcessor.Tests/TestImages/Formats/Png/splash.png.REMOVED.git-id rename to tests/ImageProcessorCore.Tests/TestImages/Formats/Png/splash.png.REMOVED.git-id diff --git a/tests/ImageProcessor.Tests/project.json b/tests/ImageProcessorCore.Tests/project.json similarity index 86% rename from tests/ImageProcessor.Tests/project.json rename to tests/ImageProcessorCore.Tests/project.json index d0a83ac2e7..6dd65e0891 100644 --- a/tests/ImageProcessor.Tests/project.json +++ b/tests/ImageProcessorCore.Tests/project.json @@ -1,12 +1,12 @@ { "version": "1.0.0-*", - "description": "ImageProcessor.Tests Class Library", + "description": "ImageProcessorCore.Tests Class Library", "authors": [ "James Jackson-South and contributors" ], "tags": [ "" ], "projectUrl": "", "licenseUrl": "", "dependencies": { - "ImageProcessor": "3.0.0-*", + "ImageProcessorCore": "1.0.0-*", "Microsoft.CSharp": "4.0.1-beta-23516", "Microsoft.NETCore": "5.0.1-beta-23516", "Microsoft.NETCore.Platforms": "1.0.1-beta-23516",