Cleanup: Remove CFX_MapPtrToPtr from fpdfppo.cpp.
R=jam@chromium.org
Review URL: https://codereview.chromium.org/1194153002.
diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp
index 21ae05d..2e92d4a 100644
--- a/fpdfsdk/src/fpdfppo.cpp
+++ b/fpdfsdk/src/fpdfppo.cpp
@@ -5,463 +5,430 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "../../public/fpdf_ppo.h"
+#include "../../third_party/base/nonstd_unique_ptr.h"
#include "../include/fsdk_define.h"
class CPDF_PageOrganizer
{
public:
- CPDF_PageOrganizer();
- ~CPDF_PageOrganizer();
+ using ObjectNumberMap = std::map<FX_DWORD, FX_DWORD>;
+ CPDF_PageOrganizer();
+ ~CPDF_PageOrganizer();
-public:
- FX_BOOL PDFDocInit(CPDF_Document *pDestPDFDoc, CPDF_Document *pSrcPDFDoc);
- FX_BOOL ExportPage(CPDF_Document *pSrcPDFDoc, CFX_WordArray* nPageNum, CPDF_Document *pDestPDFDoc, int nIndex);
- CPDF_Object* PageDictGetInheritableTag(CPDF_Dictionary *pDict, CFX_ByteString nSrctag);
- FX_BOOL UpdateReference(CPDF_Object *pObj, CPDF_Document *pDoc, CFX_MapPtrToPtr* pMapPtrToPtr);
- int GetNewObjId(CPDF_Document *pDoc, CFX_MapPtrToPtr* pMapPtrToPtr, CPDF_Reference *pRef);
-
+ FX_BOOL PDFDocInit(CPDF_Document* pDestPDFDoc, CPDF_Document* pSrcPDFDoc);
+ FX_BOOL ExportPage(CPDF_Document* pSrcPDFDoc,
+ CFX_WordArray* nPageNum,
+ CPDF_Document* pDestPDFDoc,
+ int nIndex);
+ CPDF_Object* PageDictGetInheritableTag(CPDF_Dictionary* pDict,
+ CFX_ByteString nSrctag);
+ FX_BOOL UpdateReference(CPDF_Object* pObj,
+ CPDF_Document* pDoc,
+ ObjectNumberMap* pObjNumberMap);
+ FX_DWORD GetNewObjId(CPDF_Document* pDoc,
+ ObjectNumberMap* pObjNumberMap,
+ CPDF_Reference* pRef);
};
CPDF_PageOrganizer::CPDF_PageOrganizer()
{
-
}
CPDF_PageOrganizer::~CPDF_PageOrganizer()
{
-
}
-FX_BOOL CPDF_PageOrganizer::PDFDocInit(CPDF_Document *pDestPDFDoc, CPDF_Document *pSrcPDFDoc)
+FX_BOOL CPDF_PageOrganizer::PDFDocInit(CPDF_Document* pDestPDFDoc,
+ CPDF_Document* pSrcPDFDoc)
{
- if(!pDestPDFDoc || !pSrcPDFDoc)
- return false;
+ if (!pDestPDFDoc || !pSrcPDFDoc)
+ return FALSE;
- CPDF_Dictionary* pNewRoot = pDestPDFDoc->GetRoot();
- if(!pNewRoot) return FALSE;
+ CPDF_Dictionary* pNewRoot = pDestPDFDoc->GetRoot();
+ if (!pNewRoot)
+ return FALSE;
- //Set the document information////////////////////////////////////////////
+ //Set the document information////////////////////////////////////////////
- CPDF_Dictionary* DInfoDict = pDestPDFDoc->GetInfo();
+ CPDF_Dictionary* DInfoDict = pDestPDFDoc->GetInfo();
+ if (!DInfoDict)
+ return FALSE;
- if(!DInfoDict)
- return FALSE;
+ CFX_ByteString producerstr;
+ producerstr.Format("PDFium");
+ DInfoDict->SetAt("Producer", new CPDF_String(producerstr));
- 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"));
+ }
- //Set type////////////////////////////////////////////////////////////////
- CFX_ByteString cbRootType = pNewRoot->GetString("Type","");
- if( cbRootType.Equal("") )
- {
- pNewRoot->SetAt("Type", new CPDF_Name("Catalog"));
- }
+ CPDF_Object* pElement = pNewRoot->GetElement("Pages");
+ CPDF_Dictionary* pNewPages = pElement ?
+ (CPDF_Dictionary*)pElement->GetDirect() : nullptr;
+ if (!pNewPages) {
+ pNewPages = new CPDF_Dictionary;
+ FX_DWORD NewPagesON = pDestPDFDoc->AddIndirectObject(pNewPages);
+ pNewRoot->SetAt("Pages", new CPDF_Reference(pDestPDFDoc, NewPagesON));
+ }
- CPDF_Dictionary* pNewPages = (CPDF_Dictionary*)(pNewRoot->GetElement("Pages")? pNewRoot->GetElement("Pages")->GetDirect() : NULL);
- 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"));
+ }
- CFX_ByteString cbPageType = pNewPages->GetString("Type","");
- if(cbPageType.Equal(""))
- {
- pNewPages->SetAt("Type", new CPDF_Name("Pages"));
- }
+ CPDF_Array* pKeysArray = pNewPages->GetArray("Kids");
+ if (!pKeysArray) {
+ CPDF_Array* pNewKids = new CPDF_Array;
+ FX_DWORD Kidsobjnum = -1;
+ Kidsobjnum = pDestPDFDoc->AddIndirectObject(pNewKids);
- CPDF_Array* pKeysArray = pNewPages->GetArray("Kids");
- if(pKeysArray == NULL)
- {
- CPDF_Array* pNewKids = new CPDF_Array;
- FX_DWORD Kidsobjnum = -1;
- Kidsobjnum = pDestPDFDoc->AddIndirectObject(pNewKids);//, Kidsobjnum, Kidsgennum);
+ pNewPages->SetAt("Kids", new CPDF_Reference(pDestPDFDoc, Kidsobjnum));
+ pNewPages->SetAt("Count", new CPDF_Number(0));
+ }
- pNewPages->SetAt("Kids", new CPDF_Reference(pDestPDFDoc, Kidsobjnum));//, Kidsgennum));
- pNewPages->SetAt("Count", new CPDF_Number(0));
- }
-
- return true;
+ return TRUE;
}
-FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document *pSrcPDFDoc, CFX_WordArray* nPageNum,
- CPDF_Document *pDestPDFDoc,int nIndex)
+FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc,
+ CFX_WordArray* nPageNum,
+ CPDF_Document* pDestPDFDoc,
+ int nIndex)
{
- int curpage =nIndex;
+ int curpage = nIndex;
- CFX_MapPtrToPtr* pMapPtrToPtr = new CFX_MapPtrToPtr;
- pMapPtrToPtr->InitHashTable(1001);
+ nonstd::unique_ptr<ObjectNumberMap> pObjNumberMap(new ObjectNumberMap);
- for(int i=0; i<nPageNum->GetSize(); i++)
- {
+ for (int i = 0; i < nPageNum->GetSize(); ++i) {
+ CPDF_Dictionary* pCurPageDict = pDestPDFDoc->CreateNewPage(curpage);
+ CPDF_Dictionary* pSrcPageDict =
+ pSrcPDFDoc->GetPage(nPageNum->GetAt(i) - 1);
+ if (!pSrcPageDict || !pCurPageDict)
+ return FALSE;
- CPDF_Dictionary* pCurPageDict = pDestPDFDoc->CreateNewPage(curpage);
- CPDF_Dictionary* pSrcPageDict = pSrcPDFDoc->GetPage(nPageNum->GetAt(i)-1);
- if(!pSrcPageDict || !pCurPageDict)
- {
- delete pMapPtrToPtr;
- return FALSE;
- }
+ // Clone the page dictionary///////////
+ FX_POSITION SrcPos = pSrcPageDict->GetStartPos();
+ while (SrcPos) {
+ CFX_ByteString cbSrcKeyStr;
+ CPDF_Object* pObj = pSrcPageDict->GetNextElement(SrcPos,
+ cbSrcKeyStr);
+ if (cbSrcKeyStr.Compare(("Type")) &&
+ cbSrcKeyStr.Compare(("Parent"))) {
+ if (pCurPageDict->KeyExist(cbSrcKeyStr))
+ pCurPageDict->RemoveAt(cbSrcKeyStr);
+ pCurPageDict->SetAt(cbSrcKeyStr, pObj->Clone());
+ }
+ }
- // Clone the page dictionary///////////
- FX_POSITION SrcPos = pSrcPageDict->GetStartPos();
- while (SrcPos)
- {
- CFX_ByteString cbSrcKeyStr;
- CPDF_Object* pObj = pSrcPageDict->GetNextElement(SrcPos, cbSrcKeyStr);
- if(cbSrcKeyStr.Compare(("Type")) && cbSrcKeyStr.Compare(("Parent")))
- {
- if(pCurPageDict->KeyExist(cbSrcKeyStr))
- pCurPageDict->RemoveAt(cbSrcKeyStr);
- pCurPageDict->SetAt(cbSrcKeyStr, pObj->Clone());
- }
- }
+ //inheritable item///////////////////////
+ CPDF_Object* pInheritable = nullptr;
+ //1 MediaBox //required
+ if (!pCurPageDict->KeyExist("MediaBox")) {
+ pInheritable = PageDictGetInheritableTag(pSrcPageDict, "MediaBox");
+ if (!pInheritable) {
+ // Search the "CropBox" from source page dictionary,
+ // if not exists,we take the letter size.
+ pInheritable = PageDictGetInheritableTag(pSrcPageDict,
+ "CropBox");
+ if (pInheritable) {
+ pCurPageDict->SetAt("MediaBox", pInheritable->Clone());
+ } else {
+ // Make the default size to be letter size (8.5'x11')
+ CPDF_Array* pArray = new CPDF_Array;
+ pArray->AddNumber(0);
+ pArray->AddNumber(0);
+ pArray->AddNumber(612);
+ pArray->AddNumber(792);
+ pCurPageDict->SetAt("MediaBox", pArray);
+ }
+ } else {
+ pCurPageDict->SetAt("MediaBox", pInheritable->Clone());
+ }
+ }
+ //2 Resources //required
+ if (!pCurPageDict->KeyExist("Resources")) {
+ pInheritable = PageDictGetInheritableTag(pSrcPageDict, "Resources");
+ if (!pInheritable)
+ return FALSE;
+ pCurPageDict->SetAt("Resources", pInheritable->Clone());
+ }
+ //3 CropBox //Optional
+ if (!pCurPageDict->KeyExist("CropBox")) {
+ pInheritable = PageDictGetInheritableTag(pSrcPageDict, "CropBox");
+ if (pInheritable)
+ pCurPageDict->SetAt("CropBox", pInheritable->Clone());
+ }
+ //4 Rotate //Optional
+ if (!pCurPageDict->KeyExist("Rotate")) {
+ pInheritable = PageDictGetInheritableTag(pSrcPageDict, "Rotate");
+ if (pInheritable)
+ pCurPageDict->SetAt("Rotate", pInheritable->Clone());
+ }
- //inheritable item///////////////////////
- CPDF_Object* pInheritable = NULL;
- //1 MediaBox //required
- if(!pCurPageDict->KeyExist("MediaBox"))
- {
+ /////////////////////////////////////////////
+ //Update the reference
+ FX_DWORD dwOldPageObj = pSrcPageDict->GetObjNum();
+ FX_DWORD dwNewPageObj = pCurPageDict->GetObjNum();
- pInheritable = PageDictGetInheritableTag(pSrcPageDict, "MediaBox");
- if(!pInheritable)
- {
- //Search the "CropBox" from source page dictionary, if not exists,we take the letter size.
- pInheritable = PageDictGetInheritableTag(pSrcPageDict, "CropBox");
- if(pInheritable)
- pCurPageDict->SetAt("MediaBox", pInheritable->Clone());
- else
- {
- //Make the default size to be letter size (8.5'x11')
- CPDF_Array* pArray = new CPDF_Array;
- pArray->AddNumber(0);
- pArray->AddNumber(0);
- pArray->AddNumber(612);
- pArray->AddNumber(792);
- pCurPageDict->SetAt("MediaBox", pArray);
- }
- }
- else
- pCurPageDict->SetAt("MediaBox", pInheritable->Clone());
- }
- //2 Resources //required
- if(!pCurPageDict->KeyExist("Resources"))
- {
- pInheritable = PageDictGetInheritableTag(pSrcPageDict, "Resources");
- if(!pInheritable)
- {
- delete pMapPtrToPtr;
- return FALSE;
- }
- pCurPageDict->SetAt("Resources", pInheritable->Clone());
- }
- //3 CropBox //Optional
- if(!pCurPageDict->KeyExist("CropBox"))
- {
- pInheritable = PageDictGetInheritableTag(pSrcPageDict, "CropBox");
- if(pInheritable)
- pCurPageDict->SetAt("CropBox", pInheritable->Clone());
- }
- //4 Rotate //Optional
- if(!pCurPageDict->KeyExist("Rotate"))
- {
- pInheritable = PageDictGetInheritableTag(pSrcPageDict, "Rotate");
- if(pInheritable)
- pCurPageDict->SetAt("Rotate", pInheritable->Clone());
- }
+ (*pObjNumberMap)[dwOldPageObj] = dwNewPageObj;
- /////////////////////////////////////////////
- //Update the reference
- FX_DWORD dwOldPageObj = pSrcPageDict->GetObjNum();
- FX_DWORD dwNewPageObj = pCurPageDict->GetObjNum();
+ UpdateReference(pCurPageDict, pDestPDFDoc, pObjNumberMap.get());
+ ++curpage;
+ }
- pMapPtrToPtr->SetAt((void*)(uintptr_t)dwOldPageObj, (void*)(uintptr_t)dwNewPageObj);
-
- UpdateReference(pCurPageDict, pDestPDFDoc, pMapPtrToPtr);
- curpage++;
- }
-
- delete pMapPtrToPtr;
- return TRUE;
+ return TRUE;
}
-CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag(CPDF_Dictionary *pDict, CFX_ByteString nSrctag)
+CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag(
+ CPDF_Dictionary* pDict,
+ CFX_ByteString nSrctag)
{
- if(!pDict || !pDict->KeyExist("Type") || nSrctag.IsEmpty())
- return NULL;
+ if (!pDict || !pDict->KeyExist("Type") || nSrctag.IsEmpty())
+ return nullptr;
+ if (!pDict->KeyExist("Parent"))
+ return nullptr;
- CPDF_Object* pType = pDict->GetElement("Type")->GetDirect();
- if(!pType || pType->GetType() != PDFOBJ_NAME) return NULL;
+ CPDF_Object* pType = pDict->GetElement("Type")->GetDirect();
+ if (!pType || pType->GetType() != PDFOBJ_NAME)
+ return nullptr;
+ if (pType->GetString().Compare("Page"))
+ return nullptr;
- if(pType->GetString().Compare("Page")) return NULL;
+ CPDF_Object* pParent = pDict->GetElement("Parent")->GetDirect();
+ if (!pParent || pParent->GetType() != PDFOBJ_DICTIONARY)
+ return nullptr;
- if(!pDict->KeyExist("Parent")) 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 = (CPDF_Dictionary*)pParent;
+ if (pDict->KeyExist((const char*)nSrctag))
+ return pDict->GetElement((const char*)nSrctag);
- 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);
- else if (pp->KeyExist("Parent"))
- {
- pp = (CPDF_Dictionary*)pp->GetElement("Parent")->GetDirect();
- if (pp->GetType() == PDFOBJ_NULL) break;
- }
- else break;
- }
+ while (pp) {
+ if (pp->KeyExist((const char*)nSrctag)) {
+ return pp->GetElement((const char*)nSrctag);
+ } else if (pp->KeyExist("Parent")) {
+ pp = (CPDF_Dictionary*)pp->GetElement("Parent")->GetDirect();
+ if (pp->GetType() == PDFOBJ_NULL)
+ break;
+ } else {
+ break;
+ }
+ }
- return NULL;
+ return nullptr;
}
-FX_BOOL CPDF_PageOrganizer::UpdateReference(CPDF_Object *pObj, CPDF_Document *pDoc,
- CFX_MapPtrToPtr* pMapPtrToPtr)
+FX_BOOL CPDF_PageOrganizer::UpdateReference(CPDF_Object* pObj,
+ CPDF_Document* pDoc,
+ ObjectNumberMap* pObjNumberMap)
{
- 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;
+ switch (pObj->GetType()) {
+ case PDFOBJ_REFERENCE: {
+ CPDF_Reference* pReference = (CPDF_Reference*)pObj;
+ FX_DWORD newobjnum = GetNewObjId(pDoc, pObjNumberMap, pReference);
+ if (newobjnum == 0)
+ return FALSE;
+ pReference->SetRef(pDoc, newobjnum);
+ break;
+ }
+ case PDFOBJ_DICTIONARY: {
+ CPDF_Dictionary* pDict = (CPDF_Dictionary*)pObj;
- 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))
- pDict->RemoveAt(key);
- }
- else
- return FALSE;
- }
- break;
- }
- case PDFOBJ_ARRAY:
- {
- CPDF_Array* pArray = (CPDF_Array*)pObj;
- FX_DWORD count = pArray->GetCount();
- for(FX_DWORD i = 0; i < count; i ++)
- {
- CPDF_Object* pNextObj = pArray->GetElement(i);
- if(pNextObj)
- {
- if(!UpdateReference(pNextObj, pDoc, pMapPtrToPtr))
- return FALSE;
- }
- else
- return FALSE;
- }
- break;
- }
- case PDFOBJ_STREAM:
- {
- CPDF_Stream* pStream = (CPDF_Stream*)pObj;
- CPDF_Dictionary* pDict = pStream->GetDict();
- if(pDict)
- {
- if(!UpdateReference(pDict, pDoc, pMapPtrToPtr))
- return FALSE;
- }
- else
- return FALSE;
- break;
- }
- default: break;
- }
+ 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, pObjNumberMap))
+ pDict->RemoveAt(key);
+ } else {
+ return FALSE;
+ }
+ }
+ break;
+ }
+ case PDFOBJ_ARRAY: {
+ CPDF_Array* pArray = (CPDF_Array*)pObj;
+ FX_DWORD count = pArray->GetCount();
+ for (FX_DWORD i = 0; i < count; ++i) {
+ CPDF_Object* pNextObj = pArray->GetElement(i);
+ if (pNextObj) {
+ if (!UpdateReference(pNextObj, pDoc, pObjNumberMap))
+ return FALSE;
+ } else {
+ return FALSE;
+ }
+ }
+ break;
+ }
+ case PDFOBJ_STREAM: {
+ CPDF_Stream* pStream = (CPDF_Stream*)pObj;
+ CPDF_Dictionary* pDict = pStream->GetDict();
+ if (pDict) {
+ if (!UpdateReference(pDict, pDoc, pObjNumberMap))
+ return FALSE;
+ } else {
+ return FALSE;
+ }
+ break;
+ }
+ default:
+ break;
+ }
- return TRUE;
+ return TRUE;
}
-int CPDF_PageOrganizer::GetNewObjId(CPDF_Document *pDoc, CFX_MapPtrToPtr* pMapPtrToPtr,
- CPDF_Reference *pRef)
+FX_DWORD CPDF_PageOrganizer::GetNewObjId(CPDF_Document* pDoc,
+ ObjectNumberMap* pObjNumberMap,
+ CPDF_Reference* pRef)
{
- size_t dwObjnum = 0;
- if(!pRef)
- return 0;
- dwObjnum = pRef->GetRefObjNum();
+ if (!pRef)
+ return 0;
- size_t dwNewObjNum = 0;
+ FX_DWORD dwObjnum = pRef->GetRefObjNum();
+ FX_DWORD dwNewObjNum = 0;
+ const auto it = pObjNumberMap->find(dwObjnum);
+ if (it != pObjNumberMap->end())
+ dwNewObjNum = it->second;
+ if (dwNewObjNum)
+ return dwNewObjNum;
- pMapPtrToPtr->Lookup((void*)dwObjnum, (void*&)dwNewObjNum);
- if(dwNewObjNum)
- {
- return (int)dwNewObjNum;
- }
- else
- {
- CPDF_Object* pDirect = pRef->GetDirect();
- if(!pDirect)
- {
- return 0;
- }
+ CPDF_Object* pDirect = pRef->GetDirect();
+ if (!pDirect)
+ return 0;
- CPDF_Object* pClone = pDirect->Clone();
- if(!pClone)
- {
- return 0;
- }
+ CPDF_Object* pClone = pDirect->Clone();
+ if (!pClone)
+ return 0;
- if(pClone->GetType() == PDFOBJ_DICTIONARY)
- {
- CPDF_Dictionary* pDictClone = (CPDF_Dictionary*)pClone;
- 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;
- }
- }
- }
- dwNewObjNum = pDoc->AddIndirectObject(pClone);//, onum, gnum);
- pMapPtrToPtr->SetAt((void*)dwObjnum, (void*)dwNewObjNum);
+ if (pClone->GetType() == PDFOBJ_DICTIONARY) {
+ CPDF_Dictionary* pDictClone = (CPDF_Dictionary*)pClone;
+ 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;
+ }
+ }
+ }
+ dwNewObjNum = pDoc->AddIndirectObject(pClone);
+ (*pObjNumberMap)[dwObjnum] = dwNewObjNum;
- if(!UpdateReference(pClone, pDoc, pMapPtrToPtr))
- {
- pClone->Release();
- return 0;
- }
- return (int)dwNewObjNum;
- }
- return 0;
+ if (!UpdateReference(pClone, pDoc, pObjNumberMap)) {
+ pClone->Release();
+ return 0;
+ }
+ return dwNewObjNum;
}
-FPDF_BOOL ParserPageRangeString(CFX_ByteString rangstring, CFX_WordArray* pageArray,int nCount)
+FPDF_BOOL ParserPageRangeString(CFX_ByteString rangstring,
+ CFX_WordArray* pageArray,
+ int nCount)
{
+ if (rangstring.GetLength() != 0) {
+ rangstring.Remove(' ');
+ int nLength = rangstring.GetLength();
+ CFX_ByteString cbCompareString("0123456789-,");
+ for (int i = 0; i < nLength; ++i) {
+ if (cbCompareString.Find(rangstring[i]) == -1)
+ return FALSE;
+ }
+ CFX_ByteString cbMidRange;
+ int nStringFrom = 0;
+ int nStringTo = 0;
+ while (nStringTo < nLength) {
+ nStringTo = rangstring.Find(',', nStringFrom);
+ if (nStringTo == -1)
+ nStringTo = nLength;
+ cbMidRange = rangstring.Mid(nStringFrom, nStringTo - nStringFrom);
+ int nMid = cbMidRange.Find('-');
+ if (nMid == -1) {
+ long lPageNum = atol(cbMidRange);
+ if (lPageNum <= 0 || lPageNum > nCount)
+ return FALSE;
+ pageArray->Add((FX_WORD)lPageNum);
+ } else {
+ int nStartPageNum = atol(cbMidRange.Mid(0, nMid));
+ if (nStartPageNum == 0)
+ return FALSE;
- if(rangstring.GetLength() != 0)
- {
- rangstring.Remove(' ');
- int nLength = rangstring.GetLength();
- CFX_ByteString cbCompareString("0123456789-,");
- for(int i=0; i<nLength; i++)
- {
- if(cbCompareString.Find(rangstring[i]) == -1)
- return FALSE;
- }
- CFX_ByteString cbMidRange;
- int nStringFrom = 0;
- int nStringTo=0;
- while(nStringTo < nLength)
- {
- nStringTo = rangstring.Find(',',nStringFrom);
- if(nStringTo == -1)
- {
- nStringTo = nLength;
- }
- cbMidRange = rangstring.Mid(nStringFrom,nStringTo-nStringFrom);
+ ++nMid;
+ int nEnd = cbMidRange.GetLength() - nMid;
+ if (nEnd == 0)
+ return FALSE;
- int nMid = cbMidRange.Find('-');
- if(nMid == -1)
- {
- long lPageNum = atol(cbMidRange);
- if(lPageNum <= 0 || lPageNum > nCount)
- return FALSE;
- pageArray->Add((FX_WORD)lPageNum);
- }
- else
- {
- int nStartPageNum = atol(cbMidRange.Mid(0,nMid));
- if (nStartPageNum ==0)
- {
- return FALSE;
- }
-
-
- nMid = nMid+1;
- int nEnd = cbMidRange.GetLength()-nMid;
-
- if(nEnd ==0)return FALSE;
-
- // int nEndPageNum = (nEnd == 0)?nCount:atol(cbMidRange.Mid(nMid,nEnd));
- int nEndPageNum = atol(cbMidRange.Mid(nMid,nEnd));
-
- if(nStartPageNum < 0 ||nStartPageNum >nEndPageNum|| nEndPageNum > nCount)
- {
- return FALSE;
- }
- else
- {
- for(int nIndex=nStartPageNum; nIndex <= nEndPageNum; nIndex ++)
- pageArray->Add(nIndex);
- }
- }
- nStringFrom = nStringTo +1;
- }
- }
- return TRUE;
+ int nEndPageNum = atol(cbMidRange.Mid(nMid, nEnd));
+ if (nStartPageNum < 0 ||
+ nStartPageNum >nEndPageNum ||
+ nEndPageNum > nCount) {
+ return FALSE;
+ } else {
+ for (int i = nStartPageNum; i <= nEndPageNum; ++i) {
+ pageArray->Add(i);
+ }
+ }
+ }
+ nStringFrom = nStringTo + 1;
+ }
+ }
+ return TRUE;
}
-DLLEXPORT FPDF_BOOL STDCALL FPDF_ImportPages(FPDF_DOCUMENT dest_doc,FPDF_DOCUMENT src_doc,
- FPDF_BYTESTRING pagerange, int index)
+DLLEXPORT FPDF_BOOL STDCALL FPDF_ImportPages(FPDF_DOCUMENT dest_doc,
+ FPDF_DOCUMENT src_doc,
+ FPDF_BYTESTRING pagerange,
+ int index)
{
- if(dest_doc == NULL || src_doc == NULL )
- return FALSE;
- CFX_WordArray pageArray;
- CPDF_Document* pSrcDoc = (CPDF_Document*)src_doc;
- int nCount = pSrcDoc->GetPageCount();
- if(pagerange)
- {
- if(ParserPageRangeString(pagerange,&pageArray,nCount) == FALSE)
- return FALSE;
- }
- else
- {
- for(int i=1; i<=nCount; i++)
- {
- pageArray.Add(i);
- }
- }
+ if (!dest_doc || !src_doc)
+ return FALSE;
- CPDF_Document* pDestDoc = (CPDF_Document*)dest_doc;
- CPDF_PageOrganizer pageOrg;
+ CFX_WordArray pageArray;
+ CPDF_Document* pSrcDoc = (CPDF_Document*)src_doc;
+ int nCount = pSrcDoc->GetPageCount();
+ if (pagerange) {
+ if (!ParserPageRangeString(pagerange,&pageArray,nCount))
+ return FALSE;
+ } else {
+ for (int i = 1; i <= nCount; ++i) {
+ pageArray.Add(i);
+ }
+ }
- pageOrg.PDFDocInit(pDestDoc,pSrcDoc);
+ CPDF_Document* pDestDoc = (CPDF_Document*)dest_doc;
+ CPDF_PageOrganizer pageOrg;
- if(pageOrg.ExportPage(pSrcDoc,&pageArray,pDestDoc,index))
- return TRUE;
- return FALSE;
+ pageOrg.PDFDocInit(pDestDoc, pSrcDoc);
+
+ return pageOrg.ExportPage(pSrcDoc,&pageArray,pDestDoc,index);
}
-DLLEXPORT FPDF_BOOL STDCALL FPDF_CopyViewerPreferences(FPDF_DOCUMENT dest_doc, FPDF_DOCUMENT src_doc)
+DLLEXPORT FPDF_BOOL STDCALL FPDF_CopyViewerPreferences(FPDF_DOCUMENT dest_doc,
+ FPDF_DOCUMENT src_doc)
{
- if(src_doc == NULL || dest_doc == NULL)
- return false;
- CPDF_Document* pSrcDoc = (CPDF_Document*)src_doc;
- CPDF_Dictionary* pSrcDict = pSrcDoc->GetRoot();
- pSrcDict = pSrcDict->GetDict(FX_BSTRC("ViewerPreferences"));;
- if(!pSrcDict)
- return FALSE;
- CPDF_Document* pDstDoc = (CPDF_Document*)dest_doc;
- CPDF_Dictionary* pDstDict = pDstDoc->GetRoot();
- if(!pDstDict)
- return FALSE;
- pDstDict->SetAt(FX_BSTRC("ViewerPreferences"), pSrcDict->Clone(TRUE));
- return TRUE;
-}
+ if (!src_doc || !dest_doc)
+ return false;
+ CPDF_Document* pSrcDoc = (CPDF_Document*)src_doc;
+ CPDF_Dictionary* pSrcDict = pSrcDoc->GetRoot();
+ pSrcDict = pSrcDict->GetDict(FX_BSTRC("ViewerPreferences"));;
+ if (!pSrcDict)
+ return FALSE;
+
+ CPDF_Document* pDstDoc = (CPDF_Document*)dest_doc;
+ CPDF_Dictionary* pDstDict = pDstDoc->GetRoot();
+ if (!pDstDict)
+ return FALSE;
+ pDstDict->SetAt(FX_BSTRC("ViewerPreferences"), pSrcDict->Clone(TRUE));
+ return TRUE;
+}
