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

Side by Side Diff: fpdfsdk/fpdfeditimg.cpp

Issue 2194393002: Fix a leak with FPDFPageObj_NewImgeObj(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: nit Created 4 years, 4 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 | « core/fpdfapi/fpdf_page/include/cpdf_imageobject.h ('k') | fpdfsdk/fpdfeditimg_unittest.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/fpdf_page/include/cpdf_image.h" 9 #include "core/fpdfapi/fpdf_page/include/cpdf_image.h"
10 #include "core/fpdfapi/fpdf_page/include/cpdf_imageobject.h" 10 #include "core/fpdfapi/fpdf_page/include/cpdf_imageobject.h"
11 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h" 11 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
12 #include "core/fpdfapi/include/cpdf_modulemgr.h" 12 #include "core/fpdfapi/include/cpdf_modulemgr.h"
13 #include "fpdfsdk/include/fsdk_define.h" 13 #include "fpdfsdk/include/fsdk_define.h"
14 14
15 DLLEXPORT FPDF_PAGEOBJECT STDCALL 15 DLLEXPORT FPDF_PAGEOBJECT STDCALL
16 FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) { 16 FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) {
17 CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document); 17 CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document);
18 if (!pDoc) 18 if (!pDoc)
19 return nullptr; 19 return nullptr;
20 20
21 CPDF_ImageObject* pImageObj = new CPDF_ImageObject; 21 CPDF_ImageObject* pImageObj = new CPDF_ImageObject;
22 pImageObj->m_pImage = new CPDF_Image(pDoc); 22 pImageObj->SetOwnedImage(WrapUnique(new CPDF_Image(pDoc)));
23 return pImageObj; 23 return pImageObj;
24 } 24 }
25 25
26 DLLEXPORT FPDF_BOOL STDCALL 26 DLLEXPORT FPDF_BOOL STDCALL
27 FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages, 27 FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages,
28 int nCount, 28 int nCount,
29 FPDF_PAGEOBJECT image_object, 29 FPDF_PAGEOBJECT image_object,
30 FPDF_FILEACCESS* fileAccess) { 30 FPDF_FILEACCESS* fileAccess) {
31 if (!image_object || !fileAccess || !pages) 31 if (!image_object || !fileAccess || !pages)
32 return FALSE; 32 return FALSE;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 pImgObj->m_GeneralState.GetModify(); 76 pImgObj->m_GeneralState.GetModify();
77 for (int index = 0; index < nCount; index++) { 77 for (int index = 0; index < nCount; index++) {
78 CPDF_Page* pPage = CPDFPageFromFPDFPage(pages[index]); 78 CPDF_Page* pPage = CPDFPageFromFPDFPage(pages[index]);
79 if (pPage) 79 if (pPage)
80 pImgObj->GetImage()->ResetCache(pPage, nullptr); 80 pImgObj->GetImage()->ResetCache(pPage, nullptr);
81 } 81 }
82 pImgObj->GetImage()->SetImage(reinterpret_cast<CFX_DIBitmap*>(bitmap), FALSE); 82 pImgObj->GetImage()->SetImage(reinterpret_cast<CFX_DIBitmap*>(bitmap), FALSE);
83 pImgObj->CalcBoundingBox(); 83 pImgObj->CalcBoundingBox();
84 return TRUE; 84 return TRUE;
85 } 85 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_page/include/cpdf_imageobject.h ('k') | fpdfsdk/fpdfeditimg_unittest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698