lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2025-09-20 11:37:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

attempt to find bug in #202 due to seemingly empty codespace ranges

Browse Source
This commit is contained in:
Eliot Jones
2020-08-22 15:38:59 +01:00
parent 5ffada46e3
commit 04f785aed4
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/UglyToad.PdfPig/PdfFonts/Cmap/CMap.cs
View File

@@ -60,10 +60,18 @@
public bool HasUnicodeMappings => BaseFontCharacterMap.Count > 0; public bool HasUnicodeMappings => BaseFontCharacterMap.Count > 0;
private readonly int minCodeLength; /// <summary>
/// Issue #202 seems to indicate empty codespace ranges are possible.
/// </summary>
private readonly bool hasEmptyCodespace;
private readonly int minCodeLength = 4;
private readonly int maxCodeLength; private readonly int maxCodeLength;
public CMap(CharacterIdentifierSystemInfo info, int type, int wMode, string name, string version, IReadOnlyDictionary<int, string> baseFontCharacterMap, IReadOnlyList<CodespaceRange> codespaceRanges, IReadOnlyList<CidRange> cidRanges, IReadOnlyList<CidCharacterMapping> cidCharacterMappings) public CMap(CharacterIdentifierSystemInfo info, int type, int wMode, string name, string version,
IReadOnlyDictionary<int, string> baseFontCharacterMap,
IReadOnlyList<CodespaceRange> codespaceRanges,
IReadOnlyList<CidRange> cidRanges,
IReadOnlyList<CidCharacterMapping> cidCharacterMappings)
{ {
if (cidCharacterMappings == null) if (cidCharacterMappings == null)
{ {
@@ -78,8 +86,17 @@
BaseFontCharacterMap = baseFontCharacterMap ?? throw new ArgumentNullException(nameof(baseFontCharacterMap)); BaseFontCharacterMap = baseFontCharacterMap ?? throw new ArgumentNullException(nameof(baseFontCharacterMap));
CodespaceRanges = codespaceRanges ?? throw new ArgumentNullException(nameof(codespaceRanges)); CodespaceRanges = codespaceRanges ?? throw new ArgumentNullException(nameof(codespaceRanges));
CidRanges = cidRanges ?? throw new ArgumentNullException(nameof(cidRanges)); CidRanges = cidRanges ?? throw new ArgumentNullException(nameof(cidRanges));
// Issue #202 possible empty codespace ranges?
if (CodespaceRanges.Count > 0)
{
maxCodeLength = CodespaceRanges.Max(x => x.CodeLength); maxCodeLength = CodespaceRanges.Max(x => x.CodeLength);
minCodeLength = CodespaceRanges.Min(x => x.CodeLength); minCodeLength = CodespaceRanges.Min(x => x.CodeLength);
}
else
{
hasEmptyCodespace = true;
}
var characterMappings = new Dictionary<int, CidCharacterMapping>(); var characterMappings = new Dictionary<int, CidCharacterMapping>();
@@ -135,6 +152,13 @@
public int ReadCode(IInputBytes bytes) public int ReadCode(IInputBytes bytes)
{ {
if (hasEmptyCodespace)
{
var data = new byte[minCodeLength];
bytes.Read(data);
return data.ToInt(minCodeLength);
}
byte[] result = new byte[maxCodeLength]; byte[] result = new byte[maxCodeLength];
result[0] = bytes.CurrentByte; result[0] = bytes.CurrentByte;
@@ -165,7 +189,7 @@
} }
} }
throw new InvalidOperationException("CMap is invalid"); throw new PdfDocumentFormatException($"CMap is invalid, min code length was {minCodeLength}, max was {maxCodeLength}.");
} }
private static byte ReadByte(IInputBytes bytes) private static byte ReadByte(IInputBytes bytes)