diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-23 17:21:01 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-24 16:41:29 +0000 |
| commit | 08f4b7762a4453818c76c680f5295986e21418ce (patch) | |
| tree | c6a771759b639180add570f4dd882d103f8efe9c /core/fpdfapi/render/cpdf_dibsource.h | |
| parent | 129b0135adf99be8e2c3015267a4689c6d62dca1 (diff) | |
| download | pdfium-08f4b7762a4453818c76c680f5295986e21418ce.tar.xz | |
Convert to CFX_UnownedPtr, part 4.
Fix strange ownership issue in cpdf_type3char.cpp, and
describe the absolutely insane stuff happening there.
Change-Id: Iae70f9eca8f125ed3ef677729f1776ba9f10183c
Reviewed-on: https://pdfium-review.googlesource.com/5830
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/render/cpdf_dibsource.h')
| -rw-r--r-- | core/fpdfapi/render/cpdf_dibsource.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h index d0730cc4fd..50e9a038e8 100644 --- a/core/fpdfapi/render/cpdf_dibsource.h +++ b/core/fpdfapi/render/cpdf_dibsource.h @@ -18,6 +18,8 @@ #include "core/fpdfapi/render/cpdf_imageloader.h" #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" +#include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxge/cfx_defaultrenderdevice.h" #include "core/fxge/cfx_renderdevice.h" @@ -119,10 +121,10 @@ class CPDF_DIBSource : public CFX_DIBSource { int clip_width) const; bool TransMask() const; - CPDF_Document* m_pDocument; - const CPDF_Stream* m_pStream; + CFX_UnownedPtr<CPDF_Document> m_pDocument; + CFX_UnownedPtr<const CPDF_Stream> m_pStream; + CFX_UnownedPtr<const CPDF_Dictionary> m_pDict; CFX_RetainPtr<CPDF_StreamAcc> m_pStreamAcc; - const CPDF_Dictionary* m_pDict; CPDF_ColorSpace* m_pColorSpace; uint32_t m_Family; uint32_t m_bpc; @@ -145,7 +147,7 @@ class CPDF_DIBSource : public CFX_DIBSource { CFX_RetainPtr<CPDF_StreamAcc> m_pGlobalStream; std::unique_ptr<CCodec_ScanlineDecoder> m_pDecoder; std::unique_ptr<CCodec_Jbig2Context> m_pJbig2Context; - CPDF_Stream* m_pMaskStream; + CFX_UnownedPtr<CPDF_Stream> m_pMaskStream; int m_Status; }; |