Manual fixups to PDF_ENABLE_XFA in core/

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 "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
 #include "text_int.h"
 
 #define EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em)
 
 #ifdef PDF_ENABLE_XFA
 extern void _FPDFAPI_GetInternalFontData(int id1,
                                          const uint8_t*& data,
                                          FX_DWORD& size);
+#endif  // PDF_ENABLE_XFA
 
-#endif
 namespace {
 
 #ifdef PDF_ENABLE_XFA
 const FX_DWORD g_EncodingID[] = {
   FXFM_ENCODING_MS_SYMBOL,
   FXFM_ENCODING_UNICODE,
   FXFM_ENCODING_MS_SJIS,
   FXFM_ENCODING_MS_GB2312,
   FXFM_ENCODING_MS_BIG5,
   FXFM_ENCODING_MS_WANSUNG,
   FXFM_ENCODING_MS_JOHAB,
   FXFM_ENCODING_ADOBE_STANDARD,
   FXFM_ENCODING_ADOBE_EXPERT,
   FXFM_ENCODING_ADOBE_CUSTOM,
   FXFM_ENCODING_ADOBE_LATIN_1,
   FXFM_ENCODING_OLD_LATIN_2,
   FXFM_ENCODING_APPLE_ROMAN,
 };
 
 CFX_UnicodeEncodingEx* _FXFM_CreateFontEncoding(CFX_Font* pFont,
                                                 FX_DWORD nEncodingID) {
   if (FXFT_Select_Charmap(pFont->GetFace(), nEncodingID))
     return nullptr;
   return new CFX_UnicodeEncodingEx(pFont, nEncodingID);
 }
+#endif  // PDF_ENABLE_XFA
 
-#endif
 FXFT_Face FT_LoadFont(const uint8_t* pData, int size) {
   return CFX_GEModule::Get()->GetFontMgr()->GetFixedFace(pData, size, 0);
 }
 
 }  // namespace
 
 CFX_Font::CFX_Font() {
   m_pSubstFont = NULL;
   m_Face = NULL;
   m_bEmbedded = FALSE;
   m_bVertical = FALSE;
   m_pFontData = NULL;
   m_pFontDataAllocation = NULL;
   m_dwSize = 0;
-#ifdef PDF_ENABLE_XFA
-  m_pOwnedStream = NULL;
-#endif
   m_pGsubData = NULL;
   m_pPlatformFont = NULL;
   m_pPlatformFontCollection = NULL;
   m_pDwFont = NULL;
   m_hHandle = NULL;
   m_bDwLoaded = FALSE;
 #ifdef PDF_ENABLE_XFA
   m_bLogic = FALSE;
+  m_pOwnedStream = NULL;
+#endif  // PDF_ENABLE_XFA
 }
