Merge to XFA: Use stdint.h types throughout PDFium.

core/src/fxcodec/codec/fx_codec_bmp.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 "../../../include/fxcodec/fx_codec.h"
 #include "../../../include/fxge/fx_dib.h"
 #include "codec_int.h"
 #include "../lbmp/fx_bmp.h"
@@ skipping 15 matching lines @@
         if(p != NULL) {
             FX_Free(p);
         }
     }
 };
 static void _bmp_error_data(bmp_decompress_struct_p bmp_ptr, FX_LPCSTR err_msg)
 {
     FXSYS_strncpy((char*)bmp_ptr->err_ptr, err_msg, BMP_MAX_ERROR_SIZE - 1);
     longjmp(bmp_ptr->jmpbuf, 1);
 }
-static void _bmp_read_scanline(bmp_decompress_struct_p bmp_ptr, FX_INT32 row_num, FX_LPBYTE row_buf)
+static void _bmp_read_scanline(bmp_decompress_struct_p bmp_ptr, int32_t row_num, FX_LPBYTE row_buf)
 {
     FXBMP_Context* p = (FXBMP_Context*)bmp_ptr->context_ptr;
     CCodec_BmpModule* pModule = (CCodec_BmpModule*)p->parent_ptr;
     pModule->ReadScanlineCallback(p->child_ptr, row_num, row_buf);
 }
 static FX_BOOL _bmp_get_data_position(bmp_decompress_struct_p bmp_ptr, FX_DWORD rcd_pos)
 {
     FXBMP_Context* p = (FXBMP_Context*)bmp_ptr->context_ptr;
     CCodec_BmpModule* pModule = (CCodec_BmpModule*)p->parent_ptr;
     return pModule->InputImagePositionBufCallback(p->child_ptr, rcd_pos);
 }
 void* CCodec_BmpModule::Start(void* pModule)
 {
-    FXBMP_Context* p = (FXBMP_Context*)FX_Alloc(FX_BYTE, sizeof(FXBMP_Context));
+    FXBMP_Context* p = (FXBMP_Context*)FX_Alloc(uint8_t, sizeof(FXBMP_Context));
     if (p == NULL) {
         return NULL;
     }
     FXSYS_memset32(p, 0, sizeof(FXBMP_Context));
     if(p == NULL) {
         return NULL;
     }
     p->m_AllocFunc = _bmp_alloc_func;
     p->m_FreeFunc = _bmp_free_func;
     p->bmp_ptr = NULL;
@@ skipping 12 matching lines @@
     return p;
 }
 void CCodec_BmpModule::Finish(void* pContext)
 {
     FXBMP_Context* p = (FXBMP_Context*)pContext;
     if(p != NULL) {
         _bmp_destroy_decompress(&p->bmp_ptr);
         p->m_FreeFunc(p);
     }
 }
-FX_INT32 CCodec_BmpModule::ReadHeader(void* pContext, FX_INT32* width, FX_INT32* height, FX_BOOL* tb_flag, FX_INT32* components, FX_INT32* pal_num, FX_DWORD** pal_pp, CFX_DIBAttribute* pAttribute)
+int32_t CCodec_BmpModule::ReadHeader(void* pContext, int32_t* width, int32_t* height, FX_BOOL* tb_flag, int32_t* components, int32_t* pal_num, FX_DWORD** pal_pp, CFX_DIBAttribute* pAttribute)
 {
     FXBMP_Context* p = (FXBMP_Context*)pContext;
     if(setjmp(p->bmp_ptr->jmpbuf)) {
         return 0;
     }
-    FX_INT32 ret = _bmp_read_header(p->bmp_ptr);
+    int32_t ret = _bmp_read_header(p->bmp_ptr);
     if (ret != 1) {
         return ret;
     }
     *width = p->bmp_ptr->width;
     *height = p->bmp_ptr->height;
     *tb_flag = p->bmp_ptr->imgTB_flag;
     *components = p->bmp_ptr->components;
     *pal_num = p->bmp_ptr->pal_num;
     *pal_pp = p->bmp_ptr->pal_ptr;
     if (pAttribute) {
         pAttribute->m_wDPIUnit = FXCODEC_RESUNIT_METER;
         pAttribute->m_nXDPI = p->bmp_ptr->dpi_x;
         pAttribute->m_nYDPI = p->bmp_ptr->dpi_y;
         pAttribute->m_nBmpCompressType = p->bmp_ptr->compress_flag;
     }
     return 1;
 }
-FX_INT32 CCodec_BmpModule::LoadImage(void* pContext)
+int32_t CCodec_BmpModule::LoadImage(void* pContext)
 {
     FXBMP_Context* p = (FXBMP_Context*)pContext;
     if(setjmp(p->bmp_ptr->jmpbuf)) {
         return 0;
     }
     return _bmp_decode_image(p->bmp_ptr);
 }
 FX_DWORD CCodec_BmpModule::GetAvailInput(void* pContext, FX_LPBYTE* avial_buf_ptr)
 {
     FXBMP_Context* p = (FXBMP_Context*)pContext;
     return _bmp_get_avail_input(p->bmp_ptr, avial_buf_ptr);
 }
 void CCodec_BmpModule::Input(void* pContext, FX_LPCBYTE src_buf, FX_DWORD src_size)
 {
     FXBMP_Context* p = (FXBMP_Context*)pContext;
     _bmp_input_buffer(p->bmp_ptr, (FX_LPBYTE)src_buf, src_size);
 }