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

Side by Side Diff: fpdfsdk/fpdfppo.cpp

Issue 2361713002: Remove some objnum locals with AddIndirectObject (Closed)
Patch Set: Same treatment for arrays Created 4 years, 3 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 | « fpdfsdk/fpdfdoc_unittest.cpp ('k') | fpdfsdk/fpdfsave.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 "public/fpdf_ppo.h" 7 #include "public/fpdf_ppo.h"
8 8
9 #include <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 CFX_ByteString cbRootType = pNewRoot->GetStringFor("Type", ""); 65 CFX_ByteString cbRootType = pNewRoot->GetStringFor("Type", "");
66 if (cbRootType.IsEmpty()) 66 if (cbRootType.IsEmpty())
67 pNewRoot->SetFor("Type", new CPDF_Name("Catalog")); 67 pNewRoot->SetFor("Type", new CPDF_Name("Catalog"));
68 68
69 CPDF_Object* pElement = pNewRoot->GetObjectFor("Pages"); 69 CPDF_Object* pElement = pNewRoot->GetObjectFor("Pages");
70 CPDF_Dictionary* pNewPages = 70 CPDF_Dictionary* pNewPages =
71 pElement ? ToDictionary(pElement->GetDirect()) : nullptr; 71 pElement ? ToDictionary(pElement->GetDirect()) : nullptr;
72 if (!pNewPages) { 72 if (!pNewPages) {
73 pNewPages = new CPDF_Dictionary; 73 pNewPages = new CPDF_Dictionary;
74 uint32_t NewPagesON = pDestPDFDoc->AddIndirectObject(pNewPages); 74 pNewRoot->SetReferenceFor("Pages", pDestPDFDoc,
75 pNewRoot->SetFor("Pages", new CPDF_Reference(pDestPDFDoc, NewPagesON)); 75 pDestPDFDoc->AddIndirectObject(pNewPages));
76 } 76 }
77 77
78 CFX_ByteString cbPageType = pNewPages->GetStringFor("Type", ""); 78 CFX_ByteString cbPageType = pNewPages->GetStringFor("Type", "");
79 if (cbPageType == "") { 79 if (cbPageType == "") {
80 pNewPages->SetFor("Type", new CPDF_Name("Pages")); 80 pNewPages->SetFor("Type", new CPDF_Name("Pages"));
81 } 81 }
82 82
83 CPDF_Array* pKeysArray = pNewPages->GetArrayFor("Kids"); 83 if (!pNewPages->GetArrayFor("Kids")) {
84 if (!pKeysArray) { 84 pNewPages->SetIntegerFor("Count", 0);
85 CPDF_Array* pNewKids = new CPDF_Array; 85 pNewPages->SetReferenceFor("Kids", pDestPDFDoc,
86 uint32_t Kidsobjnum = pDestPDFDoc->AddIndirectObject(pNewKids); 86 pDestPDFDoc->AddIndirectObject(new CPDF_Array));
87
88 pNewPages->SetFor("Kids", new CPDF_Reference(pDestPDFDoc, Kidsobjnum));
89 pNewPages->SetFor("Count", new CPDF_Number(0));
90 } 87 }
91 88
92 return TRUE; 89 return TRUE;
93 } 90 }
94 91
95 FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc, 92 FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc,
96 std::vector<uint16_t>* pPageNums, 93 std::vector<uint16_t>* pPageNums,
97 CPDF_Document* pDestPDFDoc, 94 CPDF_Document* pDestPDFDoc,
98 int nIndex) { 95 int nIndex) {
99 int curpage = nIndex; 96 int curpage = nIndex;
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 if (!pSrcDict) 396 if (!pSrcDict)
400 return FALSE; 397 return FALSE;
401 398
402 CPDF_Dictionary* pDstDict = pDstDoc->GetRoot(); 399 CPDF_Dictionary* pDstDict = pDstDoc->GetRoot();
403 if (!pDstDict) 400 if (!pDstDict)
404 return FALSE; 401 return FALSE;
405 402
406 pDstDict->SetFor("ViewerPreferences", pSrcDict->CloneDirectObject()); 403 pDstDict->SetFor("ViewerPreferences", pSrcDict->CloneDirectObject());
407 return TRUE; 404 return TRUE;
408 } 405 }
OLDNEW
« no previous file with comments | « fpdfsdk/fpdfdoc_unittest.cpp ('k') | fpdfsdk/fpdfsave.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698