+
+#ifdef PDF_ENABLE_XFA
 FX_BOOL CFX_Font::LoadClone(const CFX_Font* pFont) {
   if (pFont == NULL) {
     return FALSE;
   }
   m_bLogic = TRUE;
   if (pFont->m_pSubstFont) {
     m_pSubstFont = new CFX_SubstFont;
     m_pSubstFont->m_Charset = pFont->m_pSubstFont->m_Charset;
     m_pSubstFont->m_ExtHandle = pFont->m_pSubstFont->m_ExtHandle;
     m_pSubstFont->m_SubstFlags = pFont->m_pSubstFont->m_SubstFlags;
@@ skipping 11 matching lines @@
   m_dwSize = pFont->m_dwSize;
   m_pFontData = pFont->m_pFontData;
   m_pGsubData = pFont->m_pGsubData;
   m_pPlatformFont = pFont->m_pPlatformFont;
   m_pPlatformFontCollection = pFont->m_pPlatformFontCollection;
   m_pDwFont = pFont->m_pDwFont;
   m_hHandle = pFont->m_hHandle;
   m_bDwLoaded = pFont->m_bDwLoaded;
   m_pOwnedStream = pFont->m_pOwnedStream;
   return TRUE;
-#endif
+#endif  // PDF_ENABLE_XFA
 }
 CFX_Font::~CFX_Font() {
   delete m_pSubstFont;
   m_pSubstFont = NULL;
 #ifndef PDF_ENABLE_XFA
   FX_Free(m_pFontDataAllocation);
   m_pFontDataAllocation = NULL;
 #else
   if (m_bLogic) {
     m_OtfFontData.DetachBuffer();
     return;
   }
-#endif
+#endif  // PDF_ENABLE_XFA
   if (m_Face) {
 #ifndef PDF_ENABLE_XFA
     if (FXFT_Get_Face_External_Stream(m_Face)) {
       FXFT_Clear_Face_External_Stream(m_Face);
     }
-#endif
+#endif  // PDF_ENABLE_XFA
     if (m_bEmbedded) {
       DeleteFace();
     } else {
       CFX_GEModule::Get()->GetFontMgr()->ReleaseFace(m_Face);
     }
   }
 #ifdef PDF_ENABLE_XFA
   FX_Free(m_pOwnedStream);
   m_pOwnedStream = NULL;
-#endif
+#endif  // PDF_ENABLE_XFA
   FX_Free(m_pGsubData);
   m_pGsubData = NULL;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   ReleasePlatformResource();
 #endif
 }
 void CFX_Font::DeleteFace() {
   FXFT_Done_Face(m_Face);
   m_Face = NULL;
 }
@@ skipping 76 matching lines @@
   FXFT_Stream stream = nullptr;
   if (!_LoadFile(library, &m_Face, pFile, &stream, nFaceIndex))
     return FALSE;
 
   if (pFaceCount)
     *pFaceCount = (int)m_Face->num_faces;
   m_pOwnedStream = stream;
   FXFT_Set_Pixel_Sizes(m_Face, 0, 64);
   return TRUE;
 }
-#endif
+#endif  // PDF_ENABLE_XFA
 
 int CFX_Font::GetGlyphWidth(FX_DWORD glyph_index) {
   if (!m_Face) {
     return 0;
   }
   if (m_pSubstFont && (m_pSubstFont->m_SubstFlags & FXFONT_SUBST_MM)) {
     AdjustMMParams(glyph_index, 0, 0);
   }
   int err = FXFT_Load_Glyph(
       m_Face, glyph_index,
@@ skipping 235 matching lines @@
 
   if (m_pFont->GetSubstFont() && m_pFont->GetSubstFont()->m_Charset == 2) {
     FX_DWORD index = 0;
     if (FXFT_Select_Charmap(face, FXFT_ENCODING_MS_SYMBOL) == 0)
       index = FXFT_Get_Char_Index(face, charcode);
     if (!index && !FXFT_Select_Charmap(face, FXFT_ENCODING_APPLE_ROMAN))
       return FXFT_Get_Char_Index(face, charcode);
   }
   return charcode;
 }
+
 #ifdef PDF_ENABLE_XFA
-
 CFX_UnicodeEncodingEx::CFX_UnicodeEncodingEx(CFX_Font* pFont,
                                              FX_DWORD EncodingID)
     : CFX_UnicodeEncoding(pFont), m_nEncodingID(EncodingID) {
 }
 
 CFX_UnicodeEncodingEx::~CFX_UnicodeEncodingEx() {
 }
 
 FX_DWORD CFX_UnicodeEncodingEx::GlyphFromCharCode(FX_DWORD charcode) {
   FXFT_Face face = m_pFont->GetFace();
@@ skipping 51 matching lines @@
 
   for (size_t i = 0; i < FX_ArraySize(g_EncodingID); ++i) {
     CFX_UnicodeEncodingEx* pFontEncoding =
         _FXFM_CreateFontEncoding(pFont, g_EncodingID[i]);
     if (pFontEncoding) {
       return pFontEncoding;
     }
   }
   return NULL;
 }
-#endif
+#endif  // PDF_ENABLE_XFA