Clean up CPDF_Page.

core/fpdfapi/fpdf_page/fpdf_page_parser_old.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 "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <limits.h>
 
@@ skipping 106 matching lines @@
   if (decoder == "RunLengthDecode" || decoder == "RL") {
     return RunLengthDecode(src_buf, limit, dest_buf, dest_size);
   }
   dest_size = 0;
   dest_buf = 0;
   return (uint32_t)-1;
 }
 
 CPDF_Stream* CPDF_StreamParser::ReadInlineStream(CPDF_Document* pDoc,
                                                  CPDF_Dictionary* pDict,
-                                                 CPDF_Object* pCSObj,
-                                                 FX_BOOL bDecode) {
+                                                 CPDF_Object* pCSObj) {
   if (m_Pos == m_Size)
     return nullptr;
 
   if (PDFCharIsWhitespace(m_pBuf[m_Pos]))
     m_Pos++;
 
   CFX_ByteString Decoder;
   CPDF_Dictionary* pParam = nullptr;
   CPDF_Object* pFilter = pDict->GetDirectObjectBy("Filter");
   if (pFilter) {
@@ skipping 53 matching lines @@
     }
     pData = FX_Alloc(uint8_t, OrigSize);
     FXSYS_memcpy(pData, m_pBuf + m_Pos, OrigSize);
     dwStreamSize = OrigSize;
     m_Pos += OrigSize;
   } else {
     uint32_t dwDestSize = OrigSize;
     dwStreamSize =
         PDF_DecodeInlineStream(m_pBuf + m_Pos, m_Size - m_Pos, width, height,
                                Decoder, pParam, pData, dwDestSize);
-    if ((int)dwStreamSize < 0) {
-      FX_Free(pData);
+    FX_Free(pData);
+    if ((int)dwStreamSize < 0)
       return NULL;
+
+    uint32_t dwSavePos = m_Pos;
+    m_Pos += dwStreamSize;
+    while (1) {
+      uint32_t dwPrevPos = m_Pos;
+      CPDF_StreamParser::SyntaxType type = ParseNextElement();
+      if (type == CPDF_StreamParser::EndOfData)
+        break;
+
+      if (type != CPDF_StreamParser::Keyword) {
+        dwStreamSize += m_Pos - dwPrevPos;
+        continue;
+      }
+      if (GetWordSize() == 2 && GetWordBuf()[0] == 'E' &&
+          GetWordBuf()[1] == 'I') {
+        m_Pos = dwPrevPos;
+        break;
+      }
+      dwStreamSize += m_Pos - dwPrevPos;
     }
-    if (bDecode) {
-      m_Pos += dwStreamSize;
-      dwStreamSize = dwDestSize;
-      if (CPDF_Array* pArray = pFilter->AsArray()) {
-        pArray->RemoveAt(0);
-        CPDF_Array* pParams = pDict->GetArrayBy("DecodeParms");
-        if (pParams)
-          pParams->RemoveAt(0);
-      } else {
-        pDict->RemoveAt("Filter");
-        pDict->RemoveAt("DecodeParms");
-      }
-    } else {
-      FX_Free(pData);
-      uint32_t dwSavePos = m_Pos;
-      m_Pos += dwStreamSize;
-      while (1) {
-        uint32_t dwPrevPos = m_Pos;
-        CPDF_StreamParser::SyntaxType type = ParseNextElement();
-        if (type == CPDF_StreamParser::EndOfData) {
-          break;
-        }
-        if (type != CPDF_StreamParser::Keyword) {
-          dwStreamSize += m_Pos - dwPrevPos;
-          continue;
-        }
-        if (GetWordSize() == 2 && GetWordBuf()[0] == 'E' &&
-            GetWordBuf()[1] == 'I') {
-          m_Pos = dwPrevPos;
-          break;
-        }
-        dwStreamSize += m_Pos - dwPrevPos;
-      }
-      m_Pos = dwSavePos;
-      pData = FX_Alloc(uint8_t, dwStreamSize);
-      FXSYS_memcpy(pData, m_pBuf + m_Pos, dwStreamSize);
-      m_Pos += dwStreamSize;
-    }
+    m_Pos = dwSavePos;
+    pData = FX_Alloc(uint8_t, dwStreamSize);
+    FXSYS_memcpy(pData, m_pBuf + m_Pos, dwStreamSize);
+    m_Pos += dwStreamSize;
   }
   pDict->SetAtInteger("Length", (int)dwStreamSize);
   return new CPDF_Stream(pData, dwStreamSize, pDict);
 }
 
 #define MAX_WORD_BUFFER 256
 #define MAX_STRING_LENGTH 32767
 
 CPDF_StreamParser::SyntaxType CPDF_StreamParser::ParseNextElement() {
   if (m_pLastObj) {
@@ skipping 70 matching lines @@
     }
   } else if (m_WordSize == 5) {
     if (memcmp(m_WordBuffer, "false", 5) == 0) {
       m_pLastObj = new CPDF_Boolean(FALSE);
       return Others;
     }
   }
   return Keyword;
 }
 
