core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp - Issue 1541703003: Use std::map as CPDF_Dictionary's underlying store.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp

Issue 1541703003: Use std::map as CPDF_Dictionary's underlying store. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: XFA still uses CFX_CMapByteStringToPtr :( Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp

diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp

index c9eee8e380838de182e960a96f187d3b5b082278..1f2a36ca09581c0ae2089681081ceb39dc85b9c9 100644

--- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp

+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp

@@ -1214,10 +1214,8 @@ CPDF_ColorSpace* CPDF_ColorSpace::Load(CPDF_Document* pDoc, CPDF_Object* pObj) {

return nullptr;

CPDF_ColorSpace* pRet = nullptr;

- FX_POSITION pos = pDict->GetStartPos();

- while (pos) {

- CFX_ByteString bsKey;

- CPDF_Object* pValue = pDict->GetNextElement(pos, bsKey);

+ for (const auto& it : *pDict) {

+ CPDF_Object* pValue = it.second;

if (ToName(pValue))

pRet = _CSFromName(pValue->GetString());

if (pRet)