diff options
| author | tsepez <tsepez@chromium.org> | 2016-10-11 13:42:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-11 13:42:12 -0700 |
| commit | ab36e73c8c5409fa262d4fa2faffe65c8804a792 (patch) | |
| tree | 6a454e2cabb89698f2b05fed0e301eba414b2621 /core/fpdfapi/page | |
| parent | a91b8d395ac8f6aed38cccfda1f38de11dd45bdd (diff) | |
| download | pdfium-ab36e73c8c5409fa262d4fa2faffe65c8804a792.tar.xz | |
Add CPDF_Object::IsInline()
Prevent having to remember what an object number of 0 implies.
Review-Url: https://codereview.chromium.org/2412673002
Diffstat (limited to 'core/fpdfapi/page')
| -rw-r--r-- | core/fpdfapi/page/cpdf_image.cpp | 2 | ||||
| -rw-r--r-- | core/fpdfapi/page/fpdf_page_parser.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp index 64d0114eb9..29d10e1d6b 100644 --- a/core/fpdfapi/page/cpdf_image.cpp +++ b/core/fpdfapi/page/cpdf_image.cpp @@ -63,7 +63,7 @@ CPDF_Image::~CPDF_Image() { } CPDF_Image* CPDF_Image::Clone() { - if (m_pStream->GetObjNum()) + if (!m_pStream->IsInline()) return m_pDocument->GetPageData()->GetImage(m_pStream); CPDF_Image* pImage = diff --git a/core/fpdfapi/page/fpdf_page_parser.cpp b/core/fpdfapi/page/fpdf_page_parser.cpp index 60cb3b4bfa..a55fa23bef 100644 --- a/core/fpdfapi/page/fpdf_page_parser.cpp +++ b/core/fpdfapi/page/fpdf_page_parser.cpp @@ -613,7 +613,7 @@ void CPDF_StreamContentParser::Handle_BeginImage() { CFX_ByteString name = pCSObj->GetString(); if (name != "DeviceRGB" && name != "DeviceGray" && name != "DeviceCMYK") { pCSObj = FindResourceObj("ColorSpace", name); - if (pCSObj && !pCSObj->GetObjNum()) { + if (pCSObj && pCSObj->IsInline()) { pCSObj = pCSObj->Clone(); pDict->SetFor("ColorSpace", pCSObj); } @@ -773,7 +773,7 @@ CPDF_ImageObject* CPDF_StreamContentParser::AddImage(CPDF_Stream* pStream, if (pImage) { pImageObj->SetUnownedImage( m_pDocument->GetPageData()->GetImage(pImage->GetStream())); - } else if (pStream->GetObjNum()) { + } else if (!pStream->IsInline()) { pImageObj->SetUnownedImage(m_pDocument->LoadImageF(pStream)); } else { pImageObj->SetOwnedImage( |