-void CPDF_StreamParser::SkipPathObject() {
-  uint32_t command_startpos = m_Pos;
-  if (!PositionIsInBounds())
-    return;
-
-  int ch = m_pBuf[m_Pos++];
-  while (1) {
-    while (PDFCharIsWhitespace(ch)) {
-      if (!PositionIsInBounds())
-        return;
-      ch = m_pBuf[m_Pos++];
-    }
-
-    if (!PDFCharIsNumeric(ch)) {
-      m_Pos = command_startpos;
-      return;
-    }
-
-    while (1) {
-      while (!PDFCharIsWhitespace(ch)) {
-        if (!PositionIsInBounds())
-          return;
-        ch = m_pBuf[m_Pos++];
-      }
-
-      while (PDFCharIsWhitespace(ch)) {
-        if (!PositionIsInBounds())
-          return;
-        ch = m_pBuf[m_Pos++];
-      }
-
-      if (PDFCharIsNumeric(ch))
-        continue;
-
-      uint32_t op_startpos = m_Pos - 1;
-      while (!PDFCharIsWhitespace(ch) && !PDFCharIsDelimiter(ch)) {
-        if (!PositionIsInBounds())
-          return;
-        ch = m_pBuf[m_Pos++];
-      }
-
-      if (IsPathOperator(&m_pBuf[op_startpos], m_Pos - 1 - op_startpos)) {
-        command_startpos = m_Pos;
-        break;
-      }
-      m_Pos = command_startpos;
-      return;
-    }
-  }
-}
-
 CPDF_Object* CPDF_StreamParser::ReadNextObject(FX_BOOL bAllowNestedArray,
                                                FX_BOOL bInArray) {
   FX_BOOL bIsNumber;
   GetNextWord(bIsNumber);
   if (m_WordSize == 0) {
     return NULL;
   }
   if (bIsNumber) {
     m_WordBuffer[m_WordSize] = 0;
     return new CPDF_Number(CFX_ByteStringC(m_WordBuffer, m_WordSize));
@@ skipping 295 matching lines @@
       m_pType3Char(nullptr),
       m_pData(nullptr),
       m_Size(0),
       m_CurrentOffset(0) {}
 
 CPDF_ContentParser::~CPDF_ContentParser() {
   if (!m_pSingleStream)
     FX_Free(m_pData);
 }
 
-void CPDF_ContentParser::Start(CPDF_Page* pPage, CPDF_ParseOptions* pOptions) {
+void CPDF_ContentParser::Start(CPDF_Page* pPage) {
   if (m_Status != Ready || !pPage || !pPage->m_pDocument ||
       !pPage->m_pFormDict) {
     m_Status = Done;
     return;
   }
   m_pObjectHolder = pPage;
   m_bForm = FALSE;
-  if (pOptions) {
-    m_Options = *pOptions;
-  }
   m_Status = ToBeContinued;
   m_InternalStage = STAGE_GETCONTENT;
   m_CurrentOffset = 0;
 
   CPDF_Object* pContent = pPage->m_pFormDict->GetDirectObjectBy("Contents");
   if (!pContent) {
     m_Status = Done;
     return;
   }
   if (CPDF_Stream* pStream = pContent->AsStream()) {
     m_nStreams = 0;
     m_pSingleStream.reset(new CPDF_StreamAcc);
     m_pSingleStream->LoadAllData(pStream, FALSE);
   } else if (CPDF_Array* pArray = pContent->AsArray()) {
     m_nStreams = pArray->GetCount();
     if (m_nStreams)
       m_StreamArray.resize(m_nStreams);
     else
       m_Status = Done;
   } else {
     m_Status = Done;
   }
 }
 
 void CPDF_ContentParser::Start(CPDF_Form* pForm,
                                CPDF_AllStates* pGraphicStates,
                                CFX_Matrix* pParentMatrix,
                                CPDF_Type3Char* pType3Char,
-                               CPDF_ParseOptions* pOptions,
                                int level) {
   m_pType3Char = pType3Char;
   m_pObjectHolder = pForm;
   m_bForm = TRUE;
   CFX_Matrix form_matrix = pForm->m_pFormDict->GetMatrixBy("Matrix");
   if (pGraphicStates) {
     form_matrix.Concat(pGraphicStates->m_CTM);
   }
   CPDF_Array* pBBox = pForm->m_pFormDict->GetArrayBy("BBox");
   CFX_FloatRect form_bbox;
   CPDF_Path ClipPath;
   if (pBBox) {
     form_bbox = pBBox->GetRect();
     ClipPath.New();
     ClipPath.AppendRect(form_bbox.left, form_bbox.bottom, form_bbox.right,
                         form_bbox.top);
     ClipPath.Transform(&form_matrix);
     if (pParentMatrix) {
       ClipPath.Transform(pParentMatrix);
     }
     form_bbox.Transform(&form_matrix);
     if (pParentMatrix) {
       form_bbox.Transform(pParentMatrix);
     }
   }
   CPDF_Dictionary* pResources = pForm->m_pFormDict->GetDictBy("Resources");
   m_pParser.reset(new CPDF_StreamContentParser(
       pForm->m_pDocument, pForm->m_pPageResources, pForm->m_pResources,
-      pParentMatrix, pForm, pResources, &form_bbox, pOptions, pGraphicStates,
-      level));
+      pParentMatrix, pForm, pResources, &form_bbox, pGraphicStates, level));
   m_pParser->GetCurStates()->m_CTM = form_matrix;
   m_pParser->GetCurStates()->m_ParentMatrix = form_matrix;
   if (ClipPath.NotNull()) {
     m_pParser->GetCurStates()->m_ClipPath.AppendPath(ClipPath, FXFILL_WINDING,
                                                      TRUE);
   }
   if (pForm->m_Transparency & PDFTRANS_GROUP) {
     CPDF_GeneralStateData* pData =
         m_pParser->GetCurStates()->m_GeneralState.GetModify();
     pData->m_BlendType = FXDIB_BLEND_NORMAL;
@@ skipping 49 matching lines @@
             pContent ? pContent->GetDirectObjectAt(m_CurrentOffset) : nullptr);
         m_StreamArray[m_CurrentOffset]->LoadAllData(pStreamObj, FALSE);
         m_CurrentOffset++;
       }
     }
     if (m_InternalStage == STAGE_PARSE) {
       if (!m_pParser) {
         m_pParser.reset(new CPDF_StreamContentParser(
             m_pObjectHolder->m_pDocument, m_pObjectHolder->m_pPageResources,
             nullptr, nullptr, m_pObjectHolder, m_pObjectHolder->m_pResources,
-            &m_pObjectHolder->m_BBox, &m_Options, nullptr, 0));
+            &m_pObjectHolder->m_BBox, nullptr, 0));
         m_pParser->GetCurStates()->m_ColorState.GetModify()->Default();
       }
       if (m_CurrentOffset >= m_Size) {
         m_InternalStage = STAGE_CHECKCLIP;
       } else {
         m_CurrentOffset +=
             m_pParser->Parse(m_pData + m_CurrentOffset,
                              m_Size - m_CurrentOffset, PARSE_STEP_LIMIT);
       }
     }
@@ skipping 35 matching lines @@
       }
       m_Status = Done;
       return;
     }
     steps++;
     if (pPause && pPause->NeedToPauseNow()) {
       break;
     }
   }
 }