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

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

Issue 2479303002: Use unique_ptr return from CPDF_Parser::ParseIndirectObject() (Closed)
Patch Set: Work around android Created 4 years, 1 month 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/parser/cpdf_boolean.h » ('j') | core/fpdfapi/parser/cpdf_parser.cpp » ('J')
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/parser/cfdf_document.h" 7 #include "core/fpdfapi/parser/cfdf_document.h"
8 8
9 #include "core/fpdfapi/edit/cpdf_creator.h" 9 #include "core/fpdfapi/edit/cpdf_creator.h"
10 #include "core/fpdfapi/parser/cpdf_dictionary.h" 10 #include "core/fpdfapi/parser/cpdf_dictionary.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 break; 62 break;
63 63
64 word = parser.GetNextWord(&bNumber); 64 word = parser.GetNextWord(&bNumber);
65 if (!bNumber) 65 if (!bNumber)
66 break; 66 break;
67 67
68 word = parser.GetNextWord(nullptr); 68 word = parser.GetNextWord(nullptr);
69 if (word != "obj") 69 if (word != "obj")
70 break; 70 break;
71 71
72 auto pObj = pdfium::WrapUnique<CPDF_Object>( 72 std::unique_ptr<CPDF_Object> pObj =
73 parser.GetObject(this, objnum, 0, true)); 73 parser.GetObject(this, objnum, 0, true);
74 if (!pObj) 74 if (!pObj)
75 break; 75 break;
76 76
77 ReplaceIndirectObjectIfHigherGeneration(objnum, std::move(pObj)); 77 ReplaceIndirectObjectIfHigherGeneration(objnum, std::move(pObj));
78 word = parser.GetNextWord(nullptr); 78 word = parser.GetNextWord(nullptr);
79 if (word != "endobj") 79 if (word != "endobj")
80 break; 80 break;
81 } else { 81 } else {
82 if (word != "trailer") 82 if (word != "trailer")
83 break; 83 break;
84 84
85 if (CPDF_Dictionary* pMainDict = 85 std::unique_ptr<CPDF_Dictionary> pMainDict =
86 ToDictionary(parser.GetObject(this, 0, 0, true))) { 86 ToDictionary(parser.GetObject(this, 0, 0, true));
87 if (pMainDict)
87 m_pRootDict = pMainDict->GetDictFor("Root"); 88 m_pRootDict = pMainDict->GetDictFor("Root");
88 delete pMainDict; 89
89 }
90 break; 90 break;
91 } 91 }
92 } 92 }
93 } 93 }
94 94
95 bool CFDF_Document::WriteBuf(CFX_ByteTextBuf& buf) const { 95 bool CFDF_Document::WriteBuf(CFX_ByteTextBuf& buf) const {
96 if (!m_pRootDict) 96 if (!m_pRootDict)
97 return false; 97 return false;
98 98
99 buf << "%FDF-1.2\r\n"; 99 buf << "%FDF-1.2\r\n";
100 for (const auto& pair : *this) 100 for (const auto& pair : *this)
101 buf << pair.first << " 0 obj\r\n" 101 buf << pair.first << " 0 obj\r\n"
102 << pair.second.get() << "\r\nendobj\r\n\r\n"; 102 << pair.second.get() << "\r\nendobj\r\n\r\n";
103 103
104 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum() 104 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
105 << " 0 R>>\r\n%%EOF\r\n"; 105 << " 0 R>>\r\n%%EOF\r\n";
106 return true; 106 return true;
107 } 107 }
OLDNEW
« no previous file with comments | « no previous file | core/fpdfapi/parser/cpdf_boolean.h » ('j') | core/fpdfapi/parser/cpdf_parser.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698