| OLD | NEW |
| 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 "../include/fsdk_define.h" | 7 #include "../include/fsdk_define.h" |
| 8 #include "../include/fpdfedit.h" | 8 #include "../include/fpdfedit.h" |
| 9 | 9 |
| 10 | 10 |
| 11 DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) | 11 DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) |
| 12 { | 12 { |
| 13 if (!document) | 13 if (!document) |
| 14 return NULL; | 14 return NULL; |
| 15 » CPDF_ImageObject* pImageObj = FX_NEW CPDF_ImageObject; | 15 » CPDF_ImageObject* pImageObj = new CPDF_ImageObject; |
| 16 » CPDF_Image* pImg = FX_NEW CPDF_Image((CPDF_Document *)document); | 16 » CPDF_Image* pImg = new CPDF_Image((CPDF_Document *)document); |
| 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 FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages, int nCou
nt,FPDF_PAGEOBJECT image_object, FPDF_FILEACCESS* fileAccess) | 21 DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages, int nCou
nt,FPDF_PAGEOBJECT image_object, FPDF_FILEACCESS* fileAccess) |
| 22 { | 22 { |
| 23 if (!image_object || !fileAccess) | 23 if (!image_object || !fileAccess) |
| 24 return FALSE; | 24 return FALSE; |
| 25 | 25 |
| 26 » IFX_FileRead* pFile = FX_NEW CPDF_CustomAccess(fileAccess); | 26 » IFX_FileRead* pFile = new CPDF_CustomAccess(fileAccess); |
| 27 | |
| 28 CPDF_ImageObject* pImgObj = (CPDF_ImageObject*)image_object; | 27 CPDF_ImageObject* pImgObj = (CPDF_ImageObject*)image_object; |
| 29 pImgObj->m_GeneralState.GetModify(); | 28 pImgObj->m_GeneralState.GetModify(); |
| 30 for (int index=0;index<nCount;index++) | 29 for (int index=0;index<nCount;index++) |
| 31 { | 30 { |
| 32 CPDF_Page* pPage = (CPDF_Page*)pages[index]; | 31 CPDF_Page* pPage = (CPDF_Page*)pages[index]; |
| 33 pImgObj->m_pImage->ResetCache(pPage,NULL); | 32 pImgObj->m_pImage->ResetCache(pPage,NULL); |
| 34 } | 33 } |
| 35 pImgObj->m_pImage->SetJpegImage(pFile); | 34 pImgObj->m_pImage->SetJpegImage(pFile); |
| 36 | 35 |
| 37 return TRUE; | 36 return TRUE; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 65 for (int index=0;index<nCount;index++) | 64 for (int index=0;index<nCount;index++) |
| 66 { | 65 { |
| 67 CPDF_Page* pPage = (CPDF_Page*)pages[index]; | 66 CPDF_Page* pPage = (CPDF_Page*)pages[index]; |
| 68 pImgObj->m_pImage->ResetCache(pPage,NULL); | 67 pImgObj->m_pImage->ResetCache(pPage,NULL); |
| 69 } | 68 } |
| 70 pImgObj->m_pImage->SetImage(pBmp,FALSE); | 69 pImgObj->m_pImage->SetImage(pBmp,FALSE); |
| 71 pImgObj->CalcBoundingBox(); | 70 pImgObj->CalcBoundingBox(); |
| 72 return TRUE; | 71 return TRUE; |
| 73 } | 72 } |
| 74 | 73 |
| OLD | NEW |