lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2025-11-18 17:17:54 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Use scanner for resolving indirect refs when obtaining DictionaryToken values.

Browse Source
This commit is contained in:
Kasper Frank
2021-05-30 21:58:36 +02:00
parent da821e27e1
commit 6649a69380
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/UglyToad.PdfPig/Util/ColorSpaceDetailsParser.cs
View File

@@ -126,7 +126,7 @@
// WhitePoint is required // WhitePoint is required
if (!DirectObjectFinder.TryGet(second, scanner, out DictionaryToken dictionaryToken) || if (!DirectObjectFinder.TryGet(second, scanner, out DictionaryToken dictionaryToken) ||
!dictionaryToken.TryGet(NameToken.WhitePoint, out ArrayToken whitePointToken)) !dictionaryToken.TryGet(NameToken.WhitePoint, scanner, out ArrayToken whitePointToken))
{ {
return UnsupportedColorSpaceDetails.Instance; return UnsupportedColorSpaceDetails.Instance;
} }
@@ -135,14 +135,14 @@
// BlackPoint is optional // BlackPoint is optional
IReadOnlyList<decimal> blackPoint = null; IReadOnlyList<decimal> blackPoint = null;
if (dictionaryToken.TryGet(NameToken.BlackPoint, out ArrayToken blackPointToken)) if (dictionaryToken.TryGet(NameToken.BlackPoint, scanner, out ArrayToken blackPointToken))
{ {
blackPoint = blackPointToken.Data.OfType<NumericToken>().Select(x => x.Data).ToList(); blackPoint = blackPointToken.Data.OfType<NumericToken>().Select(x => x.Data).ToList();
} }
// Gamma is optional // Gamma is optional
decimal? gamma = null; decimal? gamma = null;
if (dictionaryToken.TryGet(NameToken.Gamma, out NumericToken gammaToken)) if (dictionaryToken.TryGet(NameToken.Gamma, scanner, out NumericToken gammaToken))
{ {
gamma = gammaToken.Data; gamma = gammaToken.Data;
} }
@@ -169,7 +169,7 @@
// WhitePoint is required // WhitePoint is required
if (!DirectObjectFinder.TryGet(second, scanner, out DictionaryToken dictionaryToken) || if (!DirectObjectFinder.TryGet(second, scanner, out DictionaryToken dictionaryToken) ||
!dictionaryToken.TryGet(NameToken.WhitePoint, out ArrayToken whitePointToken)) !dictionaryToken.TryGet(NameToken.WhitePoint, scanner, out ArrayToken whitePointToken))
{ {
return UnsupportedColorSpaceDetails.Instance; return UnsupportedColorSpaceDetails.Instance;
} }
@@ -178,21 +178,21 @@
// BlackPoint is optional // BlackPoint is optional
IReadOnlyList<decimal> blackPoint = null; IReadOnlyList<decimal> blackPoint = null;
if (dictionaryToken.TryGet(NameToken.BlackPoint, out ArrayToken blackPointToken)) if (dictionaryToken.TryGet(NameToken.BlackPoint, scanner, out ArrayToken blackPointToken))
{ {
blackPoint = blackPointToken.Data.OfType<NumericToken>().Select(x => x.Data).ToList(); blackPoint = blackPointToken.Data.OfType<NumericToken>().Select(x => x.Data).ToList();
} }
// Gamma is optional // Gamma is optional
IReadOnlyList<decimal> gamma = null; IReadOnlyList<decimal> gamma = null;
if (dictionaryToken.TryGet(NameToken.Gamma, out ArrayToken gammaToken)) if (dictionaryToken.TryGet(NameToken.Gamma, scanner, out ArrayToken gammaToken))
{ {
gamma = gammaToken.Data.OfType<NumericToken>().Select(x => x.Data).ToList(); gamma = gammaToken.Data.OfType<NumericToken>().Select(x => x.Data).ToList();
} }
// Matrix is optional // Matrix is optional
IReadOnlyList<decimal> matrix = null; IReadOnlyList<decimal> matrix = null;
if (dictionaryToken.TryGet(NameToken.Matrix, out ArrayToken matrixToken)) if (dictionaryToken.TryGet(NameToken.Matrix, scanner, out ArrayToken matrixToken))
{ {
matrix = matrixToken.Data.OfType<NumericToken>().Select(x => x.Data).ToList(); matrix = matrixToken.Data.OfType<NumericToken>().Select(x => x.Data).ToList();
} }
@@ -221,7 +221,7 @@
// N is required // N is required
if (!DirectObjectFinder.TryGet(second, scanner, out StreamToken streamToken) || if (!DirectObjectFinder.TryGet(second, scanner, out StreamToken streamToken) ||
!streamToken.StreamDictionary.TryGet(NameToken.N, out NumericToken numeric)) !streamToken.StreamDictionary.TryGet(NameToken.N, scanner, out NumericToken numeric))
{ {
return UnsupportedColorSpaceDetails.Instance; return UnsupportedColorSpaceDetails.Instance;
} }
@@ -237,14 +237,14 @@
// Range is optional // Range is optional
IReadOnlyList<decimal> range = null; IReadOnlyList<decimal> range = null;
if (streamToken.StreamDictionary.TryGet(NameToken.Range, out ArrayToken arrayToken)) if (streamToken.StreamDictionary.TryGet(NameToken.Range, scanner, out ArrayToken arrayToken))
{ {
range = arrayToken.Data.OfType<NumericToken>().Select(x => x.Data).ToList(); range = arrayToken.Data.OfType<NumericToken>().Select(x => x.Data).ToList();
} }
// Metadata is optional // Metadata is optional
XmpMetadata metadata = null; XmpMetadata metadata = null;
if (streamToken.StreamDictionary.TryGet(NameToken.Metadata, out StreamToken metadataStream)) if (streamToken.StreamDictionary.TryGet(NameToken.Metadata, scanner, out StreamToken metadataStream))
{ {
metadata = new XmpMetadata(metadataStream, filterProvider, scanner); metadata = new XmpMetadata(metadataStream, filterProvider, scanner);
} }