[Merge to XFA] Revert "Revert "Add type cast definitions for CPDF_Dictionary.""

fpdfsdk/src/fpdfppo.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../public/fpdf_ppo.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 
@@ skipping 41 matching lines @@
   CFX_ByteString producerstr;
   producerstr.Format("PDFium");
   DInfoDict->SetAt("Producer", new CPDF_String(producerstr));
 
   // Set type////////////////////////////////////////////////////////////////
   CFX_ByteString cbRootType = pNewRoot->GetString("Type", "");
   if (cbRootType.Equal("")) {
     pNewRoot->SetAt("Type", new CPDF_Name("Catalog"));
   }
 
-  CPDF_Dictionary* pNewPages =
-      (CPDF_Dictionary*)(pNewRoot->GetElement("Pages")
-                             ? pNewRoot->GetElement("Pages")->GetDirect()
-                             : NULL);
+  CPDF_Dictionary* pNewPages = ToDictionary(
+      pNewRoot->GetElement("Pages") ? pNewRoot->GetElement("Pages")->GetDirect()

[dsinclair, 2015/10/20 19:18:31]

This code differs slightly from master and was merged.

+                                    : nullptr);
+
   if (!pNewPages) {
     pNewPages = new CPDF_Dictionary;
     FX_DWORD NewPagesON = pDestPDFDoc->AddIndirectObject(pNewPages);
     pNewRoot->SetAt("Pages", new CPDF_Reference(pDestPDFDoc, NewPagesON));
   }
 
   CFX_ByteString cbPageType = pNewPages->GetString("Type", "");
   if (cbPageType.Equal("")) {
     pNewPages->SetAt("Type", new CPDF_Name("Pages"));
   }
@@ skipping 108 matching lines @@
     CFX_ByteString nSrctag) {
   if (!pDict || !pDict->KeyExist("Type") || nSrctag.IsEmpty())
     return NULL;
 
   CPDF_Object* pType = pDict->GetElement("Type")->GetDirect();
   if (!pType || pType->GetType() != PDFOBJ_NAME)
     return NULL;
 
   if (pType->GetString().Compare("Page"))
     return NULL;
-
   if (!pDict->KeyExist("Parent"))

[dsinclair, 2015/10/20 19:18:31]

This key check doesn't exist on master and caused merge issues with the below.

     return NULL;
-  CPDF_Object* pParent = pDict->GetElement("Parent")->GetDirect();
-  if (!pParent || pParent->GetType() != PDFOBJ_DICTIONARY)
-    return NULL;
 
-  CPDF_Dictionary* pp = (CPDF_Dictionary*)pParent;
+  CPDF_Dictionary* pp = ToDictionary(pDict->GetElement("Parent")->GetDirect());
+  if (!pp)
+    return nullptr;
 
   if (pDict->KeyExist((const char*)nSrctag))
     return pDict->GetElement((const char*)nSrctag);
+
   while (pp) {
     if (pp->KeyExist((const char*)nSrctag))
       return pp->GetElement((const char*)nSrctag);
     if (pp->KeyExist("Parent")) {
       pp = (CPDF_Dictionary*)pp->GetElement("Parent")->GetDirect();
       if (pp->GetType() == PDFOBJ_NULL)
         break;
     } else
       break;
   }

[dsinclair, 2015/10/20 19:18:31]

This is a bit weird, on master the while ends with:

  pp = ToDictionary(pp->GetElement("Parent")->GetDirect());
}

but that doesn't exist on XFA. I wasn't sure if I should put it in or not ....

[Tom Sepez, 2015/10/20 19:49:28]

Looks like on master we inverted the if at 207 to get rid of "else break"

Then the last thing would be the update of pp, followed by the null check, which
we removed in your CL in master.  I think you can take the master code verbatim
for this loop

[dsinclair, 2015/10/20 19:57:16]

Done.

 
-  return NULL;
+  return nullptr;
 }
 
 FX_BOOL CPDF_PageOrganizer::UpdateReference(CPDF_Object* pObj,
                                             CPDF_Document* pDoc,
                                             CFX_MapPtrToPtr* pMapPtrToPtr) {
   switch (pObj->GetType()) {
     case PDFOBJ_REFERENCE: {
       CPDF_Reference* pReference = (CPDF_Reference*)pObj;
       int newobjnum = GetNewObjId(pDoc, pMapPtrToPtr, pReference);
       if (newobjnum == 0)
         return FALSE;
       pReference->SetRef(pDoc, newobjnum);  //, 0);
       break;
     }
     case PDFOBJ_DICTIONARY: {
-      CPDF_Dictionary* pDict = (CPDF_Dictionary*)pObj;
+      CPDF_Dictionary* pDict = pObj->AsDictionary();
 
       FX_POSITION pos = pDict->GetStartPos();
       while (pos) {
         CFX_ByteString key("");
         CPDF_Object* pNextObj = pDict->GetNextElement(pos, key);
         if (!FXSYS_strcmp(key, "Parent") || !FXSYS_strcmp(key, "Prev") ||
             !FXSYS_strcmp(key, "First"))
           continue;
         if (pNextObj) {
           if (!UpdateReference(pNextObj, pDoc, pMapPtrToPtr))
@@ skipping 50 matching lines @@
   CPDF_Object* pDirect = pRef->GetDirect();
   if (!pDirect) {
     return 0;
   }
 
   CPDF_Object* pClone = pDirect->Clone();
   if (!pClone) {
     return 0;
   }
 
-  if (pClone->GetType() == PDFOBJ_DICTIONARY) {
-    CPDF_Dictionary* pDictClone = (CPDF_Dictionary*)pClone;
+  if (CPDF_Dictionary* pDictClone = pClone->AsDictionary()) {
     if (pDictClone->KeyExist("Type")) {
       CFX_ByteString strType = pDictClone->GetString("Type");
       if (!FXSYS_stricmp(strType, "Pages")) {
         pDictClone->Release();
         return 4;
       } else if (!FXSYS_stricmp(strType, "Page")) {
         pDictClone->Release();
         return 0;
       }
     }
@@ skipping 103 matching lines @@
   if (!pSrcDict)
     return FALSE;
 
   CPDF_Dictionary* pDstDict = pDstDoc->GetRoot();
   if (!pDstDict)
     return FALSE;
 
   pDstDict->SetAt(FX_BSTRC("ViewerPreferences"), pSrcDict->Clone(TRUE));
   return TRUE;
 }