fpdfsdk/src/fpdfppo.cpp - Issue 1417033004: Merge to XFA: Add type cast definitions for CPDF_Name.

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: fpdfsdk/src/fpdfppo.cpp

Issue 1417033004: Merge to XFA: Add type cast definitions for CPDF_Name. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 years, 2 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:

Index: fpdfsdk/src/fpdfppo.cpp

diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp

index 6521258485b5ec3b9b6b66fc1bcf0709879b2102..c37ecca4906f68aa071f25216f39c96a95aef639 100644

--- a/fpdfsdk/src/fpdfppo.cpp

+++ b/fpdfsdk/src/fpdfppo.cpp

@@ -186,9 +186,8 @@ CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag(

return NULL;

CPDF_Object* pType = pDict->GetElement("Type")->GetDirect();

- if (!pType || pType->GetType() != PDFOBJ_NAME)

- return NULL;

+ if (!ToName(pType))

+ return nullptr;

dsinclair 2015/10/21 18:00:14 Merge conflict. I'm guessing due to the NULL vs nu

Tom Sepez 2015/10/21 19:41:04 Acknowledged.

if (pType->GetString().Compare("Page"))

return NULL;

if (!pDict->KeyExist("Parent"))

« no previous file with comments | « fpdfsdk/src/formfiller/FFL_Utils.cpp ('k') | fpdfsdk/src/javascript/Document.cpp » ('j') | no next file with comments »