diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-31 17:10:34 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-01 02:37:29 +0000 |
| commit | 7d4f6a89d7e2c5d13b7d630d6348950044a5465e (patch) | |
| tree | 3e0d95ba83fb471ef6d5a9cfde5a4d8bfd103471 /core/fpdfapi/page/cpdf_image.h | |
| parent | 984f1d877ac59315f4c070b1d63c9f651221760b (diff) | |
| download | pdfium-chromium/3061.tar.xz | |
Refcount CPDF_Image all the time.chromium/3061chromium/3060
Remove the old externally-counted CPDF_CountedImage type.
Change-Id: Ia0b288586272da3f2daf7dfc153f08e62794321a
Reviewed-on: https://pdfium-review.googlesource.com/3553
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_image.h')
| -rw-r--r-- | core/fpdfapi/page/cpdf_image.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h index 5b737e67b9..7b7e090b49 100644 --- a/core/fpdfapi/page/cpdf_image.h +++ b/core/fpdfapi/page/cpdf_image.h @@ -11,6 +11,7 @@ #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fxcrt/cfx_maybe_owned.h" +#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_system.h" class CFX_DIBSource; @@ -20,12 +21,10 @@ class CPDF_Page; class IFX_Pause; class IFX_SeekableReadStream; -class CPDF_Image { +class CPDF_Image : public CFX_Retainable { public: - explicit CPDF_Image(CPDF_Document* pDoc); - CPDF_Image(CPDF_Document* pDoc, std::unique_ptr<CPDF_Stream> pStream); - CPDF_Image(CPDF_Document* pDoc, uint32_t dwStreamObjNum); - ~CPDF_Image(); + template <typename T, typename... Args> + friend CFX_RetainPtr<T> pdfium::MakeRetain(Args&&... args); void ConvertStreamToIndirectObject(); @@ -66,6 +65,11 @@ class CPDF_Image { uint32_t m_MatteColor = 0; private: + explicit CPDF_Image(CPDF_Document* pDoc); + CPDF_Image(CPDF_Document* pDoc, std::unique_ptr<CPDF_Stream> pStream); + CPDF_Image(CPDF_Document* pDoc, uint32_t dwStreamObjNum); + ~CPDF_Image() override; + void FinishInitialization(); std::unique_ptr<CPDF_Dictionary> InitJPEG(uint8_t* pData, uint32_t size); |