From 0a0892626d24ce82e7026c32c71b1de036d4bbe1 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 10 May 2017 14:00:53 -0700 Subject: Replace operator bool with HasRef() in classes with a CFX_SharedCopyOnWrite member. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I51e30d298e87b9ae0d5aca83b2f1d6787efce70a Reviewed-on: https://pdfium-review.googlesource.com/5290 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez Reviewed-by: Nicolás Peña --- core/fpdftext/cpdf_textpage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/fpdftext') diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp index c64b8e17ae..5a39281183 100644 --- a/core/fpdftext/cpdf_textpage.cpp +++ b/core/fpdftext/cpdf_textpage.cpp @@ -800,7 +800,7 @@ void CPDF_TextPage::ProcessTextObject( FPDFText_MarkedContent CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj) { CPDF_TextObject* pTextObj = Obj.m_pTextObj; - if (!pTextObj->m_ContentMark) + if (!pTextObj->m_ContentMark.HasRef()) return FPDFText_MarkedContent::Pass; int nContentMark = pTextObj->m_ContentMark.CountItems(); @@ -825,7 +825,7 @@ FPDFText_MarkedContent CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj) { if (!bExist) return FPDFText_MarkedContent::Pass; - if (m_pPreTextObj && m_pPreTextObj->m_ContentMark && + if (m_pPreTextObj && m_pPreTextObj->m_ContentMark.HasRef() && m_pPreTextObj->m_ContentMark.CountItems() == n && pDict == m_pPreTextObj->m_ContentMark.GetItem(n - 1).GetParam()) { return FPDFText_MarkedContent::Done; @@ -863,7 +863,7 @@ FPDFText_MarkedContent CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj) { void CPDF_TextPage::ProcessMarkedContent(PDFTEXT_Obj Obj) { CPDF_TextObject* pTextObj = Obj.m_pTextObj; - if (!pTextObj->m_ContentMark) + if (!pTextObj->m_ContentMark.HasRef()) return; int nContentMark = pTextObj->m_ContentMark.CountItems(); -- cgit v1.2.3