Merge to XFA: Cleanup CPDF_Stream:

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 "../include/fpdfxfa/fpdfxfa_app.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
@@ skipping 163 matching lines @@
                                     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->InitStream(pDsfileWrite, pDataDict);
+          pDataSetsStream->InitStreamFromFile(pDsfileWrite, pDataDict);
       } else {
         CPDF_Stream* pData = new CPDF_Stream(NULL, 0, NULL);
-        pData->InitStream(pDsfileWrite, pDataDict);
+        pData->InitStreamFromFile(pDsfileWrite, pDataDict);
         pPDFDocument->AddIndirectObject(pData);
         iLast = pArray->GetCount() - 2;
         pArray->InsertAt(iLast, CPDF_String::Create("datasets"));
         pArray->InsertAt(iLast + 1, pData, pPDFDocument);
       }
       fileList.Add(pDsfileWrite);
     }
   }
 
   // L"form"
   {
     IFX_FileStream* pfileWrite = FX_CreateMemoryStream();
     if (NULL == pfileWrite) {
       pContext->Release();
       return FALSE;
     }
     if (pXFADocHandler->SavePackage(pXFADocView->GetDoc(),
                                     CFX_WideStringC(L"form"), pfileWrite,
                                     pContext) &&
         pfileWrite > 0) {
       CPDF_Dictionary* pDataDict = new CPDF_Dictionary;
       if (iFormIndex != -1) {
         if (pFormStream)
-          pFormStream->InitStream(pfileWrite, pDataDict);
+          pFormStream->InitStreamFromFile(pfileWrite, pDataDict);
       } else {
         CPDF_Stream* pData = new CPDF_Stream(NULL, 0, NULL);
-        pData->InitStream(pfileWrite, pDataDict);
+        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
@@ skipping 103 matching lines @@
                                             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);
 }