summaryrefslogtreecommitdiff
path: root/core/fpdfapi/edit/cpdf_xrefstream.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-05-10 13:59:14 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-05-10 19:41:00 +0000
commit5b590337e0778b49dd7092af4a283ed0f9c5a2e9 (patch)
tree4aae9dd27685bf2cca6954d5a1a7ef197466b808 /core/fpdfapi/edit/cpdf_xrefstream.cpp
parentaa7022833db1a6e21b81fcca30b45ba652298f32 (diff)
downloadpdfium-5b590337e0778b49dd7092af4a283ed0f9c5a2e9.tar.xz
Store the offset in the archive buffer
This Cl moves the implementation of the archive buffer behind an IFX_ArchiveStream interface. The buffer holds the current offset and the offset parameter is removed from the CPDF_Creator and various other methods. Change-Id: Ia54e803b58bbfb6ef03fec4a940d2c056d541356 Reviewed-on: https://pdfium-review.googlesource.com/5255 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/edit/cpdf_xrefstream.cpp')
-rw-r--r--core/fpdfapi/edit/cpdf_xrefstream.cpp202
1 files changed, 64 insertions, 138 deletions
diff --git a/core/fpdfapi/edit/cpdf_xrefstream.cpp b/core/fpdfapi/edit/cpdf_xrefstream.cpp
index 7ec05fd8bc..67793b244d 100644
--- a/core/fpdfapi/edit/cpdf_xrefstream.cpp
+++ b/core/fpdfapi/edit/cpdf_xrefstream.cpp
@@ -17,11 +17,9 @@ namespace {
const int32_t kObjectStreamMaxSize = 200;
-int32_t WriteTrailer(CPDF_Document* pDocument,
- CFX_FileBufferArchive* pFile,
- CPDF_Array* pIDArray) {
- FX_FILESIZE offset = 0;
- int32_t len = 0;
+bool WriteTrailer(CPDF_Document* pDocument,
+ IFX_ArchiveStream* archive,
+ CPDF_Array* pIDArray) {
CPDF_Parser* pParser = pDocument->GetParser();
if (pParser) {
CPDF_Dictionary* p = pParser->GetTrailer();
@@ -35,83 +33,56 @@ int32_t WriteTrailer(CPDF_Document* pDocument,
}
if (key == "DecodeParms")
continue;
- if (pFile->AppendString(("/")) < 0)
- return -1;
-
- len = pFile->AppendString(PDF_NameEncode(key).AsStringC());
- if (len < 0)
- return -1;
- offset += len + 1;
+ if (!archive->WriteString(("/")) ||
+ !archive->WriteString(PDF_NameEncode(key).AsStringC())) {
+ return false;
+ }
if (!pValue->IsInline()) {
- if (pFile->AppendString(" ") < 0)
- return -1;
-
- len = pFile->AppendDWord(pValue->GetObjNum());
- if (len < 0 || pFile->AppendString(" 0 R ") < 0)
- return -1;
- offset += len + 6;
- } else if (!pValue->WriteTo(pFile, &offset)) {
- return -1;
+ if (!archive->WriteString(" ") ||
+ !archive->WriteDWord(pValue->GetObjNum()) ||
+ !archive->WriteString(" 0 R ")) {
+ return false;
+ }
+ } else if (!pValue->WriteTo(archive)) {
+ return false;
}
}
if (pIDArray) {
- if (pFile->AppendString(("/ID")) < 0)
- return -1;
- offset += 3;
-
- if (!pIDArray->WriteTo(pFile, &offset))
- return -1;
+ if (!archive->WriteString(("/ID")) || !pIDArray->WriteTo(archive))
+ return false;
}
- return offset;
+ return true;
+ }
+ if (!archive->WriteString("\r\n/Root ") ||
+ !archive->WriteDWord(pDocument->GetRoot()->GetObjNum()) ||
+ !archive->WriteString(" 0 R\r\n")) {
+ return false;
}
- if (pFile->AppendString("\r\n/Root ") < 0)
- return -1;
-
- len = pFile->AppendDWord(pDocument->GetRoot()->GetObjNum());
- if (len < 0 || pFile->AppendString(" 0 R\r\n") < 0)
- return -1;
- offset += len + 14;
if (pDocument->GetInfo()) {
- if (pFile->AppendString("/Info ") < 0)
- return -1;
-
- len = pFile->AppendDWord(pDocument->GetInfo()->GetObjNum());
- if (len < 0 || pFile->AppendString(" 0 R\r\n") < 0)
- return -1;
- offset += len + 12;
+ if (!archive->WriteString("/Info ") ||
+ !archive->WriteDWord(pDocument->GetInfo()->GetObjNum()) ||
+ !archive->WriteString(" 0 R\r\n")) {
+ return false;
+ }
}
if (pIDArray) {
- if (pFile->AppendString(("/ID")) < 0)
- return -1;
- offset += 3;
-
- if (!pIDArray->WriteTo(pFile, &offset))
- return -1;
+ if (!archive->WriteString(("/ID")) || !pIDArray->WriteTo(archive))
+ return false;
}
- return offset;
+ return true;
}
-int32_t WriteEncryptDictObjectReference(uint32_t dwObjNum,
- CFX_FileBufferArchive* pFile) {
- ASSERT(pFile);
-
- FX_FILESIZE offset = 0;
- int32_t len = 0;
- if (pFile->AppendString("/Encrypt") < 0)
- return -1;
- offset += 8;
-
- if (pFile->AppendString(" ") < 0)
- return -1;
+bool WriteEncryptDictObjectReference(uint32_t dwObjNum,
+ IFX_ArchiveStream* archive) {
+ ASSERT(archive);
- len = pFile->AppendDWord(dwObjNum);
- if (len < 0 || pFile->AppendString(" 0 R ") < 0)
- return -1;
- offset += len + 6;
-
- return offset;
+ if (!archive->WriteString("/Encrypt") || !archive->WriteString(" ") ||
+ !archive->WriteDWord(dwObjNum) || !archive->WriteString(" 0 R ")) {
+ return false;
+ }
+ return true;
}
void AppendIndex0(CFX_ByteTextBuf& buffer, bool bFirstObject) {
@@ -255,9 +226,10 @@ bool CPDF_XRefStream::EndObjectStream(CPDF_Creator* pCreator, bool bEOF) {
}
bool CPDF_XRefStream::GenerateXRefStream(CPDF_Creator* pCreator, bool bEOF) {
- FX_FILESIZE offset_tmp = pCreator->GetOffset();
uint32_t objnum = pCreator->GetNextObjectNumber();
- CFX_FileBufferArchive* pFile = pCreator->GetFile();
+ IFX_ArchiveStream* archive = pCreator->GetArchive();
+ FX_FILESIZE offset_tmp = archive->CurrentOffset();
+
if (pCreator->IsIncremental()) {
AddObjectNumberToIndexArray(objnum);
} else {
@@ -271,113 +243,67 @@ bool CPDF_XRefStream::GenerateXRefStream(CPDF_Creator* pCreator, bool bEOF) {
AppendIndex1(m_Buffer, offset_tmp);
- int32_t len = pFile->AppendDWord(objnum);
- if (len < 0)
- return false;
- pCreator->IncrementOffset(len);
-
- len = pFile->AppendString(" 0 obj\r\n<</Type /XRef/W[1 4 2]/Index[");
- if (len < 0)
+ if (!archive->WriteDWord(objnum) ||
+ !archive->WriteString(" 0 obj\r\n<</Type /XRef/W[1 4 2]/Index[")) {
return false;
- pCreator->IncrementOffset(len);
+ }
if (!pCreator->IsIncremental()) {
- if (pFile->AppendDWord(0) < 0)
- return false;
-
- len = pFile->AppendString(" ");
- if (len < 0)
+ if (!archive->WriteDWord(0) || !archive->WriteString(" ") ||
+ !archive->WriteDWord(objnum + 1)) {
return false;
- pCreator->IncrementOffset(len + 1);
-
- len = pFile->AppendDWord(objnum + 1);
- if (len < 0)
- return false;
- pCreator->IncrementOffset(len);
+ }
} else {
for (const auto& pair : m_IndexArray) {
- len = pFile->AppendDWord(pair.objnum);
- if (len < 0 || pFile->AppendString(" ") < 0)
+ if (!archive->WriteDWord(pair.objnum) || !archive->WriteString(" ") ||
+ !archive->WriteDWord(pair.count) || !archive->WriteString(" ")) {
return false;
- pCreator->IncrementOffset(len + 1);
-
- len = pFile->AppendDWord(pair.count);
- if (len < 0 || pFile->AppendString(" ") < 0)
- return false;
- pCreator->IncrementOffset(len + 1);
+ }
}
}
- if (pFile->AppendString("]/Size ") < 0)
+ if (!archive->WriteString("]/Size ") || !archive->WriteDWord(objnum + 1))
return false;
- len = pFile->AppendDWord(objnum + 1);
- if (len < 0)
- return false;
- pCreator->IncrementOffset(len + 7);
-
if (m_PrevOffset > 0) {
- if (pFile->AppendString("/Prev ") < 0)
+ if (!archive->WriteString("/Prev "))
return false;
char offset_buf[20];
memset(offset_buf, 0, sizeof(offset_buf));
FXSYS_i64toa(m_PrevOffset, offset_buf, 10);
int32_t offset_len = (int32_t)FXSYS_strlen(offset_buf);
- if (pFile->AppendBlock(offset_buf, offset_len) < 0)
+ if (!archive->WriteBlock(offset_buf, offset_len))
return false;
-
- pCreator->IncrementOffset(offset_len + 6);
}
CPDF_FlateEncoder encoder(m_Buffer.GetBuffer(), m_Buffer.GetLength(), true,
true);
- if (pFile->AppendString("/Filter /FlateDecode") < 0)
+ if (!archive->WriteString("/Filter /FlateDecode") ||
+ !archive->WriteString("/DecodeParms<</Columns 7/Predictor 12>>") ||
+ !archive->WriteString("/Length ") ||
+ !archive->WriteDWord(encoder.GetSize())) {
return false;
- pCreator->IncrementOffset(20);
-
- len = pFile->AppendString("/DecodeParms<</Columns 7/Predictor 12>>");
- if (len < 0)
- return false;
- pCreator->IncrementOffset(len);
-
- if (pFile->AppendString("/Length ") < 0)
- return false;
-
- len = pFile->AppendDWord(encoder.GetSize());
- if (len < 0)
- return false;
- pCreator->IncrementOffset(len + 8);
+ }
if (bEOF) {
- len = WriteTrailer(pCreator->GetDocument(), pFile, pCreator->GetIDArray());
- if (len < 0)
+ if (!WriteTrailer(pCreator->GetDocument(), archive, pCreator->GetIDArray()))
return false;
- pCreator->IncrementOffset(len);
if (CPDF_Dictionary* encryptDict = pCreator->GetEncryptDict()) {
uint32_t dwEncryptObjNum = encryptDict->GetObjNum();
if (dwEncryptObjNum == 0)
dwEncryptObjNum = pCreator->GetEncryptObjectNumber();
- len = WriteEncryptDictObjectReference(dwEncryptObjNum, pFile);
- if (len < 0)
+ if (!WriteEncryptDictObjectReference(dwEncryptObjNum, archive))
return false;
- pCreator->IncrementOffset(len);
}
}
- len = pFile->AppendString(">>stream\r\n");
- if (len < 0)
- return false;
- pCreator->IncrementOffset(len);
-
- if (pFile->AppendBlock(encoder.GetData(), encoder.GetSize()) < 0)
+ if (!archive->WriteString(">>stream\r\n") ||
+ !archive->WriteBlock(encoder.GetData(), encoder.GetSize()) ||
+ !archive->WriteString("\r\nendstream\r\nendobj\r\n")) {
return false;
-
- len = pFile->AppendString("\r\nendstream\r\nendobj\r\n");
- if (len < 0)
- return false;
- pCreator->IncrementOffset(encoder.GetSize() + len);
+ }
m_PrevOffset = offset_tmp;
return true;