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

core/src/fxge/ge/fx_ge_font.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/fxge/fx_ge.h"
 #include "../../../include/fxge/fx_freetype.h"
 #include "text_int.h"
 #define EM_ADJUST(em, a) (em == 0?(a): (a)*1000/em)
@@ skipping 119 matching lines @@
         int res = pFile->ReadBlock(buffer, offset, count);
         if (res) {
             return count;
         }
         return 0;
     }
     void _FTStreamClose(FXFT_Stream stream)
     {
     }
 };
-FX_BOOL _LoadFile(FXFT_Library library, FXFT_Face* Face, IFX_FileRead* pFile, FXFT_Stream* stream, FX_INT32 faceIndex = 0)
+FX_BOOL _LoadFile(FXFT_Library library, FXFT_Face* Face, IFX_FileRead* pFile, FXFT_Stream* stream, int32_t faceIndex = 0)
 {
-    FXFT_Stream stream1 = (FXFT_Stream)FX_Alloc(FX_BYTE, sizeof (FXFT_StreamRec));
+    FXFT_Stream stream1 = (FXFT_Stream)FX_Alloc(uint8_t, sizeof (FXFT_StreamRec));
     stream1->base = NULL;
     stream1->size = (unsigned long)pFile->GetSize();
     stream1->pos = 0;
     stream1->descriptor.pointer = pFile;
     stream1->close = _FTStreamClose;
     stream1->read = _FTStreamRead;
     FXFT_Open_Args args;
     args.flags = FT_OPEN_STREAM;
     args.stream = stream1;
     if (FXFT_Open_Face(library, &args, faceIndex, Face)) {
@@ skipping 49 matching lines @@
         return NULL;
     }
     error = FXFT_Set_Pixel_Sizes(face, 64, 64);
     if (error) {
         return NULL;
     }
     return face;
 }
 FX_BOOL CFX_Font::LoadEmbedded(FX_LPCBYTE data, FX_DWORD size)
 {
-    m_pFontDataAllocation = FX_Alloc(FX_BYTE, size);
+    m_pFontDataAllocation = FX_Alloc(uint8_t, size);
     FXSYS_memcpy32(m_pFontDataAllocation, data, size);
     m_Face = FT_LoadFont((FX_LPBYTE)m_pFontDataAllocation, size);
     m_pFontData = (FX_LPBYTE)m_pFontDataAllocation;
     m_bEmbedded = TRUE;
     m_dwSize = size;
     return m_Face != NULL;
 }
 FX_BOOL CFX_Font::IsTTFont()
 {
     if (m_Face == NULL) {
@@ skipping 408 matching lines @@
     }
     static int s_count = sizeof(gs_EncodingID) / sizeof(FX_DWORD);
     for (int i = 0; i < s_count; i++) {
         IFX_FontEncodingEx* pFontEncoding = _FXFM_CreateFontEncoding(pFont, gs_EncodingID[i]);
         if (pFontEncoding) {
             return pFontEncoding;
         }
     }
     return NULL;
 }