Tidy ifdefs in fpdfsdk.

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"
+
 #ifdef PDF_ENABLE_XFA
 #include "../include/fpdfxfa/fpdfxfa_app.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
-#endif
-#include "fpdfsdk/include/fsdk_define.h"
-#include "public/fpdf_edit.h"
-#ifdef PDF_ENABLE_XFA
 #include "public/fpdf_formfill.h"
 #endif
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
 #else
 #include <ctime>
 #endif
 
 class CFX_IFileWrite final : public IFX_StreamWrite {
@@ skipping 32 matching lines @@
 void CFX_IFileWrite::Release() {
   delete this;
 }
 
 #ifdef PDF_ENABLE_XFA
 #define XFA_DATASETS 0
 #define XFA_FORMS 1
 
 FX_BOOL _SaveXFADocumentData(CPDFXFA_Document* pDocument,
                              CFX_PtrArray& fileList) {
-#ifdef PDF_ENABLE_XFA
   if (!pDocument)
     return FALSE;
   if (pDocument->GetDocType() != DOCTYPE_DYNAMIC_XFA &&
       pDocument->GetDocType() != DOCTYPE_STATIC_XFA)
     return TRUE;
   if (!CPDFXFA_App::GetInstance()->GetXFAApp())
     return TRUE;
 
   IXFA_DocView* pXFADocView = pDocument->GetXFADocView();
   if (NULL == pXFADocView)
@@ skipping 29 matching lines @@
     if (pPDFObj->GetType() != PDFOBJ_STRING)
       continue;
     if (pPDFObj->GetString() == "form")
       iFormIndex = i + 1;
     else if (pPDFObj->GetString() == "datasets")
       iDataSetsIndex = i + 1;
     else if (pPDFObj->GetString() == FX_BSTRC("template"))
       iTemplate = i + 1;
   }
   IXFA_ChecksumContext* pContext = NULL;
-#define XFA_USECKSUM
-#ifdef XFA_USECKSUM
   // Checksum
   pContext = XFA_Checksum_Create();
   FXSYS_assert(pContext);
   pContext->StartChecksum();
 
   // template
   if (iTemplate > -1) {
     CPDF_Stream* pTemplateStream = pArray->GetStream(iTemplate);
     CPDF_StreamAcc streamAcc;
     streamAcc.LoadAllData(pTemplateStream);
     uint8_t* pData = (uint8_t*)streamAcc.GetData();
     FX_DWORD dwSize2 = streamAcc.GetSize();
     IFX_FileStream* pTemplate = FX_CreateMemoryStream(pData, dwSize2);
     pContext->UpdateChecksum((IFX_FileRead*)pTemplate);
     pTemplate->Release();
   }
-#endif
   CPDF_Stream* pFormStream = NULL;
   CPDF_Stream* pDataSetsStream = NULL;
   if (iFormIndex != -1) {
     // Get form CPDF_Stream
     CPDF_Object* pFormPDFObj = pArray->GetElement(iFormIndex);
     if (pFormPDFObj->GetType() == PDFOBJ_REFERENCE) {
       CPDF_Object* pFormDircetObj = pFormPDFObj->GetDirect();
       if (NULL != pFormDircetObj &&
           pFormDircetObj->GetType() == PDFOBJ_STREAM) {
         pFormStream = (CPDF_Stream*)pFormDircetObj;
@@ skipping 23 matching lines @@
     IFX_FileStream* pDsfileWrite = FX_CreateMemoryStream();
     if (NULL == pDsfileWrite) {
       pContext->Release();
       pDsfileWrite->Release();
       return FALSE;
     }
     if (pXFADocHandler->SavePackage(pXFADocView->GetDoc(),
                                     CFX_WideStringC(L"datasets"),
                                     pDsfileWrite) &&
         pDsfileWrite->GetSize() > 0) {
-#ifdef XFA_USECKSUM
       // Datasets
       pContext->UpdateChecksum((IFX_FileRead*)pDsfileWrite);
       pContext->FinishChecksum();
-#endif
       CPDF_Dictionary* pDataDict = new CPDF_Dictionary;
       if (iDataSetsIndex != -1) {
         if (pDataSetsStream)
           pDataSetsStream->InitStreamFromFile(pDsfileWrite, pDataDict);
       } else {
         CPDF_Stream* pData = new CPDF_Stream(NULL, 0, NULL);
         pData->InitStreamFromFile(pDsfileWrite, pDataDict);
         pPDFDocument->AddIndirectObject(pData);
         iLast = pArray->GetCount() - 2;
         pArray->InsertAt(iLast, CPDF_String::Create("datasets"));
@@ skipping 23 matching lines @@
         pData->InitStreamFromFile(pfileWrite, pDataDict);
         pPDFDocument->AddIndirectObject(pData);
         iLast = pArray->GetCount() - 2;
         pArray->InsertAt(iLast, CPDF_String::Create("form"));
         pArray->InsertAt(iLast + 1, pData, pPDFDocument);
       }
       fileList.Add(pfileWrite);
     }
   }
   pContext->Release();
-#endif  // PDF_ENABLE_XFA
-
   return TRUE;
 }
 
 FX_BOOL _SendPostSaveToXFADoc(CPDFXFA_Document* pDocument) {
   if (!pDocument)
     return FALSE;
 
   if (pDocument->GetDocType() != DOCTYPE_DYNAMIC_XFA &&
       pDocument->GetDocType() != DOCTYPE_STATIC_XFA)
     return TRUE;
@@ skipping 35 matching lines @@
   while (pWidgetAcc) {
     CXFA_EventParam preParam;
     preParam.m_eType = XFA_EVENT_PreSave;
     pWidgetHander->ProcessEvent(pWidgetAcc, &preParam);
     pWidgetAcc = pWidgetAccIterator->MoveToNext();
   }
   pWidgetAccIterator->Release();
   pXFADocView->UpdateDocView();
   return _SaveXFADocumentData(pDocument, fileList);
 }
+#endif  // PDF_ENABLE_XFA
 
-#endif
 FPDF_BOOL _FPDF_Doc_Save(FPDF_DOCUMENT document,
                          FPDF_FILEWRITE* pFileWrite,
                          FPDF_DWORD flags,
                          FPDF_BOOL bSetVersion,
                          int fileVerion) {
   CPDF_Document* pPDFDoc = CPDFDocumentFromFPDFDocument(document);
   if (!pPDFDoc)
     return 0;
 
 #ifdef PDF_ENABLE_XFA
   CPDFXFA_Document* pDoc = (CPDFXFA_Document*)document;
   CFX_PtrArray fileList;
   _SendPreSaveToXFADoc(pDoc, fileList);
+#endif  // PDF_ENABLE_XFA
 
-#endif
   if (flags < FPDF_INCREMENTAL || flags > FPDF_REMOVE_SECURITY) {
     flags = 0;
   }
 
   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);
 #ifdef PDF_ENABLE_XFA
   _SendPostSaveToXFADoc(pDoc);
   for (int i = 0; i < fileList.GetSize(); i++) {
     IFX_FileStream* pFile = (IFX_FileStream*)fileList.GetAt(i);
     pFile->Release();
   }
   fileList.RemoveAll();
-#endif
+#endif  // PDF_ENABLE_XFA
   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);
 }