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

core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.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/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../fpdf_page/pageint.h"
 #include <limits.h>
@@ skipping 160 matching lines @@
     0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
     0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
     0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
     0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
     0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
     0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
     0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
     0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9,
 };
 typedef struct {
-    FX_BYTE             m_Charset;
+    uint8_t             m_Charset;
     const FX_WCHAR*     m_pUnicodes;
 } FX_CharsetUnicodes;
 const FX_CharsetUnicodes g_FX_CharsetUnicodes[] = {
     { FXFONT_THAI_CHARSET, g_FX_CP874Unicodes },
     { FXFONT_EASTEUROPE_CHARSET, g_FX_CP1250Unicodes },
     { FXFONT_RUSSIAN_CHARSET, g_FX_CP1251Unicodes },
     { FXFONT_GREEK_CHARSET, g_FX_CP1253Unicodes },
     { FXFONT_TURKISH_CHARSET, g_FX_CP1254Unicodes },
     { FXFONT_HEBREW_CHARSET, g_FX_CP1255Unicodes },
     { FXFONT_ARABIC_CHARSET, g_FX_CP1256Unicodes },
@@ skipping 230 matching lines @@
     pFontDesc->SetAtInteger("StemV", pLogFont->lfWeight / 5);
     AddIndirectObject(pFontDesc);
     pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
     hFont = SelectObject(hDC, hFont);
     DeleteObject(hFont);
     DeleteDC(hDC);
     return LoadFont(pBaseDict);
 }
 #endif
 #if (_FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_)
-FX_UINT32 FX_GetLangHashCode( FX_LPCSTR pStr)
+uint32_t FX_GetLangHashCode( FX_LPCSTR pStr)
 {
     FXSYS_assert( pStr != NULL);
-    FX_INT32 iLength = FXSYS_strlen(pStr);
+    int32_t iLength = FXSYS_strlen(pStr);
     FX_LPCSTR pStrEnd = pStr + iLength;
-    FX_UINT32 uHashCode = 0;
+    uint32_t uHashCode = 0;
     while ( pStr < pStrEnd) {
         uHashCode = 31 * uHashCode + tolower(*pStr++);
     }
     return uHashCode;
 }
 struct FX_LANG2CS {
     FX_DWORD    uLang;
     int         uCharset;
 }*FX_LPLANG2CS;
 static const FX_LANG2CS gs_FXLang2CharsetTable[] = {
@@ skipping 57 matching lines @@
     {3734, 204},
     {3741, 178},
     {3749, 162},
     {3763, 163},
     {3886, 134},
     {105943, 0},
     {106375, 1},
     {3923451837, 134},
     {3923451838, 136},
 };
-static FX_WORD FX_GetCsFromLangCode(FX_UINT32 uCode)
+static FX_WORD FX_GetCsFromLangCode(uint32_t uCode)
 {
-    FX_INT32 iStart = 0;
-    FX_INT32 iEnd = sizeof(gs_FXLang2CharsetTable) / sizeof(FX_LANG2CS) - 1;
+    int32_t iStart = 0;
+    int32_t iEnd = sizeof(gs_FXLang2CharsetTable) / sizeof(FX_LANG2CS) - 1;
     while (iStart <= iEnd) {
-        FX_INT32 iMid = (iStart + iEnd) / 2;
+        int32_t iMid = (iStart + iEnd) / 2;
         const FX_LANG2CS &charset = gs_FXLang2CharsetTable[iMid];
         if (uCode == charset.uLang) {
             return charset.uCharset;
         } else if (uCode < charset.uLang) {
             iEnd = iMid - 1;
         } else {
             iStart = iMid + 1;
         }
     };
     return 0;
 }
-static FX_WORD FX_GetCharsetFromLang(FX_LPCSTR pLang, FX_INT32 iLength)
+static FX_WORD FX_GetCharsetFromLang(FX_LPCSTR pLang, int32_t iLength)
 {
     FXSYS_assert(pLang);
     if (iLength < 0) {
         iLength = FXSYS_strlen(pLang);
     }
-    FX_UINT32 uHash = FX_GetLangHashCode(pLang);
+    uint32_t uHash = FX_GetLangHashCode(pLang);
     return FX_GetCsFromLangCode(uHash);
 }
 static void _CFString2CFXByteString(CFStringRef src, CFX_ByteString &dest)
 {
     SInt32 len =  CFStringGetLength(src);
     CFRange range = CFRangeMake(0, len);
     CFIndex used = 0;
     UInt8* pBuffer = (UInt8*)calloc(len+1, sizeof(UInt8));
     CFStringGetBytes(src, range, kCFStringEncodingASCII, 0, false, pBuffer, len, &used);
     dest = (FX_LPSTR)pBuffer;
@@ skipping 472 matching lines @@
     pFontDesc->SetAtInteger("Ascent", pFont->GetAscent());
     pFontDesc->SetAtInteger("Descent", pFont->GetDescent());
     FX_RECT bbox;
     pFont->GetBBox(bbox);
     CPDF_Array* pBBox = new CPDF_Array;
     pBBox->AddInteger(bbox.left);
     pBBox->AddInteger(bbox.bottom);
     pBBox->AddInteger(bbox.right);
     pBBox->AddInteger(bbox.top);
     pFontDesc->SetAt("FontBBox", pBBox);
-    FX_INT32 nStemV = 0;
+    int32_t nStemV = 0;
     if (pFont->m_pSubstFont) {
         nStemV = pFont->m_pSubstFont->m_Weight / 5;
     } else {
         static const FX_CHAR stem_chars[] = {'i', 'I', '!', '1'};
         const size_t count = sizeof(stem_chars) / sizeof(stem_chars[0]);
         FX_DWORD glyph = pEncoding->GlyphFromCharCode(stem_chars[0]);
         nStemV = pFont->GetGlyphWidth(glyph);
         for (size_t i = 1; i < count; i++) {
             glyph = pEncoding->GlyphFromCharCode(stem_chars[i]);
             int width = pFont->GetGlyphWidth(glyph);
@@ skipping 132 matching lines @@
 void FPDFAPI_FlatPageAttr(CPDF_Dictionary* pPageDict, FX_BSTR name)
 {
     if (pPageDict->KeyExist(name)) {
         return;
     }
     CPDF_Object* pObj = FPDFAPI_GetPageAttr(pPageDict, name);
     if (pObj) {
         pPageDict->SetAt(name, pObj->Clone());
     }
 }