| Index: core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp
|
| diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp
|
| index fe5665d1fb8119da8662ddd66e8ba95d221b3140..5df664312ce3ca7a44900d19c815d1a794dccb60 100644
|
| --- a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp
|
| +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp
|
| @@ -147,32 +147,32 @@ CPDF_DocPageData::~CPDF_DocPageData()
|
| {
|
| Clear(FALSE);
|
| Clear(TRUE);
|
| - FX_POSITION pos = m_PatternMap.GetStartPosition();
|
| - while (pos)
|
| - {
|
| - CPDF_Object* ptObj;
|
| - CPDF_CountedObject<CPDF_Pattern*>* ptData;
|
| - m_PatternMap.GetNextAssoc(pos, ptObj, ptData);
|
| - delete ptData;
|
| - }
|
| - m_PatternMap.RemoveAll();
|
| - pos = m_FontMap.GetStartPosition();
|
| - while (pos)
|
| - {
|
| - CPDF_Dictionary* fontDict;
|
| - CPDF_CountedObject<CPDF_Font*>* fontData;
|
| - m_FontMap.GetNextAssoc(pos, fontDict, fontData);
|
| - delete fontData;
|
| - }
|
| - m_FontMap.RemoveAll();
|
| - pos = m_ColorSpaceMap.GetStartPosition();
|
| - while (pos)
|
| - {
|
| - CPDF_Object* csKey;
|
| - CPDF_CountedObject<CPDF_ColorSpace*>* csData;
|
| - m_ColorSpaceMap.GetNextAssoc(pos, csKey, csData);
|
| - delete csData;
|
| - }
|
| + FX_POSITION pos = m_PatternMap.GetStartPosition();
|
| + while (pos)
|
| + {
|
| + CPDF_Object* ptObj;
|
| + CPDF_CountedObject<CPDF_Pattern*>* ptData;
|
| + m_PatternMap.GetNextAssoc(pos, ptObj, ptData);
|
| + delete ptData;
|
| + }
|
| + m_PatternMap.RemoveAll();
|
| + pos = m_FontMap.GetStartPosition();
|
| + while (pos)
|
| + {
|
| + CPDF_Dictionary* fontDict;
|
| + CPDF_CountedObject<CPDF_Font*>* fontData;
|
| + m_FontMap.GetNextAssoc(pos, fontDict, fontData);
|
| + delete fontData;
|
| + }
|
| + m_FontMap.RemoveAll();
|
| + pos = m_ColorSpaceMap.GetStartPosition();
|
| + while (pos)
|
| + {
|
| + CPDF_Object* csKey;
|
| + CPDF_CountedObject<CPDF_ColorSpace*>* csData;
|
| + m_ColorSpaceMap.GetNextAssoc(pos, csKey, csData);
|
| + delete csData;
|
| + }
|
| m_ColorSpaceMap.RemoveAll();
|
| }
|
| void CPDF_DocPageData::Clear(FX_BOOL bForceRelease)
|
| @@ -673,24 +673,24 @@ void CPDF_DocPageData::ReleaseFontFileStreamAcc(CPDF_Stream* pFontStream, FX_BOO
|
| return;
|
| }
|
| PDF_DocPageData_Release<CPDF_Stream*, CPDF_StreamAcc*>(m_FontFileMap, pFontStream, NULL, bForce);
|
| -}
|
| -CPDF_CountedColorSpace* CPDF_DocPageData::FindColorSpacePtr(CPDF_Object* pCSObj) const
|
| -{
|
| - if (!pCSObj) return NULL;
|
| - CPDF_CountedObject<CPDF_ColorSpace*>* csData;
|
| - if (m_ColorSpaceMap.Lookup(pCSObj, csData))
|
| - {
|
| - return csData;
|
| - }
|
| - return NULL;
|
| -}
|
| -CPDF_CountedPattern* CPDF_DocPageData::FindPatternPtr(CPDF_Object* pPatternObj) const
|
| -{
|
| - if (!pPatternObj) return NULL;
|
| - CPDF_CountedObject<CPDF_Pattern*>* ptData;
|
| - if (m_PatternMap.Lookup(pPatternObj, ptData))
|
| - {
|
| - return ptData;
|
| - }
|
| - return NULL;
|
| -}
|
| +}
|
| +CPDF_CountedColorSpace* CPDF_DocPageData::FindColorSpacePtr(CPDF_Object* pCSObj) const
|
| +{
|
| + if (!pCSObj) return NULL;
|
| + CPDF_CountedObject<CPDF_ColorSpace*>* csData;
|
| + if (m_ColorSpaceMap.Lookup(pCSObj, csData))
|
| + {
|
| + return csData;
|
| + }
|
| + return NULL;
|
| +}
|
| +CPDF_CountedPattern* CPDF_DocPageData::FindPatternPtr(CPDF_Object* pPatternObj) const
|
| +{
|
| + if (!pPatternObj) return NULL;
|
| + CPDF_CountedObject<CPDF_Pattern*>* ptData;
|
| + if (m_PatternMap.Lookup(pPatternObj, ptData))
|
| + {
|
| + return ptData;
|
| + }
|
| + return NULL;
|
| +}
|
|
|