Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: core/fpdfapi/fpdf_parser/cfdf_document.cpp

Issue 2266033002: Revert of Move parser pointer to CPDF_Document (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp ('k') | core/fpdfapi/fpdf_parser/cpdf_array_unittest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fpdfapi/fpdf_parser/cfdf_document.cpp
diff --git a/core/fpdfapi/fpdf_parser/cfdf_document.cpp b/core/fpdfapi/fpdf_parser/cfdf_document.cpp
index f286346d7004f1c73b39dde7e88290a7b66fb128..c03987140107ebdbafeb7e19b73701b8c9db27e1 100644
--- a/core/fpdfapi/fpdf_parser/cfdf_document.cpp
+++ b/core/fpdfapi/fpdf_parser/cfdf_document.cpp
@@ -10,17 +10,16 @@
#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
-CFDF_Document::CFDF_Document()
- : CPDF_IndirectObjectHolder(),
- m_pRootDict(nullptr),
- m_pFile(nullptr),
- m_bOwnFile(FALSE) {}
-
+CFDF_Document::CFDF_Document() : CPDF_IndirectObjectHolder(nullptr) {
+ m_pRootDict = nullptr;
+ m_pFile = nullptr;
+ m_bOwnFile = FALSE;
+}
CFDF_Document::~CFDF_Document() {
- if (m_bOwnFile && m_pFile)
+ if (m_bOwnFile && m_pFile) {
m_pFile->Release();
+ }
}
-
CFDF_Document* CFDF_Document::CreateNewDoc() {
CFDF_Document* pDoc = new CFDF_Document;
pDoc->m_pRootDict = new CPDF_Dictionary;
@@ -66,7 +65,7 @@
if (!pObj)
break;
- ReplaceIndirectObjectIfHigherGeneration(objnum, pObj);
+ InsertIndirectObject(objnum, pObj);
word = parser.GetNextWord(nullptr);
if (word != "endobj")
break;
@@ -89,9 +88,9 @@
return FALSE;
}
buf << "%FDF-1.2\r\n";
- for (const auto& pair : *this)
+ for (const auto& pair : m_IndirectObjs) {
buf << pair.first << " 0 obj\r\n" << pair.second << "\r\nendobj\r\n\r\n";
-
+ }
buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
<< " 0 R>>\r\n%%EOF\r\n";
return TRUE;
« no previous file with comments | « core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp ('k') | core/fpdfapi/fpdf_parser/cpdf_array_unittest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698