diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-16 15:49:16 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-16 15:49:16 +0000 |
| commit | 316dd2fcd64d0cda1e1b2cdc39ca541a57766b35 (patch) | |
| tree | af3745a818839a7cebc92927f9e115c429bbbe0b /xfa/fxfa/cxfa_ffimage.cpp | |
| parent | d021ad2f6306ae9d7b2ab5acf225c3bd8e957f8f (diff) | |
| download | pdfium-316dd2fcd64d0cda1e1b2cdc39ca541a57766b35.tar.xz | |
Rename CXFA_Value methods for clarity
This CL marks the methods in CXFA_Value to make it clear which can
return nullptr and updates callsites as needed.
Change-Id: If1f794bcbbddaa57a1efdd67195df58a77b4373a
Reviewed-on: https://pdfium-review.googlesource.com/22773
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffimage.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffimage.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xfa/fxfa/cxfa_ffimage.cpp b/xfa/fxfa/cxfa_ffimage.cpp index 3a5a63a1e4..b4a0d32981 100644 --- a/xfa/fxfa/cxfa_ffimage.cpp +++ b/xfa/fxfa/cxfa_ffimage.cpp @@ -70,8 +70,11 @@ void CXFA_FFImage::RenderWidget(CXFA_Graphics* pGS, int32_t iImageXDpi = 0; int32_t iImageYDpi = 0; m_pNode->GetWidgetAcc()->GetImageDpi(iImageXDpi, iImageYDpi); + auto* value = m_pNode->GetFormValueIfExists(); - CXFA_Image* image = value ? value->GetImage() : nullptr; - XFA_DrawImage(pGS, rtImage, mtRotate, pDIBitmap, image->GetAspect(), - iImageXDpi, iImageYDpi, iHorzAlign, iVertAlign); + CXFA_Image* image = value ? value->GetImageIfExists() : nullptr; + if (image) { + XFA_DrawImage(pGS, rtImage, mtRotate, pDIBitmap, image->GetAspect(), + iImageXDpi, iImageYDpi, iHorzAlign, iVertAlign); + } } |