lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2026-03-10 00:23:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix regression introduced in #561 where paths were not clipped correctly for rotated pages due to initial clipping path not being transformed

Browse Source
This commit is contained in:
BobLd
2023-06-18 21:51:11 +01:00
parent ae83f39e28
commit 94cc9be967
3 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/UglyToad.PdfPig.Tests/Integration/Documents/Publication_of_award_of_Bids_for_Transport_Sector__August_2016.pdf Normal file
View File

Binary file not shown.

22
src/UglyToad.PdfPig.Tests/Integration/WrongPathCountClippingTests.cs Normal file
View File

@@ -0,0 +1,22 @@
namespace UglyToad.PdfPig.Tests.Integration
{
using Xunit;
public class WrongPathCountClippingTests
{
[Fact]
public void WrongPathCount()
{
using (var document = PdfDocument.Open(IntegrationHelpers.GetDocumentPath("Publication_of_award_of_Bids_for_Transport_Sector__August_2016.pdf"),
new ParsingOptions()
{
ClipPaths = true
}))
{
var page = document.GetPage(1);
Assert.Equal(612, page.Height);
Assert.Equal(224, page.ExperimentalAccess.Paths.Count);
}
}
}
}

31
src/UglyToad.PdfPig/Graphics/ContentStreamProcessor.cs
View File

@@ -103,20 +103,35 @@
this.filterProvider = filterProvider ?? throw new ArgumentNullException(nameof(filterProvider));
this.parsingOptions = parsingOptions;
// initiate CurrentClippingPath to cropBox
var clippingSubpath = new PdfSubpath();
clippingSubpath.Rectangle(cropBox.Bounds.BottomLeft.X, cropBox.Bounds.BottomLeft.Y, cropBox.Bounds.Width, cropBox.Bounds.Height);
var clippingPath = new PdfPath() { clippingSubpath };
clippingPath.SetClipping(FillingRule.EvenOdd);
TransformationMatrix initialMatrix = GetInitialMatrix(userSpaceUnit, mediaBox, cropBox, rotation, parsingOptions.Logger);
graphicsStack.Push(new CurrentGraphicsState()
{
CurrentTransformationMatrix = GetInitialMatrix(userSpaceUnit, mediaBox, cropBox, rotation, parsingOptions.Logger),
CurrentClippingPath = clippingPath,
CurrentTransformationMatrix = initialMatrix,
CurrentClippingPath = GetInitialClipping(cropBox, initialMatrix),
ColorSpaceContext = new ColorSpaceContext(GetCurrentState, resourceStore)
});
}
/// <summary>
/// Get the initial clipping path using the crop box and the initial transformation matrix.
/// </summary>
private static PdfPath GetInitialClipping(CropBox cropBox, TransformationMatrix initialMatrix)
{
var transformedCropBox = initialMatrix.Transform(cropBox.Bounds);
// We re-compute width and height to get possible negative values.
double width = transformedCropBox.TopRight.X - transformedCropBox.BottomLeft.X;
double height = transformedCropBox.TopRight.Y - transformedCropBox.BottomLeft.Y;
// initiate CurrentClippingPath to cropBox
var clippingSubpath = new PdfSubpath();
clippingSubpath.Rectangle(transformedCropBox.BottomLeft.X, transformedCropBox.BottomLeft.Y, width, height);
var clippingPath = new PdfPath() { clippingSubpath };
clippingPath.SetClipping(FillingRule.EvenOdd);
return clippingPath;
}
[System.Diagnostics.Contracts.Pure]
internal static TransformationMatrix GetInitialMatrix(UserSpaceUnit userSpaceUnit,
MediaBox mediaBox,
@@ -129,7 +144,7 @@
var viewBox = mediaBox.Bounds.Intersect(cropBox.Bounds) ?? cropBox.Bounds;
if (rotation.Value == 0
&& viewBox.Left == 0
&& viewBox.Left == 0
&& viewBox.Bottom == 0
&& userSpaceUnit.PointMultiples == 1)
{