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

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

Issue 1252613002: FX_BOOL considered harmful. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Manual edits. Created 5 years, 5 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/fpdfdoc.cpp ('k') | fpdfsdk/src/fpdfeditpage.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 #include "../include/fsdk_define.h" 8 #include "../include/fsdk_define.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 = new CPDF_ImageObject; 15 CPDF_ImageObject* pImageObj = new CPDF_ImageObject;
16 CPDF_Image* pImg = 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 = new CPDF_CustomAccess(fileAccess); 26 IFX_FileRead* pFile = new CPDF_CustomAccess(fileAccess);
27 CPDF_ImageObject* pImgObj = (CPDF_ImageObject*)image_object; 27 CPDF_ImageObject* pImgObj = (CPDF_ImageObject*)image_object;
28 pImgObj->m_GeneralState.GetModify(); 28 pImgObj->m_GeneralState.GetModify();
29 for (int index=0;index<nCount;index++) 29 for (int index=0;index<nCount;index++)
30 { 30 {
31 CPDF_Page* pPage = (CPDF_Page*)pages[index]; 31 CPDF_Page* pPage = (CPDF_Page*)pages[index];
32 pImgObj->m_pImage->ResetCache(pPage,NULL); 32 pImgObj->m_pImage->ResetCache(pPage,NULL);
33 } 33 }
34 pImgObj->m_pImage->SetJpegImage(pFile); 34 pImgObj->m_pImage->SetJpegImage(pFile);
35 35
36 » return TRUE; 36 » return true;
37 } 37 }
38 38
39 39
40 DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_SetMatrix (FPDF_PAGEOBJECT image_o bject, 40 DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_SetMatrix (FPDF_PAGEOBJECT image_o bject,
41 double a, double b, double c, double d, double e, double f) 41 double a, double b, double c, double d, double e, double f)
42 { 42 {
43 if (!image_object) 43 if (!image_object)
44 » » return FALSE; 44 » » return false;
45 CPDF_ImageObject* pImgObj = (CPDF_ImageObject*)image_object; 45 CPDF_ImageObject* pImgObj = (CPDF_ImageObject*)image_object;
46 pImgObj->m_Matrix.a = (FX_FLOAT)a; 46 pImgObj->m_Matrix.a = (FX_FLOAT)a;
47 pImgObj->m_Matrix.b = (FX_FLOAT)b; 47 pImgObj->m_Matrix.b = (FX_FLOAT)b;
48 pImgObj->m_Matrix.c = (FX_FLOAT)c; 48 pImgObj->m_Matrix.c = (FX_FLOAT)c;
49 pImgObj->m_Matrix.d = (FX_FLOAT)d; 49 pImgObj->m_Matrix.d = (FX_FLOAT)d;
50 pImgObj->m_Matrix.e = (FX_FLOAT)e; 50 pImgObj->m_Matrix.e = (FX_FLOAT)e;
51 pImgObj->m_Matrix.f = (FX_FLOAT)f; 51 pImgObj->m_Matrix.f = (FX_FLOAT)f;
52 pImgObj->CalcBoundingBox(); 52 pImgObj->CalcBoundingBox();
53 » return TRUE; 53 » return true;
54 } 54 }
55 55
56 DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_SetBitmap(FPDF_PAGE* pages,int nCount,F PDF_PAGEOBJECT image_object,FPDF_BITMAP bitmap) 56 DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_SetBitmap(FPDF_PAGE* pages,int nCount,F PDF_PAGEOBJECT image_object,FPDF_BITMAP bitmap)
57 { 57 {
58 if (!image_object || !bitmap) 58 if (!image_object || !bitmap)
59 » » return FALSE; 59 » » return false;
60 CFX_DIBitmap* pBmp = NULL; 60 CFX_DIBitmap* pBmp = NULL;
61 pBmp = (CFX_DIBitmap*)bitmap; 61 pBmp = (CFX_DIBitmap*)bitmap;
62 CPDF_ImageObject* pImgObj = (CPDF_ImageObject*)image_object; 62 CPDF_ImageObject* pImgObj = (CPDF_ImageObject*)image_object;
63 pImgObj->m_GeneralState.GetModify(); 63 pImgObj->m_GeneralState.GetModify();
64 for (int index=0;index<nCount;index++) 64 for (int index=0;index<nCount;index++)
65 { 65 {
66 CPDF_Page* pPage = (CPDF_Page*)pages[index]; 66 CPDF_Page* pPage = (CPDF_Page*)pages[index];
67 pImgObj->m_pImage->ResetCache(pPage,NULL); 67 pImgObj->m_pImage->ResetCache(pPage,NULL);
68 } 68 }
69 » pImgObj->m_pImage->SetImage(pBmp,FALSE); 69 » pImgObj->m_pImage->SetImage(pBmp,false);
70 pImgObj->CalcBoundingBox(); 70 pImgObj->CalcBoundingBox();
71 » return TRUE; 71 » return true;
72 } 72 }
73 73
OLDNEW
« no previous file with comments | « fpdfsdk/src/fpdfdoc.cpp ('k') | fpdfsdk/src/fpdfeditpage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698