Merge to XFA: FX_BOOL combo patch.

core/src/fxcodec/codec/fx_codec_flate.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 "../../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../../../third_party/zlib_v128/zlib.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "../../../include/fxcodec/fx_codec_flate.h"
@@ skipping 66 matching lines @@
     void FPDFAPI_FlateEnd(void* context)
     {
         inflateEnd((z_stream*)context);
         ((z_stream*)context)->zfree(0, context);
     }
 }  // extern "C"
 
 class CLZWDecoder
 {
 public:
-    FX_BOOL Decode(uint8_t* output, FX_DWORD& outlen, const uint8_t* input, FX_DWORD& size, FX_BOOL bEarlyChange);
+    int Decode(uint8_t* output, FX_DWORD& outlen, const uint8_t* input, FX_DWORD& size, FX_BOOL bEarlyChange);
+
 private:
+    void AddCode(FX_DWORD prefix_code, uint8_t append_char);
+    void DecodeString(FX_DWORD code);
+
     FX_DWORD    m_InPos;
     FX_DWORD    m_OutPos;
     uint8_t*    m_pOutput;
     const uint8_t*      m_pInput;
     FX_BOOL             m_Early;
-    void                AddCode(FX_DWORD prefix_code, uint8_t append_char);
     FX_DWORD    m_CodeArray[5021];
     FX_DWORD    m_nCodes;
     uint8_t             m_DecodeStack[4000];
     FX_DWORD    m_StackLen;
-    void                DecodeString(FX_DWORD code);
     int                 m_CodeLen;
 };
 void CLZWDecoder::AddCode(FX_DWORD prefix_code, uint8_t append_char)
 {
     if (m_nCodes + m_Early == 4094) {
         return;
     }
     m_CodeArray[m_nCodes ++] = (prefix_code << 16) | append_char;
     if (m_nCodes + m_Early == 512 - 258) {
         m_CodeLen = 10;
@@ skipping 799 matching lines @@
 }
 FX_BOOL CCodec_FlateModule::Encode(const uint8_t* src_buf, FX_DWORD src_size, uint8_t*& dest_buf, FX_DWORD& dest_size)
 {
     dest_size = src_size + src_size / 1000 + 12;
     dest_buf = FX_Alloc( uint8_t, dest_size);
     unsigned long temp_size = dest_size;
     FPDFAPI_FlateCompress(dest_buf, &temp_size, src_buf, src_size);
     dest_size = (FX_DWORD)temp_size;
     return TRUE;
 }