master: more underlying types

fpdfsdk/src/fpdfsave.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_save.h"
 
 #include "fpdfsdk/include/fsdk_define.h"
 #include "public/fpdf_edit.h"
@@ skipping 39 matching lines @@
 
 void CFX_IFileWrite::Release() {
   delete this;
 }
 
 FPDF_BOOL _FPDF_Doc_Save(FPDF_DOCUMENT document,
                          FPDF_FILEWRITE* pFileWrite,
                          FPDF_DWORD flags,
                          FPDF_BOOL bSetVersion,
                          int fileVerion) {
-  CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document);
-  if (!pDoc)
+  CPDF_Document* pPDFDoc = CPDFDocumentFromFPDFDocument(document);

[Lei Zhang, 2015/11/25 22:34:42]

UnderlyingDocumentType?

[Tom Sepez, 2015/11/25 22:50:24]

No, because CPDF_Creator::CPDF_Creator() takes a CPDF_Document* arg.  This just
makes the names line up (XFA has a second document ptr called pDoc which
conflicts otherwise).

+  if (!pPDFDoc)
     return 0;
 
   if (flags < FPDF_INCREMENTAL || flags > FPDF_REMOVE_SECURITY) {
     flags = 0;
   }
 
-  CPDF_Creator FileMaker(pDoc);
+  CPDF_Creator FileMaker(pPDFDoc);
   if (bSetVersion)
     FileMaker.SetFileVersion(fileVerion);
   if (flags == FPDF_REMOVE_SECURITY) {
     flags = 0;
     FileMaker.RemoveSecurity();
   }
+
   CFX_IFileWrite* pStreamWrite = NULL;
   FX_BOOL bRet;
   pStreamWrite = new CFX_IFileWrite;
   pStreamWrite->Init(pFileWrite);
   bRet = FileMaker.Create(pStreamWrite, flags);
   pStreamWrite->Release();
   return bRet;
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FPDF_SaveAsCopy(FPDF_DOCUMENT document,
                                             FPDF_FILEWRITE* pFileWrite,
                                             FPDF_DWORD flags) {
   return _FPDF_Doc_Save(document, pFileWrite, flags, FALSE, 0);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FPDF_SaveWithVersion(FPDF_DOCUMENT document,
                                                  FPDF_FILEWRITE* pFileWrite,
                                                  FPDF_DWORD flags,
                                                  int fileVersion) {
   return _FPDF_Doc_Save(document, pFileWrite, flags, TRUE, fileVersion);
 }