Merge to XFA: FX_BOOL combo patch.

core/src/fxcodec/codec/fx_codec_jpeg.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 <setjmp.h>
 
 #include "../../../include/fxcodec/fx_codec.h"
 #include "../../../include/fxcrt/fx_safe_types.h"
@@ skipping 697 matching lines @@
     }
     if (ret != JPEG_HEADER_OK) {
         return 1;
     }
     *width = p->m_Info.image_width;
     *height = p->m_Info.image_height;
     *nComps = p->m_Info.num_components;
     _JpegLoadAttribute(&p->m_Info, pAttribute);
     return 0;
 }
-FX_BOOL CCodec_JpegModule::StartScanline(void* pContext, int down_scale)
+int CCodec_JpegModule::StartScanline(void* pContext, int down_scale)
 {
     if (m_pExtProvider) {
         return m_pExtProvider->StartScanline(pContext, down_scale);
     }
     FXJPEG_Context* p = (FXJPEG_Context*)pContext;
     if (setjmp(p->m_JumpMark) == -1) {
-        return FALSE;
+        return 0;
     }
     p->m_Info.scale_denom = down_scale;
     return jpeg_start_decompress(&p->m_Info);
 }
 FX_BOOL CCodec_JpegModule::ReadScanline(void* pContext, unsigned char* dest_buf)
 {
     if (m_pExtProvider) {
         return m_pExtProvider->ReadScanline(pContext, dest_buf);
     }
     FXJPEG_Context* p = (FXJPEG_Context*)pContext;
     if (setjmp(p->m_JumpMark) == -1) {
         return FALSE;
     }
     int nlines = jpeg_read_scanlines(&p->m_Info, &dest_buf, 1);
     return nlines == 1;
 }
 FX_DWORD CCodec_JpegModule::GetAvailInput(void* pContext, uint8_t** avail_buf_ptr)
 {
     if (m_pExtProvider) {
         return m_pExtProvider->GetAvailInput(pContext, avail_buf_ptr);
     }
     if(avail_buf_ptr != NULL) {
         *avail_buf_ptr = NULL;
         if(((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) {
             *avail_buf_ptr = (uint8_t*)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte;
         }
     }
     return (FX_DWORD)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer;
 }