Merge to XFA: Get rid of gotos in CPDF_SyntaxParser and FlateUncompress().

core/include/fpdfapi/fpdf_parser.h

 // 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
 
 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 
 #include "../fxcrt/fx_system.h"
@@ skipping 435 matching lines @@
   CPDF_Document* m_pDocument;
 
   CPDF_SyntaxParser m_Syntax;
   FX_BOOL m_bOwnFileRead;
   CPDF_Object* ParseDirect(CPDF_Object* pObj);
 
   FX_BOOL LoadAllCrossRefV4(FX_FILESIZE pos);
 
   FX_BOOL LoadAllCrossRefV5(FX_FILESIZE pos);
 
-  FX_BOOL LoadCrossRefV4(FX_FILESIZE pos,
-                         FX_FILESIZE streampos,
-                         FX_BOOL bSkip,
-                         FX_BOOL bFirst);
+  bool LoadCrossRefV4(FX_FILESIZE pos,
+                      FX_FILESIZE streampos,
+                      FX_BOOL bSkip,
+                      FX_BOOL bFirst);
 
   FX_BOOL LoadCrossRefV5(FX_FILESIZE pos, FX_FILESIZE& prev, FX_BOOL bMainXRef);
 
   CPDF_Dictionary* LoadTrailerV4();
 
   FX_BOOL RebuildCrossRef();
 
   FX_DWORD SetEncryptHandler();
 
   void ReleaseEncryptHandler();
 
   FX_BOOL LoadLinearizedAllCrossRefV4(FX_FILESIZE pos, FX_DWORD dwObjCount);
 
   FX_BOOL LoadLinearizedCrossRefV4(FX_FILESIZE pos, FX_DWORD dwObjCount);
 
   FX_BOOL LoadLinearizedAllCrossRefV5(FX_FILESIZE pos);
 
   FX_DWORD LoadLinearizedMainXRefTable();
 
   CFX_MapPtrToPtr m_ObjectStreamMap;
 
   CPDF_StreamAcc* GetObjectStream(FX_DWORD number);
 
   FX_BOOL IsLinearizedFile(IFX_FileRead* pFileAccess, FX_DWORD offset);
 
+  bool FindPosInOffsets(FX_FILESIZE pos) const;
+
   int m_FileVersion;
 
   CPDF_Dictionary* m_pTrailer;
 
   CPDF_Dictionary* m_pEncryptDict;
   void SetEncryptDictionary(CPDF_Dictionary* pDict);
 
   FX_FILESIZE m_LastXRefOffset;
 
   FX_BOOL m_bXRefStream;
@@ skipping 434 matching lines @@
                        FX_DWORD src_size,
                        const CPDF_Dictionary* pDict,
                        uint8_t*& dest_buf,
                        FX_DWORD& dest_size,
                        CFX_ByteString& ImageEncoding,
                        CPDF_Dictionary*& pImageParms,
                        FX_DWORD estimated_size,
                        FX_BOOL bImageAcc);
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_