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

Rename DocumentBuilder to DocumentMerger

Browse Source 
Remove IDisposable trait
This commit is contained in:
Inusual
2020-02-24 21:16:45 -04:00
committed by Eliot Jones
parent 6e0caee317
commit 761e3d291e
1 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/UglyToad.PdfPig/Writer/PdfMerger.cs
View File

@@ -1,4 +1,4 @@
namespace UglyToad.PdfPig.Writer
namespace UglyToad.PdfPig.Writer
{
using System;
using System.Collections.Generic;
@@ -66,7 +66,7 @@
const bool isLenientParsing = true;
using var documentBuilder = new DocumentBuilder();
var documentBuilder = new DocumentMerger();
foreach (var file in files)
{
@@ -161,12 +161,8 @@
return (crossReferenceTable.Trailer.Root, rootDictionary);
}
// Note: I don't think making this a disposable is a good idea.
// Also, suggestion for name?
private class DocumentBuilder : IDisposable
private class DocumentMerger
{
private bool isDisposed = false;
private MemoryStream Memory = new MemoryStream();
private readonly BuilderContext Context = new BuilderContext();
@@ -175,7 +171,7 @@
private IndirectReferenceToken RootPagesIndirectReference;
public DocumentBuilder()
public DocumentMerger()
{
var reserved = Context.ReserveNumber();
RootPagesIndirectReference = new IndirectReferenceToken(new IndirectReference(reserved, 0));
@@ -197,14 +193,14 @@
Memory.WriteNewLine();
}
public void AppendNewDocument(ObjectsTree newDocument, IPdfTokenScanner tokenScanner)
public void AppendDocument(Catalog documentCatalog, IPdfTokenScanner tokenScanner)
{
if (isDisposed)
if (Memory == null)
{
throw new ObjectDisposedException("Merger disposed already");
}
var pagesReference = CopyPagesTree(newDocument.Catalog.PageTree, RootPagesIndirectReference, tokenScanner);
var pagesReference = CopyPagesTree(documentCatalog.PageTree, RootPagesIndirectReference, tokenScanner);
DocumentPages.Add(new IndirectReferenceToken(pagesReference.Number));
}
@@ -322,7 +318,7 @@
public byte[] Build()
{
if (isDisposed)
if (Memory == null)
{
throw new ObjectDisposedException("Merger disposed already");
}
@@ -353,11 +349,20 @@
var bytes = Memory.ToArray();
Dispose();
Close();
return bytes;
}
public void Close()
{
if (Memory == null)
return;
Memory.Dispose();
Memory = null;
}
// Note: This method is copied from UglyToad.PdfPig.Writer.PdfDocumentBuilder
private static void WriteString(string text, MemoryStream stream, bool appendBreak = true)
{
@@ -368,16 +373,6 @@
stream.WriteNewLine();
}
}
public void Dispose()
{
if (isDisposed)
return;
Memory.Dispose();
Memory = null;
isDisposed = true;
}
}
// Currently unused becauase, brute force search give the wrong offset (+2)