From 002d8dc06daa2963938463793988260d961ce983 Mon Sep 17 00:00:00 2001 From: BobLd Date: Thu, 2 Apr 2020 16:33:03 +0100 Subject: [PATCH] Move Path-Painting Operators to PathPainting folder --- .../ModifyClippingByNonZeroWindingIntersect.cs | 2 +- .../Operations/{ => PathPainting}/CloseAndStrokePath.cs | 2 +- .../CloseFillPathEvenOddRuleAndStroke.cs | 2 +- .../CloseFillPathNonZeroWindingAndStroke.cs | 2 +- .../Graphics/Operations/{ => PathPainting}/EndPath.cs | 2 +- .../Operations/{ => PathPainting}/FillPathEvenOddRule.cs | 2 +- .../{ => PathPainting}/FillPathEvenOddRuleAndStroke.cs | 2 +- .../{ => PathPainting}/FillPathNonZeroWinding.cs | 2 +- .../FillPathNonZeroWindingAndStroke.cs | 2 +- .../FillPathNonZeroWindingCompatibility.cs | 2 +- .../Graphics/Operations/{ => PathPainting}/StrokePath.cs | 2 +- .../Graphics/ReflectionGraphicsStateOperationFactory.cs | 9 +++++---- src/UglyToad.PdfPig/Writer/PdfPageBuilder.cs | 7 ++++--- 13 files changed, 20 insertions(+), 18 deletions(-) rename src/UglyToad.PdfPig/Graphics/Operations/{ => PathPainting}/CloseAndStrokePath.cs (94%) rename src/UglyToad.PdfPig/Graphics/Operations/{ => PathPainting}/CloseFillPathEvenOddRuleAndStroke.cs (95%) rename src/UglyToad.PdfPig/Graphics/Operations/{ => PathPainting}/CloseFillPathNonZeroWindingAndStroke.cs (95%) rename src/UglyToad.PdfPig/Graphics/Operations/{ => PathPainting}/EndPath.cs (94%) rename src/UglyToad.PdfPig/Graphics/Operations/{ => PathPainting}/FillPathEvenOddRule.cs (94%) rename src/UglyToad.PdfPig/Graphics/Operations/{ => PathPainting}/FillPathEvenOddRuleAndStroke.cs (95%) rename src/UglyToad.PdfPig/Graphics/Operations/{ => PathPainting}/FillPathNonZeroWinding.cs (95%) rename src/UglyToad.PdfPig/Graphics/Operations/{ => PathPainting}/FillPathNonZeroWindingAndStroke.cs (95%) rename src/UglyToad.PdfPig/Graphics/Operations/{ => PathPainting}/FillPathNonZeroWindingCompatibility.cs (95%) rename src/UglyToad.PdfPig/Graphics/Operations/{ => PathPainting}/StrokePath.cs (94%) diff --git a/src/UglyToad.PdfPig/Graphics/Operations/ClippingPaths/ModifyClippingByNonZeroWindingIntersect.cs b/src/UglyToad.PdfPig/Graphics/Operations/ClippingPaths/ModifyClippingByNonZeroWindingIntersect.cs index 772f805f..3bc0e81a 100644 --- a/src/UglyToad.PdfPig/Graphics/Operations/ClippingPaths/ModifyClippingByNonZeroWindingIntersect.cs +++ b/src/UglyToad.PdfPig/Graphics/Operations/ClippingPaths/ModifyClippingByNonZeroWindingIntersect.cs @@ -15,7 +15,7 @@ public const string Symbol = "W"; /// - /// The instance of the operation. + /// The instance of the operation. /// public static readonly ModifyClippingByNonZeroWindingIntersect Value = new ModifyClippingByNonZeroWindingIntersect(); diff --git a/src/UglyToad.PdfPig/Graphics/Operations/CloseAndStrokePath.cs b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/CloseAndStrokePath.cs similarity index 94% rename from src/UglyToad.PdfPig/Graphics/Operations/CloseAndStrokePath.cs rename to src/UglyToad.PdfPig/Graphics/Operations/PathPainting/CloseAndStrokePath.cs index 897ee940..5ea1dbd6 100644 --- a/src/UglyToad.PdfPig/Graphics/Operations/CloseAndStrokePath.cs +++ b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/CloseAndStrokePath.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Graphics.Operations +namespace UglyToad.PdfPig.Graphics.Operations.PathPainting { using System.IO; diff --git a/src/UglyToad.PdfPig/Graphics/Operations/CloseFillPathEvenOddRuleAndStroke.cs b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/CloseFillPathEvenOddRuleAndStroke.cs similarity index 95% rename from src/UglyToad.PdfPig/Graphics/Operations/CloseFillPathEvenOddRuleAndStroke.cs rename to src/UglyToad.PdfPig/Graphics/Operations/PathPainting/CloseFillPathEvenOddRuleAndStroke.cs index 41369bc3..77e3fe57 100644 --- a/src/UglyToad.PdfPig/Graphics/Operations/CloseFillPathEvenOddRuleAndStroke.cs +++ b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/CloseFillPathEvenOddRuleAndStroke.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Graphics.Operations +namespace UglyToad.PdfPig.Graphics.Operations.PathPainting { using System.IO; diff --git a/src/UglyToad.PdfPig/Graphics/Operations/CloseFillPathNonZeroWindingAndStroke.cs b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/CloseFillPathNonZeroWindingAndStroke.cs similarity index 95% rename from src/UglyToad.PdfPig/Graphics/Operations/CloseFillPathNonZeroWindingAndStroke.cs rename to src/UglyToad.PdfPig/Graphics/Operations/PathPainting/CloseFillPathNonZeroWindingAndStroke.cs index 3e6ba248..d9fa07b7 100644 --- a/src/UglyToad.PdfPig/Graphics/Operations/CloseFillPathNonZeroWindingAndStroke.cs +++ b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/CloseFillPathNonZeroWindingAndStroke.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Graphics.Operations +namespace UglyToad.PdfPig.Graphics.Operations.PathPainting { using System.IO; diff --git a/src/UglyToad.PdfPig/Graphics/Operations/EndPath.cs b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/EndPath.cs similarity index 94% rename from src/UglyToad.PdfPig/Graphics/Operations/EndPath.cs rename to src/UglyToad.PdfPig/Graphics/Operations/PathPainting/EndPath.cs index d11d8745..4c0b79bf 100644 --- a/src/UglyToad.PdfPig/Graphics/Operations/EndPath.cs +++ b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/EndPath.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Graphics.Operations +namespace UglyToad.PdfPig.Graphics.Operations.PathPainting { using System.IO; diff --git a/src/UglyToad.PdfPig/Graphics/Operations/FillPathEvenOddRule.cs b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathEvenOddRule.cs similarity index 94% rename from src/UglyToad.PdfPig/Graphics/Operations/FillPathEvenOddRule.cs rename to src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathEvenOddRule.cs index 88266d1b..d475cff5 100644 --- a/src/UglyToad.PdfPig/Graphics/Operations/FillPathEvenOddRule.cs +++ b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathEvenOddRule.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Graphics.Operations +namespace UglyToad.PdfPig.Graphics.Operations.PathPainting { using System.IO; diff --git a/src/UglyToad.PdfPig/Graphics/Operations/FillPathEvenOddRuleAndStroke.cs b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathEvenOddRuleAndStroke.cs similarity index 95% rename from src/UglyToad.PdfPig/Graphics/Operations/FillPathEvenOddRuleAndStroke.cs rename to src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathEvenOddRuleAndStroke.cs index a275ad9e..0f590bfb 100644 --- a/src/UglyToad.PdfPig/Graphics/Operations/FillPathEvenOddRuleAndStroke.cs +++ b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathEvenOddRuleAndStroke.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Graphics.Operations +namespace UglyToad.PdfPig.Graphics.Operations.PathPainting { using System.IO; diff --git a/src/UglyToad.PdfPig/Graphics/Operations/FillPathNonZeroWinding.cs b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathNonZeroWinding.cs similarity index 95% rename from src/UglyToad.PdfPig/Graphics/Operations/FillPathNonZeroWinding.cs rename to src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathNonZeroWinding.cs index 02b14cff..1fb1a93d 100644 --- a/src/UglyToad.PdfPig/Graphics/Operations/FillPathNonZeroWinding.cs +++ b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathNonZeroWinding.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Graphics.Operations +namespace UglyToad.PdfPig.Graphics.Operations.PathPainting { using System.IO; diff --git a/src/UglyToad.PdfPig/Graphics/Operations/FillPathNonZeroWindingAndStroke.cs b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathNonZeroWindingAndStroke.cs similarity index 95% rename from src/UglyToad.PdfPig/Graphics/Operations/FillPathNonZeroWindingAndStroke.cs rename to src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathNonZeroWindingAndStroke.cs index 6a5c953e..26f1a2f0 100644 --- a/src/UglyToad.PdfPig/Graphics/Operations/FillPathNonZeroWindingAndStroke.cs +++ b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathNonZeroWindingAndStroke.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Graphics.Operations +namespace UglyToad.PdfPig.Graphics.Operations.PathPainting { using System.IO; diff --git a/src/UglyToad.PdfPig/Graphics/Operations/FillPathNonZeroWindingCompatibility.cs b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathNonZeroWindingCompatibility.cs similarity index 95% rename from src/UglyToad.PdfPig/Graphics/Operations/FillPathNonZeroWindingCompatibility.cs rename to src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathNonZeroWindingCompatibility.cs index 7383f73e..e655ae55 100644 --- a/src/UglyToad.PdfPig/Graphics/Operations/FillPathNonZeroWindingCompatibility.cs +++ b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/FillPathNonZeroWindingCompatibility.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Graphics.Operations +namespace UglyToad.PdfPig.Graphics.Operations.PathPainting { using System.IO; diff --git a/src/UglyToad.PdfPig/Graphics/Operations/StrokePath.cs b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/StrokePath.cs similarity index 94% rename from src/UglyToad.PdfPig/Graphics/Operations/StrokePath.cs rename to src/UglyToad.PdfPig/Graphics/Operations/PathPainting/StrokePath.cs index 9ebd889a..94548513 100644 --- a/src/UglyToad.PdfPig/Graphics/Operations/StrokePath.cs +++ b/src/UglyToad.PdfPig/Graphics/Operations/PathPainting/StrokePath.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Graphics.Operations +namespace UglyToad.PdfPig.Graphics.Operations.PathPainting { using System.IO; diff --git a/src/UglyToad.PdfPig/Graphics/ReflectionGraphicsStateOperationFactory.cs b/src/UglyToad.PdfPig/Graphics/ReflectionGraphicsStateOperationFactory.cs index ee7993eb..c5c8a6e2 100644 --- a/src/UglyToad.PdfPig/Graphics/ReflectionGraphicsStateOperationFactory.cs +++ b/src/UglyToad.PdfPig/Graphics/ReflectionGraphicsStateOperationFactory.cs @@ -2,10 +2,6 @@ using UglyToad.PdfPig.Tokenization; namespace UglyToad.PdfPig.Graphics { - using System; - using System.Collections.Generic; - using System.Linq; - using System.Reflection; using Operations; using Operations.ClippingPaths; using Operations.Compatibility; @@ -19,7 +15,12 @@ namespace UglyToad.PdfPig.Graphics using Operations.TextShowing; using Operations.TextState; using PdfPig.Core; + using System; + using System.Collections.Generic; + using System.Linq; + using System.Reflection; using Tokens; + using UglyToad.PdfPig.Graphics.Operations.PathPainting; internal class ReflectionGraphicsStateOperationFactory : IGraphicsStateOperationFactory { diff --git a/src/UglyToad.PdfPig/Writer/PdfPageBuilder.cs b/src/UglyToad.PdfPig/Writer/PdfPageBuilder.cs index 881f7813..2d8cffec 100644 --- a/src/UglyToad.PdfPig/Writer/PdfPageBuilder.cs +++ b/src/UglyToad.PdfPig/Writer/PdfPageBuilder.cs @@ -1,8 +1,5 @@ namespace UglyToad.PdfPig.Writer { - using System; - using System.Collections.Generic; - using System.IO; using Content; using Core; using Fonts; @@ -16,7 +13,11 @@ using Graphics.Operations.TextShowing; using Graphics.Operations.TextState; using Images; + using System; + using System.Collections.Generic; + using System.IO; using Tokens; + using UglyToad.PdfPig.Graphics.Operations.PathPainting; /// /// A builder used to add construct a page in a PDF document.