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

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

Issue 2019443002: Make CPDF_IndirectObjectHolder::InsertIndirectObject return a bool. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix bad refactoring Created 4 years, 6 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 | « no previous file | core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.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"
(...skipping 10 matching lines...) Expand all
21 } 21 }
22 } 22 }
23 CFDF_Document* CFDF_Document::CreateNewDoc() { 23 CFDF_Document* CFDF_Document::CreateNewDoc() {
24 CFDF_Document* pDoc = new CFDF_Document; 24 CFDF_Document* pDoc = new CFDF_Document;
25 pDoc->m_pRootDict = new CPDF_Dictionary; 25 pDoc->m_pRootDict = new CPDF_Dictionary;
26 pDoc->AddIndirectObject(pDoc->m_pRootDict); 26 pDoc->AddIndirectObject(pDoc->m_pRootDict);
27 CPDF_Dictionary* pFDFDict = new CPDF_Dictionary; 27 CPDF_Dictionary* pFDFDict = new CPDF_Dictionary;
28 pDoc->m_pRootDict->SetAt("FDF", pFDFDict); 28 pDoc->m_pRootDict->SetAt("FDF", pFDFDict);
29 return pDoc; 29 return pDoc;
30 } 30 }
31
31 CFDF_Document* CFDF_Document::ParseFile(IFX_FileRead* pFile, FX_BOOL bOwnFile) { 32 CFDF_Document* CFDF_Document::ParseFile(IFX_FileRead* pFile, FX_BOOL bOwnFile) {
32 if (!pFile) { 33 if (!pFile)
33 return NULL; 34 return nullptr;
34 } 35
35 CFDF_Document* pDoc = new CFDF_Document; 36 std::unique_ptr<CFDF_Document> pDoc(new CFDF_Document);
36 pDoc->ParseStream(pFile, bOwnFile); 37 pDoc->ParseStream(pFile, bOwnFile);
37 if (!pDoc->m_pRootDict) { 38 return pDoc->m_pRootDict ? pDoc.release() : nullptr;
38 delete pDoc;
39 return NULL;
40 }
41 return pDoc;
42 } 39 }
40
43 CFDF_Document* CFDF_Document::ParseMemory(const uint8_t* pData, uint32_t size) { 41 CFDF_Document* CFDF_Document::ParseMemory(const uint8_t* pData, uint32_t size) {
44 return CFDF_Document::ParseFile(FX_CreateMemoryStream((uint8_t*)pData, size), 42 return CFDF_Document::ParseFile(FX_CreateMemoryStream((uint8_t*)pData, size),
45 TRUE); 43 TRUE);
46 } 44 }
45
47 void CFDF_Document::ParseStream(IFX_FileRead* pFile, FX_BOOL bOwnFile) { 46 void CFDF_Document::ParseStream(IFX_FileRead* pFile, FX_BOOL bOwnFile) {
48 m_pFile = pFile; 47 m_pFile = pFile;
49 m_bOwnFile = bOwnFile; 48 m_bOwnFile = bOwnFile;
50 CPDF_SyntaxParser parser; 49 CPDF_SyntaxParser parser;
51 parser.InitParser(m_pFile, 0); 50 parser.InitParser(m_pFile, 0);
52 while (1) { 51 while (1) {
53 bool bNumber; 52 bool bNumber;
54 CFX_ByteString word = parser.GetNextWord(&bNumber); 53 CFX_ByteString word = parser.GetNextWord(&bNumber);
55 if (bNumber) { 54 if (bNumber) {
56 uint32_t objnum = FXSYS_atoui(word.c_str()); 55 uint32_t objnum = FXSYS_atoui(word.c_str());
57 word = parser.GetNextWord(&bNumber); 56 word = parser.GetNextWord(&bNumber);
58 if (!bNumber) { 57 if (!bNumber)
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 InsertIndirectObject(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 }
74 } else { 72 } else {
75 if (word != "trailer") { 73 if (word != "trailer")
76 break; 74 break;
77 } 75
78 if (CPDF_Dictionary* pMainDict = 76 if (CPDF_Dictionary* pMainDict =
79 ToDictionary(parser.GetObject(this, 0, 0, true))) { 77 ToDictionary(parser.GetObject(this, 0, 0, true))) {
80 m_pRootDict = pMainDict->GetDictBy("Root"); 78 m_pRootDict = pMainDict->GetDictBy("Root");
81 pMainDict->Release(); 79 pMainDict->Release();
82 } 80 }
83 break; 81 break;
84 } 82 }
85 } 83 }
86 } 84 }
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 : m_IndirectObjs) { 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 | « no previous file | core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698