diff options
| author | thestig <thestig@chromium.org> | 2016-05-23 14:56:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-23 14:56:02 -0700 |
| commit | 490d6128e6faef423fa6f965f792513e138bc04a (patch) | |
| tree | c9e3ea73ae672b0861c92a188a9b84e808d827ea /core/fpdfapi/fpdf_page/cpdf_meshstream.h | |
| parent | 109975b30dbb2b047001a840b8a1e77434fce7b3 (diff) | |
| download | pdfium-chromium/2748.tar.xz | |
Make CPDF_Function::Load() return an unique_ptr.chromium/2750chromium/2749chromium/2748
Review-Url: https://codereview.chromium.org/2000973002
Diffstat (limited to 'core/fpdfapi/fpdf_page/cpdf_meshstream.h')
| -rw-r--r-- | core/fpdfapi/fpdf_page/cpdf_meshstream.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/core/fpdfapi/fpdf_page/cpdf_meshstream.h b/core/fpdfapi/fpdf_page/cpdf_meshstream.h index 462dcf09c7..e5d37fe36b 100644 --- a/core/fpdfapi/fpdf_page/cpdf_meshstream.h +++ b/core/fpdfapi/fpdf_page/cpdf_meshstream.h @@ -7,6 +7,9 @@ #ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_MESHSTREAM_H_ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_MESHSTREAM_H_ +#include <memory> +#include <vector> + #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" #include "core/fxcrt/include/fx_basic.h" #include "core/fxcrt/include/fx_system.h" @@ -26,11 +29,10 @@ class CPDF_Stream; class CPDF_MeshStream { public: - FX_BOOL Load(CPDF_Stream* pShadingStream, - CPDF_Function** pFuncs, - int nFuncs, - CPDF_ColorSpace* pCS); + CPDF_MeshStream(const std::vector<std::unique_ptr<CPDF_Function>>& funcs, + CPDF_ColorSpace* pCS); + bool Load(CPDF_Stream* pShadingStream); uint32_t GetFlag(); void GetCoords(FX_FLOAT& x, FX_FLOAT& y); @@ -41,9 +43,15 @@ class CPDF_MeshStream { int count, CFX_Matrix* pObject2Bitmap); - CPDF_Function** m_pFuncs; - CPDF_ColorSpace* m_pCS; - uint32_t m_nFuncs; + CFX_BitStream* BitStream() { return &m_BitStream; } + uint32_t CoordBits() const { return m_nCoordBits; } + uint32_t CompBits() const { return m_nCompBits; } + uint32_t FlagBits() const { return m_nFlagBits; } + uint32_t comps() const { return m_nComps; } + + private: + const std::vector<std::unique_ptr<CPDF_Function>>& m_funcs; + CPDF_ColorSpace* const m_pCS; uint32_t m_nCoordBits; uint32_t m_nCompBits; uint32_t m_nFlagBits; |