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

Side by Side Diff: fpdfsdk/fpdfeditimg.cpp

Issue 2386273004: Add ptr_util.h from base until std::make_unique<> available (Closed)
Patch Set: 2016 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 | « fpdfsdk/fpdfdoc_unittest.cpp ('k') | fpdfsdk/fpdfformfill.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_edit.h" 7 #include "public/fpdf_edit.h"
8 8
9 #include "core/fpdfapi/cpdf_modulemgr.h" 9 #include "core/fpdfapi/cpdf_modulemgr.h"
10 #include "core/fpdfapi/fpdf_page/cpdf_image.h" 10 #include "core/fpdfapi/fpdf_page/cpdf_image.h"
11 #include "core/fpdfapi/fpdf_page/cpdf_imageobject.h" 11 #include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
12 #include "core/fpdfapi/fpdf_page/cpdf_pageobject.h" 12 #include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
13 #include "fpdfsdk/fsdk_define.h" 13 #include "fpdfsdk/fsdk_define.h"
14 #include "third_party/base/ptr_util.h"
14 15
15 DLLEXPORT FPDF_PAGEOBJECT STDCALL 16 DLLEXPORT FPDF_PAGEOBJECT STDCALL
16 FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) { 17 FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) {
17 CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document); 18 CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document);
18 if (!pDoc) 19 if (!pDoc)
19 return nullptr; 20 return nullptr;
20 21
21 CPDF_ImageObject* pImageObj = new CPDF_ImageObject; 22 CPDF_ImageObject* pImageObj = new CPDF_ImageObject;
22 pImageObj->SetOwnedImage(WrapUnique(new CPDF_Image(pDoc))); 23 pImageObj->SetOwnedImage(pdfium::MakeUnique<CPDF_Image>(pDoc));
23 return pImageObj; 24 return pImageObj;
24 } 25 }
25 26
26 DLLEXPORT FPDF_BOOL STDCALL 27 DLLEXPORT FPDF_BOOL STDCALL
27 FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages, 28 FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages,
28 int nCount, 29 int nCount,
29 FPDF_PAGEOBJECT image_object, 30 FPDF_PAGEOBJECT image_object,
30 FPDF_FILEACCESS* fileAccess) { 31 FPDF_FILEACCESS* fileAccess) {
31 if (!image_object || !fileAccess || !pages) 32 if (!image_object || !fileAccess || !pages)
32 return FALSE; 33 return FALSE;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 CPDF_ImageObject* pImgObj = reinterpret_cast<CPDF_ImageObject*>(image_object); 75 CPDF_ImageObject* pImgObj = reinterpret_cast<CPDF_ImageObject*>(image_object);
75 for (int index = 0; index < nCount; index++) { 76 for (int index = 0; index < nCount; index++) {
76 CPDF_Page* pPage = CPDFPageFromFPDFPage(pages[index]); 77 CPDF_Page* pPage = CPDFPageFromFPDFPage(pages[index]);
77 if (pPage) 78 if (pPage)
78 pImgObj->GetImage()->ResetCache(pPage, nullptr); 79 pImgObj->GetImage()->ResetCache(pPage, nullptr);
79 } 80 }
80 pImgObj->GetImage()->SetImage(reinterpret_cast<CFX_DIBitmap*>(bitmap), FALSE); 81 pImgObj->GetImage()->SetImage(reinterpret_cast<CFX_DIBitmap*>(bitmap), FALSE);
81 pImgObj->CalcBoundingBox(); 82 pImgObj->CalcBoundingBox();
82 return TRUE; 83 return TRUE;
83 } 84 }
OLDNEW
« no previous file with comments | « fpdfsdk/fpdfdoc_unittest.cpp ('k') | fpdfsdk/fpdfformfill.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698