diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-14 20:09:43 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-14 20:09:43 +0000 |
| commit | 0821c95ee9f132f77f3670a7dbbf114a82a6b9a0 (patch) | |
| tree | fd736c2764ee7b1e187995548a608ed431601ac7 /xfa/fxfa/cxfa_ffimage.cpp | |
| parent | dcbb8e53e604178dc97d12846ddbdef88be41297 (diff) | |
| download | pdfium-0821c95ee9f132f77f3670a7dbbf114a82a6b9a0.tar.xz | |
Fold CXFA_ValueData into CXFA_Value
The CXFA_ValueData class is a thin wrapper around the CXFA_Value, this
CL moves the methods from CXFA_ValueData into CXFA_Value.
Change-Id: I2c57e93e5c4675b82af71cf75f2dfc0fb12e4b20
Reviewed-on: https://pdfium-review.googlesource.com/21170
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffimage.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffimage.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xfa/fxfa/cxfa_ffimage.cpp b/xfa/fxfa/cxfa_ffimage.cpp index 7a94c76a6a..159c6648b5 100644 --- a/xfa/fxfa/cxfa_ffimage.cpp +++ b/xfa/fxfa/cxfa_ffimage.cpp @@ -11,6 +11,7 @@ #include "xfa/fxfa/cxfa_ffdraw.h" #include "xfa/fxfa/cxfa_ffpageview.h" #include "xfa/fxfa/cxfa_ffwidget.h" +#include "xfa/fxfa/parser/cxfa_value.h" CXFA_FFImage::CXFA_FFImage(CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pDataAcc) {} @@ -64,7 +65,10 @@ void CXFA_FFImage::RenderWidget(CXFA_Graphics* pGS, int32_t iImageXDpi = 0; int32_t iImageYDpi = 0; m_pDataAcc->GetImageDpi(iImageXDpi, iImageYDpi); - XFA_DrawImage(pGS, rtImage, mtRotate, pDIBitmap, - m_pDataAcc->GetFormValueData().GetImageData().GetAspect(), + auto* value = m_pDataAcc->GetFormValue(); + CXFA_ImageData imageData = + value ? value->GetImageData() : CXFA_ImageData(nullptr); + + XFA_DrawImage(pGS, rtImage, mtRotate, pDIBitmap, imageData.GetAspect(), iImageXDpi, iImageYDpi, iHorzAlign, iVertAlign); } |