diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-03 16:23:03 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-03 21:50:51 +0000 |
| commit | 8afa22d5701a6c47b3f34267a2c52948efc3d301 (patch) | |
| tree | eaa6e06fe2abb5c7cf09c3bd01e1ab89b5909b1f /xfa/fxfa/cxfa_ffimage.cpp | |
| parent | 4f88617ad2a4d352af87b95c2f7293d12e7bd2c8 (diff) | |
| download | pdfium-8afa22d5701a6c47b3f34267a2c52948efc3d301.tar.xz | |
Fold CXFA_ImageData into CXFA_Image
This CL folds the CXFA_ImageData wrapper into CXFA_Image.
Change-Id: I36596abc4dff7d17dc6ee13a857a084f41164c7a
Reviewed-on: https://pdfium-review.googlesource.com/22190
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffimage.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffimage.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xfa/fxfa/cxfa_ffimage.cpp b/xfa/fxfa/cxfa_ffimage.cpp index c37234c686..a285ac907d 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_image.h" #include "xfa/fxfa/parser/cxfa_para.h" #include "xfa/fxfa/parser/cxfa_value.h" @@ -67,9 +68,7 @@ void CXFA_FFImage::RenderWidget(CXFA_Graphics* pGS, int32_t iImageYDpi = 0; m_pDataAcc->GetImageDpi(iImageXDpi, iImageYDpi); auto* value = m_pDataAcc->GetFormValue(); - CXFA_ImageData imageData = - value ? value->GetImageData() : CXFA_ImageData(nullptr); - - XFA_DrawImage(pGS, rtImage, mtRotate, pDIBitmap, imageData.GetAspect(), + CXFA_Image* image = value ? value->GetImage() : nullptr; + XFA_DrawImage(pGS, rtImage, mtRotate, pDIBitmap, image->GetAspect(), iImageXDpi, iImageYDpi, iHorzAlign, iVertAlign); } |