Merge to XFA: FX_BOOL combo patch.

core/src/fxcodec/codec/codec_int.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_SRC_FXCODEC_CODEC_CODEC_INT_H_
 #define CORE_SRC_FXCODEC_CODEC_CODEC_INT_H_
 
 #include <limits.h>
@@ skipping 134 matching lines @@
     ICodec_ScanlineDecoder*     CreateDecoder(const uint8_t* src_buf, FX_DWORD src_size,
                                           int width, int height, int nComps, FX_BOOL ColorTransform);
     FX_BOOL             LoadInfo(const uint8_t* src_buf, FX_DWORD src_size, int& width, int& height,
                          int& num_components, int& bits_per_components, FX_BOOL& color_transform,
                          uint8_t** icc_buf_ptr, FX_DWORD* icc_length);
     FX_BOOL             Encode(const CFX_DIBSource* pSource, uint8_t*& dest_buf, FX_STRSIZE& dest_size, int quality, const uint8_t* icc_buf, FX_DWORD icc_length);
     virtual void*               Start();
     virtual void                Finish(void* pContext);
     virtual void                Input(void* pContext, const uint8_t* src_buf, FX_DWORD src_size);
     virtual int                 ReadHeader(void* pContext, int* width, int* height, int* nComps, CFX_DIBAttribute* pAttribute = NULL);
-    virtual FX_BOOL             StartScanline(void* pContext, int down_scale);
+    virtual int                 StartScanline(void* pContext, int down_scale);
     virtual FX_BOOL             ReadScanline(void* pContext, uint8_t* dest_buf);
     virtual FX_DWORD    GetAvailInput(void* pContext, uint8_t** avail_buf_ptr);
 protected:
     IFX_JpegProvider* m_pExtProvider;
 };
 #define PNG_ERROR_SIZE 256
 class CCodec_PngModule : public ICodec_PngModule
 {
 public:
     CCodec_PngModule()
@@ skipping 211 matching lines @@
     OPJ_SIZE_T     offset;
 };
 
 /* Wrappers for C-style callbacks. */
 OPJ_SIZE_T opj_read_from_memory (void* p_buffer, OPJ_SIZE_T nb_bytes,  void* p_user_data);
 OPJ_SIZE_T opj_write_from_memory (void* p_buffer, OPJ_SIZE_T nb_bytes, void* p_user_data);
 OPJ_OFF_T opj_skip_from_memory (OPJ_OFF_T nb_bytes, void* p_user_data);
 OPJ_BOOL opj_seek_from_memory (OPJ_OFF_T nb_bytes, void* p_user_data);
 
 #endif  // CORE_SRC_FXCODEC_CODEC_CODEC_INT_H_