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_streamcontentparser.cpp | |
| parent | 984f1d877ac59315f4c070b1d63c9f651221760b (diff) | |
| download | pdfium-7d4f6a89d7e2c5d13b7d630d6348950044a5465e.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_streamcontentparser.cpp')
| -rw-r--r-- | core/fpdfapi/page/cpdf_streamcontentparser.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp index 4c64e13b06..59de3c50cb 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp +++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp @@ -791,23 +791,24 @@ CPDF_ImageObject* CPDF_StreamContentParser::AddImage( return nullptr; auto pImageObj = pdfium::MakeUnique<CPDF_ImageObject>(); - pImageObj->SetOwnedImage( - pdfium::MakeUnique<CPDF_Image>(m_pDocument, std::move(pStream))); + pImageObj->SetImage( + pdfium::MakeRetain<CPDF_Image>(m_pDocument, std::move(pStream))); return AddImageObject(std::move(pImageObj)); } CPDF_ImageObject* CPDF_StreamContentParser::AddImage(uint32_t streamObjNum) { auto pImageObj = pdfium::MakeUnique<CPDF_ImageObject>(); - pImageObj->SetUnownedImage(m_pDocument->LoadImageFromPageData(streamObjNum)); + pImageObj->SetImage(m_pDocument->LoadImageFromPageData(streamObjNum)); return AddImageObject(std::move(pImageObj)); } -CPDF_ImageObject* CPDF_StreamContentParser::AddImage(CPDF_Image* pImage) { +CPDF_ImageObject* CPDF_StreamContentParser::AddImage( + const CFX_RetainPtr<CPDF_Image>& pImage) { if (!pImage) return nullptr; auto pImageObj = pdfium::MakeUnique<CPDF_ImageObject>(); - pImageObj->SetUnownedImage( + pImageObj->SetImage( m_pDocument->GetPageData()->GetImage(pImage->GetStream()->GetObjNum())); return AddImageObject(std::move(pImageObj)); |