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

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

Issue 1396283006: Fix layering violation in CPDF_Document::FromFPDFDocument(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 5 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
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 #include "../include/fsdk_define.h" 8 #include "../include/fsdk_define.h"
9 9
10 DLLEXPORT FPDF_PAGEOBJECT STDCALL 10 DLLEXPORT FPDF_PAGEOBJECT STDCALL
11 FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) { 11 FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) {
12 CPDF_Document* pDoc = CPDF_Document::FromFPDFDocument(document); 12 CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document);
13 if (!pDoc) 13 if (!pDoc)
14 return nullptr; 14 return nullptr;
15 CPDF_ImageObject* pImageObj = new CPDF_ImageObject; 15 CPDF_ImageObject* pImageObj = new CPDF_ImageObject;
16 CPDF_Image* pImg = new CPDF_Image(pDoc); 16 CPDF_Image* pImg = new CPDF_Image(pDoc);
17 pImageObj->m_pImage = pImg; 17 pImageObj->m_pImage = pImg;
18 return pImageObj; 18 return pImageObj;
19 } 19 }
20 20
21 DLLEXPORT FPDF_BOOL STDCALL 21 DLLEXPORT FPDF_BOOL STDCALL
22 FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages, 22 FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages,
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 CPDF_ImageObject* pImgObj = (CPDF_ImageObject*)image_object; 69 CPDF_ImageObject* pImgObj = (CPDF_ImageObject*)image_object;
70 pImgObj->m_GeneralState.GetModify(); 70 pImgObj->m_GeneralState.GetModify();
71 for (int index = 0; index < nCount; index++) { 71 for (int index = 0; index < nCount; index++) {
72 CPDF_Page* pPage = (CPDF_Page*)pages[index]; 72 CPDF_Page* pPage = (CPDF_Page*)pages[index];
73 pImgObj->m_pImage->ResetCache(pPage, NULL); 73 pImgObj->m_pImage->ResetCache(pPage, NULL);
74 } 74 }
75 pImgObj->m_pImage->SetImage(pBmp, FALSE); 75 pImgObj->m_pImage->SetImage(pBmp, FALSE);
76 pImgObj->CalcBoundingBox(); 76 pImgObj->CalcBoundingBox();
77 return TRUE; 77 return TRUE;
78 } 78 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698