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

Side by Side Diff: core/fpdfapi/fpdf_parser/cfdf_document.cpp

Issue 2361713002: Remove some objnum locals with AddIndirectObject (Closed)
Patch Set: Same treatment for arrays Created 4 years, 2 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
« no previous file with comments | « core/fpdfapi/fpdf_page/cpdf_image.cpp ('k') | core/fpdfapi/fpdf_parser/cpdf_document.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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()
14 : CPDF_IndirectObjectHolder(), 14 : CPDF_IndirectObjectHolder(),
15 m_pRootDict(nullptr), 15 m_pRootDict(nullptr),
16 m_pFile(nullptr), 16 m_pFile(nullptr),
17 m_bOwnFile(FALSE) {} 17 m_bOwnFile(FALSE) {}
18 18
19 CFDF_Document::~CFDF_Document() { 19 CFDF_Document::~CFDF_Document() {
20 if (m_bOwnFile && m_pFile) 20 if (m_bOwnFile && m_pFile)
21 m_pFile->Release(); 21 m_pFile->Release();
22 } 22 }
23 23
24 CFDF_Document* CFDF_Document::CreateNewDoc() { 24 CFDF_Document* CFDF_Document::CreateNewDoc() {
25 CFDF_Document* pDoc = new CFDF_Document; 25 CFDF_Document* pDoc = new CFDF_Document;
26 pDoc->m_pRootDict = new CPDF_Dictionary; 26 pDoc->m_pRootDict = new CPDF_Dictionary;
27 pDoc->AddIndirectObject(pDoc->m_pRootDict); 27 pDoc->AddIndirectObject(pDoc->m_pRootDict);
28 CPDF_Dictionary* pFDFDict = new CPDF_Dictionary; 28 pDoc->m_pRootDict->SetFor("FDF", new CPDF_Dictionary);
29 pDoc->m_pRootDict->SetFor("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) {
34 if (!pFile) 33 if (!pFile)
35 return nullptr; 34 return nullptr;
36 35
37 std::unique_ptr<CFDF_Document> pDoc(new CFDF_Document); 36 std::unique_ptr<CFDF_Document> pDoc(new CFDF_Document);
38 pDoc->ParseStream(pFile, bOwnFile); 37 pDoc->ParseStream(pFile, bOwnFile);
39 return pDoc->m_pRootDict ? pDoc.release() : nullptr; 38 return pDoc->m_pRootDict ? pDoc.release() : nullptr;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 : *this)
93 buf << pair.first << " 0 obj\r\n" 92 buf << pair.first << " 0 obj\r\n"
94 << pair.second.get() << "\r\nendobj\r\n\r\n"; 93 << pair.second.get() << "\r\nendobj\r\n\r\n";
95 94
96 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum() 95 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
97 << " 0 R>>\r\n%%EOF\r\n"; 96 << " 0 R>>\r\n%%EOF\r\n";
98 return TRUE; 97 return TRUE;
99 } 98 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_page/cpdf_image.cpp ('k') | core/fpdfapi/fpdf_parser/cpdf_document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698