diff options
author | John Abd-El-Malek <jam@chromium.org> | 2014-12-12 16:42:18 -0800 |
---|---|---|
committer | John Abd-El-Malek <jam@chromium.org> | 2014-12-12 16:42:18 -0800 |
commit | 217ecf3b39f8d5c01260684848a8886c8ed2bf89 (patch) | |
tree | 1ab05e729480f2d8fab6882285c2e169c8ba007e /fpdfsdk/include | |
parent | 239955073722582152d9ab190794317dd775a1c1 (diff) | |
download | pdfium-217ecf3b39f8d5c01260684848a8886c8ed2bf89.tar.xz |
Simplify PDFium by removing code that's not used in the open source repo.
-remove parameter from FPDF_InitLibrary
-remove a bunch of ifdefs that are unused
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/801913002
Diffstat (limited to 'fpdfsdk/include')
-rw-r--r-- | fpdfsdk/include/fpdfoom.h | 61 | ||||
-rw-r--r-- | fpdfsdk/include/fpdfview.h | 4 | ||||
-rw-r--r-- | fpdfsdk/include/fsdk_define.h | 72 |
3 files changed, 21 insertions, 116 deletions
diff --git a/fpdfsdk/include/fpdfoom.h b/fpdfsdk/include/fpdfoom.h deleted file mode 100644 index dd14b74b4f..0000000000 --- a/fpdfsdk/include/fpdfoom.h +++ /dev/null @@ -1,61 +0,0 @@ -// 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 - -#ifndef _FPDFOOM_H_ -#define _FPDFOOM_H_ - -#ifndef _FPDFVIEW_H_ -#include "fpdfview.h" -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct _OOM_INFO -{ - /** - * Version number of the interface. Currently must be 1. - **/ - int version; - - /** - * Method: FSDK_OOM_Handler - * Out-Of-Memory handling function. - * Interface Version: - * 1 - * Implementation Required: - * Yes - * Parameters: - * pThis - Pointer to the interface structure itself. - * Return value: - * None. - * */ - - void(*FSDK_OOM_Handler)(_OOM_INFO* pThis); -}OOM_INFO; - - -/** - * Function: FSDK_SetOOMHandler - * Setup A Out-Of-Memory handler for foxit sdk. - * Parameters: - * oomInfo - Pointer to a OOM_INFO structure. - * Return Value: - * TRUE means successful. FALSE means fails. - **/ - -DLLEXPORT FPDF_BOOL STDCALL FSDK_SetOOMHandler(OOM_INFO* oomInfo); - - -#ifdef __cplusplus -}; -#endif - - - - -#endif diff --git a/fpdfsdk/include/fpdfview.h b/fpdfsdk/include/fpdfview.h index 4dcdcf620a..ddf359c127 100644 --- a/fpdfsdk/include/fpdfview.h +++ b/fpdfsdk/include/fpdfview.h @@ -126,13 +126,13 @@ extern "C" { // Function: FPDF_InitLibrary // Initialize the FPDFSDK library // Parameters: -// hInstance - For WIN32 system only: the instance of the executable or DLL module. +// None // Return value: // None. // Comments: // You have to call this function before you can call any PDF processing functions. -DLLEXPORT void STDCALL FPDF_InitLibrary(void* hInstance); +DLLEXPORT void STDCALL FPDF_InitLibrary(); // Function: FPDF_DestroyLibary diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index d249f0887f..7a4067e5c4 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -12,59 +12,25 @@ #include <math.h> #endif -//#define API5 -#define API6 -#define _FPDFAPI_ASYNC_PARSING_ -#define _FXSDK_OPENSOURCE_ - -#ifdef _FPDFEMB_WCE_ - #include "../../core/include/fpdfapi/fpdfapi.h" - #include "../../core/include/fpdfapi/fpdf_parser.h" - #include "../../core/include/fpdfapi/fpdf_module.h" - #include "../../core/include/fpdfapi/fpdf_render.h" - #include "../../core/include/fpdfapi/fpdf_pageobj.h" - #include "../../core/include/fpdfapi/fpdf_serial.h" - - #include "../../core/include/fpdftext/fpdf_text.h" - - #include "../../core/include/fxge/fx_ge_win32.h" - #include "../../core/include/fxge/fx_ge.h" - - #include "../../core/include/fxcodec/fx_codec.h" - - #include "../../core/include/fpdfdoc/fpdf_doc.h" - #include "../../core/include/fpdfdoc/fpdf_vt.h" - - #include "../../core/include/fxcrt/fx_xml.h" - #include "../../core/include/fxcrt/fx_crypt.h" - -#else - #ifdef API6 - #include "../../core/include/fpdfapi/fpdf_parser.h" - #include "../../core/include/fpdfapi/fpdfapi.h" - #include "../../core/include/fpdfapi/fpdf_parser.h" - #include "../../core/include/fpdfapi/fpdf_module.h" - #include "../../core/include/fpdfapi/fpdf_render.h" - #include "../../core/include/fpdfapi/fpdf_pageobj.h" - #include "../../core/include/fpdfapi/fpdf_serial.h" - - #include "../../core/include/fpdftext/fpdf_text.h" - - #include "../../core/include/fxge/fx_ge_win32.h" - #include "../../core/include/fxge/fx_ge.h" - - #include "../../core/include/fxcodec/fx_codec.h" - - #include "../../core/include/fpdfdoc/fpdf_doc.h" - #include "../../core/include/fpdfdoc/fpdf_vt.h" - - #include "../../core/include/fxcrt/fx_xml.h" - // #include "../../core/include/fdrm/fx_crypt.h" - #ifdef _LICENSED_BUILD_ - #include "../../cryptopp/Cryptlib.h" - #endif - #endif -#endif +#include "../../core/include/fpdfapi/fpdf_parser.h" +#include "../../core/include/fpdfapi/fpdfapi.h" +#include "../../core/include/fpdfapi/fpdf_parser.h" +#include "../../core/include/fpdfapi/fpdf_module.h" +#include "../../core/include/fpdfapi/fpdf_render.h" +#include "../../core/include/fpdfapi/fpdf_pageobj.h" +#include "../../core/include/fpdfapi/fpdf_serial.h" + +#include "../../core/include/fpdftext/fpdf_text.h" + +#include "../../core/include/fxge/fx_ge_win32.h" +#include "../../core/include/fxge/fx_ge.h" + +#include "../../core/include/fxcodec/fx_codec.h" + +#include "../../core/include/fpdfdoc/fpdf_doc.h" +#include "../../core/include/fpdfdoc/fpdf_vt.h" + +#include "../../core/include/fxcrt/fx_xml.h" #ifndef FX_GetAValue |