diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-25 12:03:18 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-25 19:16:31 +0000 |
| commit | 797ca5cad52edde7c65da45a15216f20b1bfd8fd (patch) | |
| tree | 811a96d5f505e7cff89395cea7dff89604fc9133 /core/fpdfapi/page/cpdf_iccprofile.h | |
| parent | 3a4c408554f2f2ffb5a143f6dadcdd528fcf106e (diff) | |
| download | pdfium-797ca5cad52edde7c65da45a15216f20b1bfd8fd.tar.xz | |
Mass conversion of all const-lifetime class members
Sed + minimal conversions to compile, including moving some
constructors into the .cpp file. Any that caused ASAN issues
during the tests were omitted rather than trying to resolve
the underlying issue.
Change-Id: I00a421f33b253eb4071ffd9af3f2922c7443b335
Reviewed-on: https://pdfium-review.googlesource.com/5891
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_iccprofile.h')
| -rw-r--r-- | core/fpdfapi/page/cpdf_iccprofile.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/fpdfapi/page/cpdf_iccprofile.h b/core/fpdfapi/page/cpdf_iccprofile.h index 05ac9bf1ba..a0cf744b9c 100644 --- a/core/fpdfapi/page/cpdf_iccprofile.h +++ b/core/fpdfapi/page/cpdf_iccprofile.h @@ -8,6 +8,7 @@ #define CORE_FPDFAPI_PAGE_CPDF_ICCPROFILE_H_ #include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/cfx_unowned_ptr.h" class CPDF_Stream; @@ -16,7 +17,7 @@ class CPDF_IccProfile : public CFX_Retainable { template <typename T, typename... Args> friend CFX_RetainPtr<T> pdfium::MakeRetain(Args&&... args); - CPDF_Stream* GetStream() const { return m_pStream; } + CPDF_Stream* GetStream() const { return m_pStream.Get(); } bool IsValid() const { return IsSRGB() || IsSupported(); } bool IsSRGB() const { return m_bsRGB; } bool IsSupported() const { return !!m_pTransform; } @@ -28,7 +29,7 @@ class CPDF_IccProfile : public CFX_Retainable { ~CPDF_IccProfile() override; const bool m_bsRGB; - CPDF_Stream* const m_pStream; + CFX_UnownedPtr<CPDF_Stream> const m_pStream; void* m_pTransform = nullptr; uint32_t m_nSrcComponents = 0; }; |