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

Side by Side Diff: fpdfsdk/src/fpdfppo.cpp

Issue 1547833002: Switch from nonstd::unique_ptr to std::unique_ptr. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: rebase Created 4 years, 12 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/src/fpdfformfill.cpp ('k') | fpdfsdk/src/fpdfview.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 <memory>
10
9 #include "fpdfsdk/include/fsdk_define.h" 11 #include "fpdfsdk/include/fsdk_define.h"
10 #include "third_party/base/nonstd_unique_ptr.h"
11 12
12 class CPDF_PageOrganizer { 13 class CPDF_PageOrganizer {
13 public: 14 public:
14 using ObjectNumberMap = std::map<FX_DWORD, FX_DWORD>; 15 using ObjectNumberMap = std::map<FX_DWORD, FX_DWORD>;
15 CPDF_PageOrganizer(); 16 CPDF_PageOrganizer();
16 ~CPDF_PageOrganizer(); 17 ~CPDF_PageOrganizer();
17 18
18 FX_BOOL PDFDocInit(CPDF_Document* pDestPDFDoc, CPDF_Document* pSrcPDFDoc); 19 FX_BOOL PDFDocInit(CPDF_Document* pDestPDFDoc, CPDF_Document* pSrcPDFDoc);
19 FX_BOOL ExportPage(CPDF_Document* pSrcPDFDoc, 20 FX_BOOL ExportPage(CPDF_Document* pSrcPDFDoc,
20 CFX_WordArray* nPageNum, 21 CFX_WordArray* nPageNum,
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 85
85 return TRUE; 86 return TRUE;
86 } 87 }
87 88
88 FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc, 89 FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc,
89 CFX_WordArray* nPageNum, 90 CFX_WordArray* nPageNum,
90 CPDF_Document* pDestPDFDoc, 91 CPDF_Document* pDestPDFDoc,
91 int nIndex) { 92 int nIndex) {
92 int curpage = nIndex; 93 int curpage = nIndex;
93 94
94 nonstd::unique_ptr<ObjectNumberMap> pObjNumberMap(new ObjectNumberMap); 95 std::unique_ptr<ObjectNumberMap> pObjNumberMap(new ObjectNumberMap);
95 96
96 for (int i = 0; i < nPageNum->GetSize(); ++i) { 97 for (int i = 0; i < nPageNum->GetSize(); ++i) {
97 CPDF_Dictionary* pCurPageDict = pDestPDFDoc->CreateNewPage(curpage); 98 CPDF_Dictionary* pCurPageDict = pDestPDFDoc->CreateNewPage(curpage);
98 CPDF_Dictionary* pSrcPageDict = pSrcPDFDoc->GetPage(nPageNum->GetAt(i) - 1); 99 CPDF_Dictionary* pSrcPageDict = pSrcPDFDoc->GetPage(nPageNum->GetAt(i) - 1);
99 if (!pSrcPageDict || !pCurPageDict) 100 if (!pSrcPageDict || !pCurPageDict)
100 return FALSE; 101 return FALSE;
101 102
102 // Clone the page dictionary 103 // Clone the page dictionary
103 FX_POSITION SrcPos = pSrcPageDict->GetStartPos(); 104 FX_POSITION SrcPos = pSrcPageDict->GetStartPos();
104 while (SrcPos) { 105 while (SrcPos) {
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 if (!pSrcDict) 399 if (!pSrcDict)
399 return FALSE; 400 return FALSE;
400 401
401 CPDF_Dictionary* pDstDict = pDstDoc->GetRoot(); 402 CPDF_Dictionary* pDstDict = pDstDoc->GetRoot();
402 if (!pDstDict) 403 if (!pDstDict)
403 return FALSE; 404 return FALSE;
404 405
405 pDstDict->SetAt("ViewerPreferences", pSrcDict->Clone(TRUE)); 406 pDstDict->SetAt("ViewerPreferences", pSrcDict->Clone(TRUE));
406 return TRUE; 407 return TRUE;
407 } 408 }
OLDNEW
« no previous file with comments | « fpdfsdk/src/fpdfformfill.cpp ('k') | fpdfsdk/src/fpdfview.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698