diff options
| author | dsinclair <dsinclair@chromium.org> | 2017-02-14 14:59:30 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-14 14:59:52 +0000 |
| commit | ceb3ab55ca5ad1fae590f50a09f04b7ed47656b1 (patch) | |
| tree | 068a52577d5bb66f64777c5adcf7d25b6961cf4d /core/fpdfapi/page/cpdf_meshstream.h | |
| parent | 92a32db931c1303388158f8a9e045e922d0b8dfa (diff) | |
| download | pdfium-ceb3ab55ca5ad1fae590f50a09f04b7ed47656b1.tar.xz | |
Revert "Cleanup CPDF_MeshStream"
This reverts commit 9787a7441a905e582b10d9ffc425098b3233d36c.
Reason for revert: Reverting chain to see if fixes Chrome roll.
Original change's description:
> Cleanup CPDF_MeshStream
>
> This CL converts the MeshVertex to a point and the TransformPoint to the
> CFX_PointF override.
>
> Change-Id: I3faa5c14cedcf5af6aafca1c566acbc68577cca7
> Reviewed-on: https://pdfium-review.googlesource.com/2610
> Commit-Queue: dsinclair <dsinclair@chromium.org>
> Reviewed-by: Nicolás Peña <npm@chromium.org>
>
TBR=tsepez@chromium.org,dsinclair@chromium.org,npm@chromium.org,caryclark@google.com,pdfium-reviews@googlegroups.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ie1b1dae3ede7581128a81cf7cd86a348c651233b
Reviewed-on: https://pdfium-review.googlesource.com/2695
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_meshstream.h')
| -rw-r--r-- | core/fpdfapi/page/cpdf_meshstream.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/core/fpdfapi/page/cpdf_meshstream.h b/core/fpdfapi/page/cpdf_meshstream.h index 24f1d66cfd..21a6c2fa8c 100644 --- a/core/fpdfapi/page/cpdf_meshstream.h +++ b/core/fpdfapi/page/cpdf_meshstream.h @@ -8,7 +8,6 @@ #define CORE_FPDFAPI_PAGE_CPDF_MESHSTREAM_H_ #include <memory> -#include <tuple> #include <vector> #include "core/fpdfapi/page/cpdf_shadingpattern.h" @@ -16,13 +15,9 @@ #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_system.h" -class CPDF_MeshVertex { - public: - CPDF_MeshVertex(); - CPDF_MeshVertex(const CPDF_MeshVertex&); - ~CPDF_MeshVertex(); - - CFX_PointF position; +struct CPDF_MeshVertex { + FX_FLOAT x; + FX_FLOAT y; FX_FLOAT r; FX_FLOAT g; FX_FLOAT b; @@ -42,14 +37,14 @@ class CPDF_MeshStream { bool Load(); - uint32_t ReadFlag(); - CFX_PointF ReadCoords(); - std::tuple<FX_FLOAT, FX_FLOAT, FX_FLOAT> ReadColor(); + uint32_t GetFlag(); + void GetCoords(FX_FLOAT& x, FX_FLOAT& y); + void GetColor(FX_FLOAT& r, FX_FLOAT& g, FX_FLOAT& b); - CPDF_MeshVertex ReadVertex(const CFX_Matrix& pObject2Bitmap, uint32_t* flag); - bool ReadVertexRow(const CFX_Matrix& pObject2Bitmap, - int count, - CPDF_MeshVertex* vertex); + uint32_t GetVertex(CPDF_MeshVertex& vertex, CFX_Matrix* pObject2Bitmap); + bool GetVertexRow(CPDF_MeshVertex* vertex, + int count, + CFX_Matrix* pObject2Bitmap); CFX_BitStream* BitStream() { return &m_BitStream; } uint32_t ComponentBits() const { return m_nComponentBits; } |