From 73a88cf853cb37b61082db103a17e8f1d7aa71be Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Sun, 12 Mar 2017 23:50:26 +1100 Subject: [PATCH] Move all drawing code into drawing project --- .../Drawing => ImageSharp.Drawing}/Brushes/Brushes.cs | 0 .../Drawing => ImageSharp.Drawing}/Brushes/Brushes{TColor}.cs | 0 .../Drawing => ImageSharp.Drawing}/Brushes/IBrush.cs | 0 .../Drawing => ImageSharp.Drawing}/Brushes/ImageBrush.cs | 0 .../Brushes/ImageBrush{TColor}.cs | 0 .../Drawing => ImageSharp.Drawing}/Brushes/PatternBrush.cs | 0 .../Brushes/PatternBrush{TColor}.cs | 0 .../Brushes/Processors/BrushApplicator.cs | 0 .../Drawing => ImageSharp.Drawing}/Brushes/RecolorBrush.cs | 0 .../Brushes/RecolorBrush{TColor}.cs | 0 .../Drawing => ImageSharp.Drawing}/Brushes/SolidBrush.cs | 0 .../Brushes/SolidBrush{TColor}.cs | 0 src/{ImageSharp/Drawing => ImageSharp.Drawing}/DrawImage.cs | 0 src/{ImageSharp/Drawing => ImageSharp.Drawing}/DrawPath.cs | 0 src/{ImageSharp/Drawing => ImageSharp.Drawing}/Drawable.cs | 0 src/{ImageSharp/Drawing => ImageSharp.Drawing}/FillRegion.cs | 0 .../Drawing => ImageSharp.Drawing}/GraphicsOptions.cs | 0 src/{ImageSharp/Drawing => ImageSharp.Drawing}/Pens/IPen.cs | 0 src/{ImageSharp/Drawing => ImageSharp.Drawing}/Pens/Pen.cs | 0 src/{ImageSharp/Drawing => ImageSharp.Drawing}/Pens/Pens.cs | 0 .../Drawing => ImageSharp.Drawing}/Pens/Pens{TColor}.cs | 0 .../Drawing => ImageSharp.Drawing}/Pens/Pen{TColor}.cs | 0 .../Pens/Processors/ColoredPointInfo.cs | 0 .../Pens/Processors/PenApplicator.cs | 0 src/{ImageSharp/Drawing => ImageSharp.Drawing}/PointInfo.cs | 0 .../Processors/DrawImageProcessor.cs | 0 .../Processors/DrawPathProcessor.cs | 0 .../Drawing => ImageSharp.Drawing}/Processors/FillProcessor.cs | 0 .../Processors/FillRegionProcessor.cs | 0 src/{ImageSharp/Drawing => ImageSharp.Drawing}/Region.cs | 0 src/Shared/AssemblyInfo.Common.cs | 3 ++- 31 files changed, 2 insertions(+), 1 deletion(-) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/Brushes.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/Brushes{TColor}.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/IBrush.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/ImageBrush.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/ImageBrush{TColor}.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/PatternBrush.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/PatternBrush{TColor}.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/Processors/BrushApplicator.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/RecolorBrush.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/RecolorBrush{TColor}.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/SolidBrush.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Brushes/SolidBrush{TColor}.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/DrawImage.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/DrawPath.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Drawable.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/FillRegion.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/GraphicsOptions.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Pens/IPen.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Pens/Pen.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Pens/Pens.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Pens/Pens{TColor}.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Pens/Pen{TColor}.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Pens/Processors/ColoredPointInfo.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Pens/Processors/PenApplicator.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/PointInfo.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Processors/DrawImageProcessor.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Processors/DrawPathProcessor.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Processors/FillProcessor.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Processors/FillRegionProcessor.cs (100%) rename src/{ImageSharp/Drawing => ImageSharp.Drawing}/Region.cs (100%) diff --git a/src/ImageSharp/Drawing/Brushes/Brushes.cs b/src/ImageSharp.Drawing/Brushes/Brushes.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/Brushes.cs rename to src/ImageSharp.Drawing/Brushes/Brushes.cs diff --git a/src/ImageSharp/Drawing/Brushes/Brushes{TColor}.cs b/src/ImageSharp.Drawing/Brushes/Brushes{TColor}.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/Brushes{TColor}.cs rename to src/ImageSharp.Drawing/Brushes/Brushes{TColor}.cs diff --git a/src/ImageSharp/Drawing/Brushes/IBrush.cs b/src/ImageSharp.Drawing/Brushes/IBrush.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/IBrush.cs rename to src/ImageSharp.Drawing/Brushes/IBrush.cs diff --git a/src/ImageSharp/Drawing/Brushes/ImageBrush.cs b/src/ImageSharp.Drawing/Brushes/ImageBrush.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/ImageBrush.cs rename to src/ImageSharp.Drawing/Brushes/ImageBrush.cs diff --git a/src/ImageSharp/Drawing/Brushes/ImageBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/ImageBrush{TColor}.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/ImageBrush{TColor}.cs rename to src/ImageSharp.Drawing/Brushes/ImageBrush{TColor}.cs diff --git a/src/ImageSharp/Drawing/Brushes/PatternBrush.cs b/src/ImageSharp.Drawing/Brushes/PatternBrush.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/PatternBrush.cs rename to src/ImageSharp.Drawing/Brushes/PatternBrush.cs diff --git a/src/ImageSharp/Drawing/Brushes/PatternBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/PatternBrush{TColor}.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/PatternBrush{TColor}.cs rename to src/ImageSharp.Drawing/Brushes/PatternBrush{TColor}.cs diff --git a/src/ImageSharp/Drawing/Brushes/Processors/BrushApplicator.cs b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/Processors/BrushApplicator.cs rename to src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs diff --git a/src/ImageSharp/Drawing/Brushes/RecolorBrush.cs b/src/ImageSharp.Drawing/Brushes/RecolorBrush.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/RecolorBrush.cs rename to src/ImageSharp.Drawing/Brushes/RecolorBrush.cs diff --git a/src/ImageSharp/Drawing/Brushes/RecolorBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TColor}.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/RecolorBrush{TColor}.cs rename to src/ImageSharp.Drawing/Brushes/RecolorBrush{TColor}.cs diff --git a/src/ImageSharp/Drawing/Brushes/SolidBrush.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/SolidBrush.cs rename to src/ImageSharp.Drawing/Brushes/SolidBrush.cs diff --git a/src/ImageSharp/Drawing/Brushes/SolidBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush{TColor}.cs similarity index 100% rename from src/ImageSharp/Drawing/Brushes/SolidBrush{TColor}.cs rename to src/ImageSharp.Drawing/Brushes/SolidBrush{TColor}.cs diff --git a/src/ImageSharp/Drawing/DrawImage.cs b/src/ImageSharp.Drawing/DrawImage.cs similarity index 100% rename from src/ImageSharp/Drawing/DrawImage.cs rename to src/ImageSharp.Drawing/DrawImage.cs diff --git a/src/ImageSharp/Drawing/DrawPath.cs b/src/ImageSharp.Drawing/DrawPath.cs similarity index 100% rename from src/ImageSharp/Drawing/DrawPath.cs rename to src/ImageSharp.Drawing/DrawPath.cs diff --git a/src/ImageSharp/Drawing/Drawable.cs b/src/ImageSharp.Drawing/Drawable.cs similarity index 100% rename from src/ImageSharp/Drawing/Drawable.cs rename to src/ImageSharp.Drawing/Drawable.cs diff --git a/src/ImageSharp/Drawing/FillRegion.cs b/src/ImageSharp.Drawing/FillRegion.cs similarity index 100% rename from src/ImageSharp/Drawing/FillRegion.cs rename to src/ImageSharp.Drawing/FillRegion.cs diff --git a/src/ImageSharp/Drawing/GraphicsOptions.cs b/src/ImageSharp.Drawing/GraphicsOptions.cs similarity index 100% rename from src/ImageSharp/Drawing/GraphicsOptions.cs rename to src/ImageSharp.Drawing/GraphicsOptions.cs diff --git a/src/ImageSharp/Drawing/Pens/IPen.cs b/src/ImageSharp.Drawing/Pens/IPen.cs similarity index 100% rename from src/ImageSharp/Drawing/Pens/IPen.cs rename to src/ImageSharp.Drawing/Pens/IPen.cs diff --git a/src/ImageSharp/Drawing/Pens/Pen.cs b/src/ImageSharp.Drawing/Pens/Pen.cs similarity index 100% rename from src/ImageSharp/Drawing/Pens/Pen.cs rename to src/ImageSharp.Drawing/Pens/Pen.cs diff --git a/src/ImageSharp/Drawing/Pens/Pens.cs b/src/ImageSharp.Drawing/Pens/Pens.cs similarity index 100% rename from src/ImageSharp/Drawing/Pens/Pens.cs rename to src/ImageSharp.Drawing/Pens/Pens.cs diff --git a/src/ImageSharp/Drawing/Pens/Pens{TColor}.cs b/src/ImageSharp.Drawing/Pens/Pens{TColor}.cs similarity index 100% rename from src/ImageSharp/Drawing/Pens/Pens{TColor}.cs rename to src/ImageSharp.Drawing/Pens/Pens{TColor}.cs diff --git a/src/ImageSharp/Drawing/Pens/Pen{TColor}.cs b/src/ImageSharp.Drawing/Pens/Pen{TColor}.cs similarity index 100% rename from src/ImageSharp/Drawing/Pens/Pen{TColor}.cs rename to src/ImageSharp.Drawing/Pens/Pen{TColor}.cs diff --git a/src/ImageSharp/Drawing/Pens/Processors/ColoredPointInfo.cs b/src/ImageSharp.Drawing/Pens/Processors/ColoredPointInfo.cs similarity index 100% rename from src/ImageSharp/Drawing/Pens/Processors/ColoredPointInfo.cs rename to src/ImageSharp.Drawing/Pens/Processors/ColoredPointInfo.cs diff --git a/src/ImageSharp/Drawing/Pens/Processors/PenApplicator.cs b/src/ImageSharp.Drawing/Pens/Processors/PenApplicator.cs similarity index 100% rename from src/ImageSharp/Drawing/Pens/Processors/PenApplicator.cs rename to src/ImageSharp.Drawing/Pens/Processors/PenApplicator.cs diff --git a/src/ImageSharp/Drawing/PointInfo.cs b/src/ImageSharp.Drawing/PointInfo.cs similarity index 100% rename from src/ImageSharp/Drawing/PointInfo.cs rename to src/ImageSharp.Drawing/PointInfo.cs diff --git a/src/ImageSharp/Drawing/Processors/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs similarity index 100% rename from src/ImageSharp/Drawing/Processors/DrawImageProcessor.cs rename to src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs diff --git a/src/ImageSharp/Drawing/Processors/DrawPathProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawPathProcessor.cs similarity index 100% rename from src/ImageSharp/Drawing/Processors/DrawPathProcessor.cs rename to src/ImageSharp.Drawing/Processors/DrawPathProcessor.cs diff --git a/src/ImageSharp/Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processors/FillProcessor.cs similarity index 100% rename from src/ImageSharp/Drawing/Processors/FillProcessor.cs rename to src/ImageSharp.Drawing/Processors/FillProcessor.cs diff --git a/src/ImageSharp/Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs similarity index 100% rename from src/ImageSharp/Drawing/Processors/FillRegionProcessor.cs rename to src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs diff --git a/src/ImageSharp/Drawing/Region.cs b/src/ImageSharp.Drawing/Region.cs similarity index 100% rename from src/ImageSharp/Drawing/Region.cs rename to src/ImageSharp.Drawing/Region.cs diff --git a/src/Shared/AssemblyInfo.Common.cs b/src/Shared/AssemblyInfo.Common.cs index 11f16769b..252ef3eae 100644 --- a/src/Shared/AssemblyInfo.Common.cs +++ b/src/Shared/AssemblyInfo.Common.cs @@ -33,7 +33,8 @@ using System.Runtime.CompilerServices; [assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyInformationalVersion("1.0.0.0")] -// Ensure the internals can be tested. +// Ensure the internals can be built and tested. +[assembly: InternalsVisibleTo("ImageSharp.Drawing")] [assembly: InternalsVisibleTo("ImageSharp.Benchmarks")] [assembly: InternalsVisibleTo("ImageSharp.Tests")] [assembly: InternalsVisibleTo("ImageSharp.Sandbox46")] \ No newline at end of file