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_ffwidget.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_ffwidget.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffwidget.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index f82f6aba66..74df10ce86 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -34,6 +34,7 @@ #include "xfa/fxfa/parser/cxfa_box.h" #include "xfa/fxfa/parser/cxfa_corner.h" #include "xfa/fxfa/parser/cxfa_edge.h" +#include "xfa/fxfa/parser/cxfa_image.h" #include "xfa/fxfa/parser/cxfa_margin.h" #include "xfa/fxfa/parser/cxfa_node.h" #include "xfa/fxgraphics/cxfa_gecolor.h" @@ -1877,21 +1878,21 @@ FXCODEC_IMAGE_TYPE XFA_GetImageType(const WideString& wsType) { } RetainPtr<CFX_DIBitmap> XFA_LoadImageData(CXFA_FFDoc* pDoc, - CXFA_ImageData* pImageData, + CXFA_Image* pImage, bool& bNameImage, int32_t& iImageXDpi, int32_t& iImageYDpi) { - WideString wsHref = pImageData->GetHref(); - WideString wsImage = pImageData->GetContent(); + WideString wsHref = pImage->GetHref(); + WideString wsImage = pImage->GetContent(); if (wsHref.IsEmpty() && wsImage.IsEmpty()) return nullptr; - FXCODEC_IMAGE_TYPE type = XFA_GetImageType(pImageData->GetContentType()); + FXCODEC_IMAGE_TYPE type = XFA_GetImageType(pImage->GetContentType()); ByteString bsContent; uint8_t* pImageBuffer = nullptr; RetainPtr<IFX_SeekableReadStream> pImageFileRead; if (wsImage.GetLength() > 0) { - XFA_AttributeEnum iEncoding = pImageData->GetTransferEncoding(); + XFA_AttributeEnum iEncoding = pImage->GetTransferEncoding(); if (iEncoding == XFA_AttributeEnum::Base64) { ByteString bsData = wsImage.UTF8Encode(); int32_t iLength = bsData.GetLength(); |