lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2025-04-05 20:55:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix integration tests for #595

Browse Source
This commit is contained in:
BobLd 2023-04-14 08:36:50 +01:00
parent 42e4171c31
commit 9eb791ae58
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/UglyToad.PdfPig/Graphics/ColorSpaceContext.cs
View File

@ -14,7 +14,7 @@
public ColorSpaceDetails CurrentStrokingColorSpace { get; private set; } = DeviceGrayColorSpaceDetails.Instance;
public ColorSpaceDetails CurrentNonStrokingColorSpace { get; set; } = DeviceGrayColorSpaceDetails.Instance;
public ColorSpaceDetails CurrentNonStrokingColorSpace { get; private set; } = DeviceGrayColorSpaceDetails.Instance;
public ColorSpaceContext(Func<CurrentGraphicsState> currentStateFunc, IResourceStore resourceStore)
{
@ -22,9 +22,9 @@
this.resourceStore = resourceStore ?? throw new ArgumentNullException(nameof(resourceStore));
}
public void SetStrokingColorspace(NameToken colorspace)
public void SetStrokingColorspace(NameToken colorspace, DictionaryToken dictionary = null)
{
CurrentStrokingColorSpace = resourceStore.GetColorSpaceDetails(colorspace, null);
CurrentStrokingColorSpace = resourceStore.GetColorSpaceDetails(colorspace, dictionary);
if (CurrentStrokingColorSpace is UnsupportedColorSpaceDetails)
{
return;
@ -61,9 +61,9 @@
currentStateFunc().CurrentStrokingColor = CurrentStrokingColorSpace.GetColor((double)c, (double)m, (double)y, (double)k);
}
public void SetNonStrokingColorspace(NameToken colorspace)
public void SetNonStrokingColorspace(NameToken colorspace, DictionaryToken dictionary = null)
{
CurrentNonStrokingColorSpace = resourceStore.GetColorSpaceDetails(colorspace, null);
CurrentNonStrokingColorSpace = resourceStore.GetColorSpaceDetails(colorspace, dictionary);
if (CurrentNonStrokingColorSpace is UnsupportedColorSpaceDetails)
{
return;

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

@ -513,8 +513,7 @@
{
if (csArrayToken.Data[0] is NameToken firstColorSpaceName)
{
startState.ColorSpaceContext.CurrentNonStrokingColorSpace = resourceStore.GetColorSpaceDetails(firstColorSpaceName, formGroupToken);
startState.CurrentNonStrokingColor = startState.ColorSpaceContext.CurrentNonStrokingColorSpace.GetInitializeColor();
startState.ColorSpaceContext.SetNonStrokingColorspace(csNameToken, formGroupToken);
}
else
{

14
src/UglyToad.PdfPig/Graphics/IColorSpaceContext.cs
View File

@ -18,17 +18,21 @@
/// <summary>
/// The <see cref="ColorSpaceDetails"/> used for non-stroking operations.
/// </summary>
ColorSpaceDetails CurrentNonStrokingColorSpace { get; internal set; }
ColorSpaceDetails CurrentNonStrokingColorSpace { get; }
/// <summary>
/// Set the current color space to use for stroking operations.
/// Set the current color space to use for stroking operations and initialize the stroking color.
/// </summary>
void SetStrokingColorspace(NameToken colorspace);
/// <param name="colorspace">The color space name.</param>
/// <param name="dictionary">The color space dictionary. Default value is null.</param>
void SetStrokingColorspace(NameToken colorspace, DictionaryToken dictionary = null);
/// <summary>
/// Set the current color space to use for nonstroking operations.
/// Set the current color space to use for nonstroking operations and initialize the nonstroking color.
/// </summary>
void SetNonStrokingColorspace(NameToken colorspace);
/// <param name="colorspace">The color space name.</param>
/// <param name="dictionary">The color space dictionary. Default value is null.</param>
void SetNonStrokingColorspace(NameToken colorspace, DictionaryToken dictionary = null);
/// <summary>
/// Set the color to use for stroking operations using the current color space.