Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Side by Side Diff: core/fpdfapi/fpdf_page/pageint.h

Issue 2003873002: Fix infinite recursion in CPDF_DocPageData::GetColorSpace(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #ifndef CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_ 7 #ifndef CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
8 #define CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_ 8 #define CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <unordered_map> 12 #include <unordered_map>
13 #include <set>
13 #include <vector> 14 #include <vector>
14 15
15 #include "core/fpdfapi/fpdf_page/cpdf_contentmark.h" 16 #include "core/fpdfapi/fpdf_page/cpdf_contentmark.h"
16 #include "core/fpdfapi/fpdf_page/cpdf_countedobject.h" 17 #include "core/fpdfapi/fpdf_page/cpdf_countedobject.h"
17 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h" 18 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h"
18 #include "core/fxge/include/fx_ge.h" 19 #include "core/fxge/include/fx_ge.h"
19 20
20 class CPDF_AllStates; 21 class CPDF_AllStates;
21 class CPDF_ColorSpace; 22 class CPDF_ColorSpace;
22 class CPDF_ExpIntFunc; 23 class CPDF_ExpIntFunc;
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 using CPDF_CountedImage = CPDF_CountedObject<CPDF_Image>; 350 using CPDF_CountedImage = CPDF_CountedObject<CPDF_Image>;
350 using CPDF_CountedStreamAcc = CPDF_CountedObject<CPDF_StreamAcc>; 351 using CPDF_CountedStreamAcc = CPDF_CountedObject<CPDF_StreamAcc>;
351 352
352 using CPDF_ColorSpaceMap = std::map<CPDF_Object*, CPDF_CountedColorSpace*>; 353 using CPDF_ColorSpaceMap = std::map<CPDF_Object*, CPDF_CountedColorSpace*>;
353 using CPDF_FontFileMap = std::map<CPDF_Stream*, CPDF_CountedStreamAcc*>; 354 using CPDF_FontFileMap = std::map<CPDF_Stream*, CPDF_CountedStreamAcc*>;
354 using CPDF_FontMap = std::map<CPDF_Dictionary*, CPDF_CountedFont*>; 355 using CPDF_FontMap = std::map<CPDF_Dictionary*, CPDF_CountedFont*>;
355 using CPDF_IccProfileMap = std::map<CPDF_Stream*, CPDF_CountedIccProfile*>; 356 using CPDF_IccProfileMap = std::map<CPDF_Stream*, CPDF_CountedIccProfile*>;
356 using CPDF_ImageMap = std::map<uint32_t, CPDF_CountedImage*>; 357 using CPDF_ImageMap = std::map<uint32_t, CPDF_CountedImage*>;
357 using CPDF_PatternMap = std::map<CPDF_Object*, CPDF_CountedPattern*>; 358 using CPDF_PatternMap = std::map<CPDF_Object*, CPDF_CountedPattern*>;
358 359
360 CPDF_ColorSpace* GetColorSpaceImpl(CPDF_Object* pCSObj,
361 const CPDF_Dictionary* pResources,
362 std::set<CPDF_Object*>* pVisited);
363
359 CPDF_Document* const m_pPDFDoc; 364 CPDF_Document* const m_pPDFDoc;
360 FX_BOOL m_bForceClear; 365 FX_BOOL m_bForceClear;
361 std::map<CFX_ByteString, CPDF_Stream*> m_HashProfileMap; 366 std::map<CFX_ByteString, CPDF_Stream*> m_HashProfileMap;
362 CPDF_ColorSpaceMap m_ColorSpaceMap; 367 CPDF_ColorSpaceMap m_ColorSpaceMap;
363 CPDF_FontFileMap m_FontFileMap; 368 CPDF_FontFileMap m_FontFileMap;
364 CPDF_FontMap m_FontMap; 369 CPDF_FontMap m_FontMap;
365 CPDF_IccProfileMap m_IccProfileMap; 370 CPDF_IccProfileMap m_IccProfileMap;
366 CPDF_ImageMap m_ImageMap; 371 CPDF_ImageMap m_ImageMap;
367 CPDF_PatternMap m_PatternMap; 372 CPDF_PatternMap m_PatternMap;
368 }; 373 };
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 }; 553 };
549 554
550 CFX_ByteStringC PDF_FindKeyAbbreviationForTesting(const CFX_ByteStringC& abbr); 555 CFX_ByteStringC PDF_FindKeyAbbreviationForTesting(const CFX_ByteStringC& abbr);
551 CFX_ByteStringC PDF_FindValueAbbreviationForTesting( 556 CFX_ByteStringC PDF_FindValueAbbreviationForTesting(
552 const CFX_ByteStringC& abbr); 557 const CFX_ByteStringC& abbr);
553 558
554 void PDF_ReplaceAbbr(CPDF_Object* pObj); 559 void PDF_ReplaceAbbr(CPDF_Object* pObj);
555 bool IsPathOperator(const uint8_t* buf, size_t len); 560 bool IsPathOperator(const uint8_t* buf, size_t len);
556 561
557 #endif // CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_ 562 #endif // CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698