fpdfsdk/src/fpdfppo.cpp - Issue 1410073007: Merge to XFA: Revert "Revert "Add type cast definitions for CPDF_Reference.""

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 1410073007: Merge to XFA: Revert "Revert "Add type cast definitions for CPDF_Reference."" (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:

View side-by-side diff with in-line comments

Download patch

Index: fpdfsdk/src/fpdfppo.cpp

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

index 912c4b3b3fbb9b2448ea193ad79835c5f34367b0..cc0799ef13555839bfb462a208840dc77d87b7f8 100644

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

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

@@ -216,11 +216,11 @@ FX_BOOL CPDF_PageOrganizer::UpdateReference(CPDF_Object* pObj,

CFX_MapPtrToPtr* pMapPtrToPtr) {

switch (pObj->GetType()) {

case PDFOBJ_REFERENCE: {

- CPDF_Reference* pReference = (CPDF_Reference*)pObj;

+ CPDF_Reference* pReference = pObj->AsReference();

int newobjnum = GetNewObjId(pDoc, pMapPtrToPtr, pReference);

dsinclair 2015/10/26 20:13:54 There was a merge conflict here because line 220 h

if (newobjnum == 0)

return FALSE;

- pReference->SetRef(pDoc, newobjnum); //, 0);

+ pReference->SetRef(pDoc, newobjnum);

break;

}

case PDFOBJ_DICTIONARY: {

« no previous file with comments | « fpdfsdk/src/fpdf_transformpage.cpp ('k') | no next file » | no next file with comments »