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

core/src/fpdfdoc/doc_utils.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/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 static const int FPDFDOC_UTILS_MAXRECURSION = 32;
@@ skipping 227 matching lines @@
             return;
         }
         FX_DWORD dwObjNum = pDocument->AddIndirectObject(pFormDict);
         CPDF_Dictionary* pRoot = pDocument->GetRoot();
         pRoot->SetAtReference("AcroForm", pDocument, dwObjNum);
     }
     CFX_ByteString csDA;
     if (!pFormDict->KeyExist("DR")) {
         CPDF_Font* pFont = NULL;
         CFX_ByteString csBaseName, csDefault;
-        FX_BYTE charSet = CPDF_InterForm::GetNativeCharSet();
+        uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
         pFont = CPDF_InterForm::AddStandardFont(pDocument, "Helvetica");
         if (pFont != NULL) {
             AddInterFormFont(pFormDict, pDocument, pFont, csBaseName);
             csDefault = csBaseName;
         }
         if (charSet != 0) {
             CFX_ByteString csFontName = CPDF_InterForm::GetNativeFont(charSet, NULL);
             if (pFont == NULL || csFontName != "Helvetica") {
                 pFont = CPDF_InterForm::AddNativeFont(pDocument);
                 if (pFont != NULL) {
@@ skipping 143 matching lines @@
         CFX_ByteString csBaseFont;
         csBaseFont = pFind->GetBaseFont();
         csBaseFont.Remove(' ');
         if (csBaseFont == csFontName) {
             csNameTag = csKey;
             return pFind;
         }
     }
     return NULL;
 }
-CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, FX_BYTE charSet, CFX_ByteString& csNameTag)
+CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, uint8_t charSet, CFX_ByteString& csNameTag)
 {
     if (pFormDict == NULL) {
         return NULL;
     }
     CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
     if (pDR == NULL) {
         return NULL;
     }
     CPDF_Dictionary* pFonts = pDR->GetDict("Font");
     if (pFonts == NULL) {
@@ skipping 26 matching lines @@
         if (pSubst->m_Charset == (int)charSet) {
             csNameTag = csKey;
             return pFind;
         }
     }
     return NULL;
 }
 CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, CFX_ByteString& csNameTag)
 {
     csNameTag = "";
-    FX_BYTE charSet = CPDF_InterForm::GetNativeCharSet();
+    uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
     CFX_SubstFont* pSubst;
     CPDF_Font* pFont = GetDefaultInterFormFont(pFormDict, pDocument);
     if (pFont != NULL) {
         pSubst = (CFX_SubstFont*)pFont->GetSubstFont();
         if (pSubst != NULL && pSubst->m_Charset == (int)charSet) {
             FindInterFormFont(pFormDict, pFont, csNameTag);
             return pFont;
         }
     }
     return GetNativeInterFormFont(pFormDict, pDocument, charSet, csNameTag);
@@ skipping 109 matching lines @@
         pFonts = CPDF_Dictionary::Create();
         pDR->SetAt("Font", pFonts);
     }
     if (csNameTag.IsEmpty()) {
         csNameTag = pFont->GetBaseFont();
     }
     csNameTag.Remove(' ');
     csNameTag = CPDF_InterForm::GenerateNewResourceName(pDR, "Font", 4, csNameTag);
     pFonts->SetAtReference(csNameTag, pDocument, pFont->GetFontDict());
 }
-CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, FX_BYTE charSet, CFX_ByteString& csNameTag)
+CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, uint8_t charSet, CFX_ByteString& csNameTag)
 {
     if (pFormDict == NULL) {
         InitInterFormDict(pFormDict, pDocument);
     }
     CFX_ByteString csTemp;
     CPDF_Font* pFont = GetNativeInterFormFont(pFormDict, pDocument, charSet, csTemp);
     if (pFont != NULL) {
         csNameTag = csTemp;
         return pFont;
     }
     CFX_ByteString csFontName = CPDF_InterForm::GetNativeFont(charSet);
     if (!csFontName.IsEmpty()) {
         if (FindInterFormFont(pFormDict, pDocument, csFontName, pFont, csNameTag)) {
             return pFont;
         }
     }
     pFont = CPDF_InterForm::AddNativeFont(charSet, pDocument);
     if (pFont != NULL) {
         AddInterFormFont(pFormDict, pDocument, pFont, csNameTag);
     }
     return pFont;
 }
 CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, CFX_ByteString& csNameTag)
 {
-    FX_BYTE charSet = CPDF_InterForm::GetNativeCharSet();
+    uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
     return AddNativeInterFormFont(pFormDict, pDocument, charSet, csNameTag);
 }
 void RemoveInterFormFont(CPDF_Dictionary* pFormDict, const CPDF_Font* pFont)
 {
     if (pFormDict == NULL || pFont == NULL) {
         return;
     }
     CFX_ByteString csTag;
     if (!FindInterFormFont(pFormDict, pFont, csTag)) {
         return;
@@ skipping 96 matching lines @@
     CPDF_Object* pAttr = pFieldDict->GetElementValue(name);
     if (pAttr) {
         return pAttr;
     }
     CPDF_Dictionary* pParent = pFieldDict->GetDict("Parent");
     if (pParent == NULL) {
         return NULL;
     }
     return FPDF_GetFieldAttr(pParent, name, nLevel + 1);
 }