XFA: merge patch from issue 801913002 and 804463003

fpdfsdk/src/fpdfview.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/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fpdfview.h"
 #include "../include/fsdk_rendercontext.h"
@@ skipping 193 matching lines @@
                                                         FX_BOOL bVertical,
                                                         CPDF_SubstFont* pSubstFont                      // [OUT] Subst font data
                                                 );
 
         FT_Face m_SysFace;
 };
 
 CFontMapper* g_pFontMapper = NULL;
 #endif          // #if _FX_OS_ == _FX_LINUX_EMBEDDED_
 
-DLLEXPORT void STDCALL FPDF_InitLibrary(FX_LPVOID hInstance)
+DLLEXPORT void STDCALL FPDF_InitLibrary()
 {
-#ifdef API5
-        CPDF_ModuleMgr::Create();
-        g_pModuleMgr = CPDF_ModuleMgr::Get();
-         #if _FX_OS_ == _FX_WIN32_MOBILE_ || _FX_OS_ == _FX_LINUX_EMBEDDED_
-                g_pModuleMgr->InitEmbedded();
-         #ifdef _GB1_CMAPS_
-                g_pModuleMgr->LoadEmbeddedGB1CMaps();
-         #endif
-         #ifdef _GB1_CMAPS_4_
-                g_pModuleMgr->LoadEmbeddedGB1CMaps_4();
-         #endif
-         #ifdef _CNS1_CMAPS_
-                g_pModuleMgr->LoadEmbeddedCNS1CMaps();
-         #endif
-         #ifdef _JAPAN1_CMAPS_
-                g_pModuleMgr->LoadEmbeddedJapan1CMaps();
-         #endif
-         #ifdef _JAPAN1_CMAPS_6_
-                g_pModuleMgr->LoadEmbeddedJapan1CMaps_6();
-         #endif
-         #ifdef _KOREA1_CMAPS_
-                g_pModuleMgr->LoadEmbeddedKorea1CMaps();
-         #endif
-         #ifdef _JPX_DECODER_
-                g_pModuleMgr->InitJpxModule();
-                g_pModuleMgr->InitJbig2Module();
-         //     g_pModuleMgr->InitIccModule();
-         #endif
-         #else
-                g_pModuleMgr->InitDesktop();
-         #endif
-#else
         g_pCodecModule = CCodec_ModuleMgr::Create();
         
         CFX_GEModule::Create();
         CFX_GEModule::Get()->SetCodecModule(g_pCodecModule);
         
         CPDF_ModuleMgr::Create();
         CPDF_ModuleMgr::Get()->SetCodecModule(g_pCodecModule);
         CPDF_ModuleMgr::Get()->InitPageModule();
         CPDF_ModuleMgr::Get()->InitRenderModule();
-#ifdef FOXIT_CHROME_BUILD
-        CPDF_ModuleMgr * pModuleMgr = CPDF_ModuleMgr::Get();
-        if ( pModuleMgr )
-        {
-                pModuleMgr->LoadEmbeddedGB1CMaps();
-                pModuleMgr->LoadEmbeddedJapan1CMaps();
-                pModuleMgr->LoadEmbeddedCNS1CMaps();
-                pModuleMgr->LoadEmbeddedKorea1CMaps();
-        }
-#endif 
-#endif
 
         CPDFXFA_App* pAppProvider = FPDFXFA_GetApp();
         pAppProvider->Initialize();
-
-#ifdef _WIN32
-        // Get module path
-        TCHAR app_path[MAX_PATH];
-        ::GetModuleFileName((HINSTANCE)hInstance, app_path, MAX_PATH);
-        size_t len = _tcslen(app_path);
-        for (size_t i = len; i >= 0; i --)
-                if (app_path[i] == '\\') {
-                        app_path[i] = 0;
-                        break;
-                }
-                
-#ifdef _UNICODE
-                #ifndef _FXSDK_OPENSOURCE_
-                CPDF_ModuleMgr::Get()->SetModulePath(NULL, CFX_ByteString::FromUnicode(app_path));
-                #endif
-#else
-#ifndef _FXSDK_OPENSOURCE_
-                CPDF_ModuleMgr::Get()->SetModulePath(NULL, app_path);
-#endif
-#endif
-#endif
 }
 
 
 DLLEXPORT void STDCALL FPDF_DestroyLibrary()
 {
         FPDFXFA_ReleaseApp();
 
 #if _FX_OS_ == _FX_LINUX_EMBEDDED_
         if (g_pFontMapper) delete g_pFontMapper;
 #endif
 #ifdef API5
         g_pModuleMgr->Destroy();
 #else
         CPDF_ModuleMgr::Destroy();
         CFX_GEModule::Destroy();
         g_pCodecModule->Destroy();
 #endif
-#ifndef _FXSDK_OPENSOURCE_
-        FXMEM_CollectAll(FXMEM_GetDefaultMgr());
-#else
-
-#endif
 }
 
 #ifndef _WIN32
 int g_LastError;
 void SetLastError(int err)
 {
         g_LastError = err;
 }
 
 int GetLastError()
@@ skipping 532 matching lines @@
 
 DLLEXPORT void STDCALL FPDFBitmap_Destroy(FPDF_BITMAP bitmap)
 {
         if (bitmap == NULL) return;
         delete (CFX_DIBitmap*)bitmap;
 }
 
 void FPDF_RenderPage_Retail(CRenderContext* pContext, FPDF_PAGE page, int start_x, int start_y, int size_x, int size_y,
                                                 int rotate, int flags,FX_BOOL bNeedToRestore, IFSDK_PAUSE_Adapter * pause )
 {
-//#ifdef _LICENSED_BUILD_
         CPDF_Page* pPage = ((CPDFXFA_Page*)page)->GetPDFPage();
         if (pPage == NULL) return;
 
         if (!pContext->m_pOptions)
                 pContext->m_pOptions = new CPDF_RenderOptions;
 //      CPDF_RenderOptions options;
         if (flags & FPDF_LCD_TEXT)
                 pContext->m_pOptions->m_Flags |= RENDER_CLEARTYPE;
         else
                 pContext->m_pOptions->m_Flags &= ~RENDER_CLEARTYPE;
@@ skipping 185 matching lines @@
                 return -1;
 
         if (str->str)
         {
                 FX_Free(str->str);
                 str->str = NULL;
         }
         str->len = 0;
         return 0;
 }