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

Side by Side Diff: xfa/fxfa/app/xfa_ffimage.cpp

Issue 2031873003: Get rid of NULLs in xfa/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@nullptr_fpdfsdk
Patch Set: Created 4 years, 6 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 | « xfa/fxfa/app/xfa_ffimage.h ('k') | xfa/fxfa/app/xfa_ffimageedit.h » ('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 "xfa/fxfa/app/xfa_ffimage.h" 7 #include "xfa/fxfa/app/xfa_ffimage.h"
8 8
9 #include "xfa/fxfa/app/xfa_ffdraw.h" 9 #include "xfa/fxfa/app/xfa_ffdraw.h"
10 #include "xfa/fxfa/include/xfa_ffapp.h" 10 #include "xfa/fxfa/include/xfa_ffapp.h"
11 #include "xfa/fxfa/include/xfa_ffdoc.h" 11 #include "xfa/fxfa/include/xfa_ffdoc.h"
12 #include "xfa/fxfa/include/xfa_ffpageview.h" 12 #include "xfa/fxfa/include/xfa_ffpageview.h"
13 #include "xfa/fxfa/include/xfa_ffwidget.h" 13 #include "xfa/fxfa/include/xfa_ffwidget.h"
14 14
15 CXFA_FFImage::CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) 15 CXFA_FFImage::CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
16 : CXFA_FFDraw(pPageView, pDataAcc) {} 16 : CXFA_FFDraw(pPageView, pDataAcc) {}
17 CXFA_FFImage::~CXFA_FFImage() { 17 CXFA_FFImage::~CXFA_FFImage() {
18 CXFA_FFImage::UnloadWidget(); 18 CXFA_FFImage::UnloadWidget();
19 } 19 }
20 FX_BOOL CXFA_FFImage::IsLoaded() { 20 FX_BOOL CXFA_FFImage::IsLoaded() {
21 return GetDataAcc()->GetImageImage() != NULL; 21 return !!GetDataAcc()->GetImageImage();
22 } 22 }
23 FX_BOOL CXFA_FFImage::LoadWidget() { 23 FX_BOOL CXFA_FFImage::LoadWidget() {
24 if (GetDataAcc()->GetImageImage()) { 24 if (GetDataAcc()->GetImageImage()) {
25 return TRUE; 25 return TRUE;
26 } 26 }
27 GetDataAcc()->LoadImageImage(); 27 GetDataAcc()->LoadImageImage();
28 return CXFA_FFDraw::LoadWidget(); 28 return CXFA_FFDraw::LoadWidget();
29 } 29 }
30 void CXFA_FFImage::UnloadWidget() { 30 void CXFA_FFImage::UnloadWidget() {
31 GetDataAcc()->SetImageImage(NULL); 31 GetDataAcc()->SetImageImage(nullptr);
32 } 32 }
33 void CXFA_FFImage::RenderWidget(CFX_Graphics* pGS, 33 void CXFA_FFImage::RenderWidget(CFX_Graphics* pGS,
34 CFX_Matrix* pMatrix, 34 CFX_Matrix* pMatrix,
35 uint32_t dwStatus, 35 uint32_t dwStatus,
36 int32_t iRotate) { 36 int32_t iRotate) {
37 if (!IsMatchVisibleStatus(dwStatus)) { 37 if (!IsMatchVisibleStatus(dwStatus)) {
38 return; 38 return;
39 } 39 }
40 CFX_Matrix mtRotate; 40 CFX_Matrix mtRotate;
41 GetRotateMatrix(mtRotate); 41 GetRotateMatrix(mtRotate);
(...skipping 16 matching lines...) Expand all
58 CXFA_Value value = m_pDataAcc->GetFormValue(); 58 CXFA_Value value = m_pDataAcc->GetFormValue();
59 CXFA_Image imageObj = value.GetImage(); 59 CXFA_Image imageObj = value.GetImage();
60 int32_t iAspect = imageObj.GetAspect(); 60 int32_t iAspect = imageObj.GetAspect();
61 int32_t iImageXDpi = 0; 61 int32_t iImageXDpi = 0;
62 int32_t iImageYDpi = 0; 62 int32_t iImageYDpi = 0;
63 m_pDataAcc->GetImageDpi(iImageXDpi, iImageYDpi); 63 m_pDataAcc->GetImageDpi(iImageXDpi, iImageYDpi);
64 XFA_DrawImage(pGS, rtImage, &mtRotate, pDIBitmap, iAspect, iImageXDpi, 64 XFA_DrawImage(pGS, rtImage, &mtRotate, pDIBitmap, iAspect, iImageXDpi,
65 iImageYDpi, iHorzAlign, iVertAlign); 65 iImageYDpi, iHorzAlign, iVertAlign);
66 } 66 }
67 } 67 }
OLDNEW
« no previous file with comments | « xfa/fxfa/app/xfa_ffimage.h ('k') | xfa/fxfa/app/xfa_ffimageedit.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698