Merge to XFA: Cleanup CPDF_Stream:

core/src/fpdfapi/fpdf_edit/fpdf_edit_image.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 "../fpdf_page/pageint.h"
 #include "../fpdf_render/render_int.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
@@ skipping 67 matching lines @@
   FX_Free(pData);
   if (!pDict && size > dwEstimateSize) {
     pData = FX_Alloc(uint8_t, size);
     pFile->ReadBlock(pData, 0, size);
     pDict = InitJPEG(pData, size);
     FX_Free(pData);
   }
   if (!pDict) {
     return;
   }
-  m_pStream->InitStream(pFile, pDict);
+  m_pStream->InitStreamFromFile(pFile, pDict);
 }
 void _DCTEncodeBitmap(CPDF_Dictionary* pBitmapDict,
                       const CFX_DIBitmap* pBitmap,
                       int quality,
                       uint8_t*& buf,
                       FX_STRSIZE& size) {}
 void _JBIG2EncodeBitmap(CPDF_Dictionary* pBitmapDict,
                         const CFX_DIBitmap* pBitmap,
                         CPDF_Document* pDoc,
                         uint8_t*& buf,
@@ skipping 72 matching lines @@
       pCS->AddInteger(iPalette - 1);
       uint8_t* pColorTable = FX_Alloc2D(uint8_t, iPalette, 3);
       uint8_t* ptr = pColorTable;
       for (int32_t i = 0; i < iPalette; i++) {
         FX_DWORD argb = pBitmap->GetPaletteArgb(i);
         ptr[0] = (uint8_t)(argb >> 16);
         ptr[1] = (uint8_t)(argb >> 8);
         ptr[2] = (uint8_t)argb;
         ptr += 3;
       }
-      CPDF_Stream* pCTS = CPDF_Stream::Create(pColorTable, iPalette * 3,
-                                              CPDF_Dictionary::Create());
+      CPDF_Stream* pCTS =
+          new CPDF_Stream(pColorTable, iPalette * 3, new CPDF_Dictionary);
       m_pDocument->AddIndirectObject(pCTS);
       pCS->AddReference(m_pDocument, pCTS);
       pDict->SetAtReference(FX_BSTRC("ColorSpace"), m_pDocument, pCS);
     } else {
       pDict->SetAtName(FX_BSTRC("ColorSpace"), FX_BSTRC("DeviceGray"));
     }
     pDict->SetAtInteger(FX_BSTRC("BitsPerComponent"), 8);
     if ((iCompress & 0x03) == PDF_IMAGE_NO_COMPRESS) {
       dest_pitch = BitmapWidth;
       opType = 1;
@@ skipping 174 matching lines @@
       dest_buf = NULL;
     }
   }
   if (m_pStream == NULL) {
     m_pStream = new CPDF_Stream(NULL, 0, NULL);
   }
   if (!bStream) {
     m_pStream->InitStream(dest_buf, dest_size, pDict);
   } else {
     pFileWrite->Flush();
-    m_pStream->InitStream(pFileRead, pDict);
+    m_pStream->InitStreamFromFile(pFileRead, pDict);
   }
   m_bIsMask = pBitmap->IsAlphaMask();
   m_Width = BitmapWidth;
   m_Height = BitmapHeight;
   FX_Free(dest_buf);
 }
 void CPDF_Image::ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pBitmap) {
   pPage->GetRenderCache()->ResetBitmap(m_pStream, pBitmap);
 }