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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/fpdfapi/fpdf_parser/include/cfdf_document.h" 7 #include "core/fpdfapi/fpdf_parser/include/cfdf_document.h"
8 8
9 #include "core/fpdfapi/fpdf_edit/include/cpdf_creator.h" 9 #include "core/fpdfapi/fpdf_edit/include/cpdf_creator.h"
10 #include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h" 10 #include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
11 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" 11 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
12 12
13 CFDF_Document::CFDF_Document() 13 CFDF_Document::CFDF_Document() : CPDF_IndirectObjectHolder(nullptr) {
14 : CPDF_IndirectObjectHolder(), 14 m_pRootDict = nullptr;
15 m_pRootDict(nullptr), 15 m_pFile = nullptr;
16 m_pFile(nullptr), 16 m_bOwnFile = FALSE;
17 m_bOwnFile(FALSE) {} 17 }
18
19 CFDF_Document::~CFDF_Document() { 18 CFDF_Document::~CFDF_Document() {
20 if (m_bOwnFile && m_pFile) 19 if (m_bOwnFile && m_pFile) {
21 m_pFile->Release(); 20 m_pFile->Release();
21 }
22 } 22 }
23
24 CFDF_Document* CFDF_Document::CreateNewDoc() { 23 CFDF_Document* CFDF_Document::CreateNewDoc() {
25 CFDF_Document* pDoc = new CFDF_Document; 24 CFDF_Document* pDoc = new CFDF_Document;
26 pDoc->m_pRootDict = new CPDF_Dictionary; 25 pDoc->m_pRootDict = new CPDF_Dictionary;
27 pDoc->AddIndirectObject(pDoc->m_pRootDict); 26 pDoc->AddIndirectObject(pDoc->m_pRootDict);
28 CPDF_Dictionary* pFDFDict = new CPDF_Dictionary; 27 CPDF_Dictionary* pFDFDict = new CPDF_Dictionary;
29 pDoc->m_pRootDict->SetAt("FDF", pFDFDict); 28 pDoc->m_pRootDict->SetAt("FDF", pFDFDict);
30 return pDoc; 29 return pDoc;
31 } 30 }
32 31
33 CFDF_Document* CFDF_Document::ParseFile(IFX_FileRead* pFile, FX_BOOL bOwnFile) { 32 CFDF_Document* CFDF_Document::ParseFile(IFX_FileRead* pFile, FX_BOOL bOwnFile) {
(...skipping 25 matching lines...) Expand all
59 break; 58 break;
60 59
61 word = parser.GetNextWord(nullptr); 60 word = parser.GetNextWord(nullptr);
62 if (word != "obj") 61 if (word != "obj")
63 break; 62 break;
64 63
65 CPDF_Object* pObj = parser.GetObject(this, objnum, 0, true); 64 CPDF_Object* pObj = parser.GetObject(this, objnum, 0, true);
66 if (!pObj) 65 if (!pObj)
67 break; 66 break;
68 67
69 ReplaceIndirectObjectIfHigherGeneration(objnum, pObj); 68 InsertIndirectObject(objnum, pObj);
70 word = parser.GetNextWord(nullptr); 69 word = parser.GetNextWord(nullptr);
71 if (word != "endobj") 70 if (word != "endobj")
72 break; 71 break;
73 } else { 72 } else {
74 if (word != "trailer") 73 if (word != "trailer")
75 break; 74 break;
76 75
77 if (CPDF_Dictionary* pMainDict = 76 if (CPDF_Dictionary* pMainDict =
78 ToDictionary(parser.GetObject(this, 0, 0, true))) { 77 ToDictionary(parser.GetObject(this, 0, 0, true))) {
79 m_pRootDict = pMainDict->GetDictBy("Root"); 78 m_pRootDict = pMainDict->GetDictBy("Root");
80 pMainDict->Release(); 79 pMainDict->Release();
81 } 80 }
82 break; 81 break;
83 } 82 }
84 } 83 }
85 } 84 }
86 85
87 FX_BOOL CFDF_Document::WriteBuf(CFX_ByteTextBuf& buf) const { 86 FX_BOOL CFDF_Document::WriteBuf(CFX_ByteTextBuf& buf) const {
88 if (!m_pRootDict) { 87 if (!m_pRootDict) {
89 return FALSE; 88 return FALSE;
90 } 89 }
91 buf << "%FDF-1.2\r\n"; 90 buf << "%FDF-1.2\r\n";
92 for (const auto& pair : *this) 91 for (const auto& pair : m_IndirectObjs) {
93 buf << pair.first << " 0 obj\r\n" << pair.second << "\r\nendobj\r\n\r\n"; 92 buf << pair.first << " 0 obj\r\n" << pair.second << "\r\nendobj\r\n\r\n";
94 93 }
95 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum() 94 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
96 << " 0 R>>\r\n%%EOF\r\n"; 95 << " 0 R>>\r\n%%EOF\r\n";
97 return TRUE; 96 return TRUE;
98 } 97 }
OLDNEW
« 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