summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/include/fdrm/fx_crypt.h14
-rw-r--r--core/include/fpdfapi/fpdfapi.h12
-rw-r--r--core/include/fxge/fx_font.h15
-rw-r--r--fpdfsdk/include/formfiller/FormFiller.h28
-rw-r--r--fpdfsdk/include/fsdk_rendercontext.h9
-rw-r--r--fpdfsdk/include/javascript/JavaScript.h45
-rw-r--r--fpdfsdk/include/pdfwindow/PDFWindow.h30
7 files changed, 63 insertions, 90 deletions
diff --git a/core/include/fdrm/fx_crypt.h b/core/include/fdrm/fx_crypt.h
index ec7d55ab8c..adbdf8fa23 100644
--- a/core/include/fdrm/fx_crypt.h
+++ b/core/include/fdrm/fx_crypt.h
@@ -1,14 +1,18 @@
// 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 _FX_CRYPT_H_
-#define _FX_CRYPT_H_
+#ifndef FX_CRYPT_H_
+#define FX_CRYPT_H_
+
+#include "../fxcrt/fx_basic.h"
+
#ifdef __cplusplus
extern "C" {
#endif
+
void CRYPT_ArcFourCryptBlock(FX_LPBYTE data, FX_DWORD size, FX_LPCBYTE key, FX_DWORD keylen);
void CRYPT_ArcFourSetup(FX_LPVOID context, FX_LPCBYTE key, FX_DWORD length);
void CRYPT_ArcFourCrypt(FX_LPVOID context, FX_LPBYTE data, FX_DWORD size);
@@ -37,7 +41,9 @@ void CRYPT_SHA512Update(FX_LPVOID context, FX_LPCBYTE data, FX_DWORD size);
void CRYPT_SHA512Finish(FX_LPVOID context, FX_BYTE digest[64]);
void CRYPT_SHA512Generate(FX_LPCBYTE data, FX_DWORD size, FX_BYTE digest[64]);
void CRYPT_SetPubKeyDecryptor(FX_BOOL (*func)(FX_LPCBYTE pData, FX_DWORD size, FX_LPBYTE data_buf, FX_DWORD& data_len));
+
#ifdef __cplusplus
};
#endif
-#endif
+
+#endif // FX_CRYPT_H_
diff --git a/core/include/fpdfapi/fpdfapi.h b/core/include/fpdfapi/fpdfapi.h
index 9407735267..a2f715d71b 100644
--- a/core/include/fpdfapi/fpdfapi.h
+++ b/core/include/fpdfapi/fpdfapi.h
@@ -4,12 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDFAPI_H_
-#define _FPDFAPI_H_
-#include "../../include/fxcrt/fx_basic.h"
-#include "../../include/fxge/fx_ge.h"
+#ifndef FPDFAPI_H_
+#define FPDFAPI_H_
+
+#include "../fxcrt/fx_basic.h"
+#include "../fxge/fx_ge.h"
#include "fpdf_module.h"
#include "fpdf_pageobj.h"
#include "fpdf_render.h"
#include "fpdf_serial.h"
-#endif
+
+#endif // FPDFAPI_H_
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 6e0c1ba881..7ae3c6d39d 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -4,14 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_FONT_H_
-#define _FX_FONT_H_
-#ifndef _FXCRT_EXTENSION_
-#include "../../include/fxcrt/fx_ext.h"
-#endif
-#ifndef _FX_DIB_H_
+#ifndef FX_FONT_H_
+#define FX_FONT_H_
+
+#include "../fxcrt/fx_ext.h"
#include "fx_dib.h"
-#endif
+
typedef struct FT_FaceRec_* FXFT_Face;
typedef void* FXFT_Library;
class IFX_FontEncoding;
@@ -433,4 +431,5 @@ protected:
~IFX_GSUBTable() { }
};
IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont);
-#endif
+
+#endif // FX_FONT_H_
diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h
index 8e45d5eddb..d8df542179 100644
--- a/fpdfsdk/include/formfiller/FormFiller.h
+++ b/fpdfsdk/include/formfiller/FormFiller.h
@@ -1,30 +1,18 @@
// 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 _FORMFILLER_H_
-#define _FORMFILLER_H_
-
-
-
-#ifndef _INC_PDFAPI
- #define _INC_PDFAPI
- #include "../../../core/include/fpdfapi/fpdf_module.h"
- #include "../../../core/include/fpdfdoc/fpdf_doc.h"
- #include "../../../core/include/fpdfdoc/fpdf_vt.h"
- #include "../../../core/include/fxcrt/fx_xml.h"
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#endif
+#ifndef FORMFILLER_H_
+#define FORMFILLER_H_
+#include "../../../core/include/fpdfapi/fpdf_module.h"
+#include "../../../core/include/fpdfdoc/fpdf_doc.h"
+#include "../../../core/include/fpdfdoc/fpdf_vt.h"
+#include "../../../core/include/fxcrt/fx_xml.h"
#include "../fsdk_mgr.h"
-
#include "../fxedit/fx_edit.h"
#include "../pdfwindow/IPDFWindow.h"
-
-
-#endif //_FORMFILLER_H_
-
+#endif // FORMFILLER_H_
diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h
index dfc9f5e58a..4c006c3754 100644
--- a/fpdfsdk/include/fsdk_rendercontext.h
+++ b/fpdfsdk/include/fsdk_rendercontext.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _RENDERCONTENT_H_
-#define _RENDERCONTENT_H_
+#ifndef FSDK_RENDERCONTEXT_H_
+#define FSDK_RENDERCONTEXT_H_
#include "../../public/fpdf_progressive.h"
-#include "../include/fsdk_define.h"
+#include "fsdk_define.h"
// Everything about rendering is put here: for OOM recovery
class CRenderContext
@@ -39,4 +39,5 @@ public:
private:
IFSDK_PAUSE* m_IPause;
};
-#endif
+
+#endif // FSDK_RENDERCONTEXT_H_
diff --git a/fpdfsdk/include/javascript/JavaScript.h b/fpdfsdk/include/javascript/JavaScript.h
index 166472b61e..4e545c4f54 100644
--- a/fpdfsdk/include/javascript/JavaScript.h
+++ b/fpdfsdk/include/javascript/JavaScript.h
@@ -1,39 +1,26 @@
// 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 _JAVASCRIPT_H_
-#define _JAVASCRIPT_H_
-
-
-#ifndef _INC_PDFAPI
- #define _INC_PDFAPI
-
- #include "../../../core/include/fpdfapi/fpdf_module.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"
- #include "../../../core/include/fpdfapi/fpdf_pageobj.h"
- #include "../../../core/include/fpdfapi/fpdf_serial.h"
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
- #include "../../include/fx_systemhandler.h"
-#endif
-
-
-#include "../jsapi/fxjs_v8.h"
-#include "../fxedit/fx_edit.h"
-#include "../pdfwindow/IPDFWindow.h"
-#include "../fsdk_mgr.h"
-
+#ifndef JAVASCRIPT_H_
+#define JAVASCRIPT_H_
#include <string>
-//#pragma warning( disable : 4786)
#include <vector>
+#include "../../../core/include/fdrm/fx_crypt.h"
+#include "../../../core/include/fpdfapi/fpdf_module.h"
+#include "../../../core/include/fpdfapi/fpdf_pageobj.h"
+#include "../../../core/include/fpdfapi/fpdf_serial.h"
+#include "../../../core/include/fpdfdoc/fpdf_doc.h"
+#include "../../../core/include/fpdfdoc/fpdf_vt.h"
+#include "../../../core/include/fxcrt/fx_xml.h"
+#include "../fsdk_mgr.h"
+#include "../fx_systemhandler.h"
+#include "../fxedit/fx_edit.h"
+#include "../jsapi/fxjs_v8.h"
+#include "../pdfwindow/IPDFWindow.h"
-#endif //_JAVASCRIPT_H_
-
+#endif // JAVASCRIPT_H_
diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h
index a26c57d2db..dafc7452f2 100644
--- a/fpdfsdk/include/pdfwindow/PDFWindow.h
+++ b/fpdfsdk/include/pdfwindow/PDFWindow.h
@@ -1,28 +1,18 @@
// 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 _PDFWINDOW_H_
-#define _PDFWINDOW_H_
-// #define VC_EXTRALEAN
-// #include <afxext.h>
-// #include <afxcmn.h>
-
-#ifndef _INC_PDFAPI
- #define _INC_PDFAPI
-
- #include "../../../core/include/fpdfapi/fpdf_module.h"
- #include "../../../core/include/fpdfdoc/fpdf_doc.h"
- #include "../../../core/include/fpdfdoc/fpdf_vt.h"
- #include "../../../core/include/fxcrt/fx_xml.h"
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
- #include "../../../public/fpdf_fwlevent.h"
- #include "../fx_systemhandler.h"
-#endif
+#ifndef PDFWINDOW_H_
+#define PDFWINDOW_H_
+#include "../../../core/include/fpdfapi/fpdf_module.h"
+#include "../../../core/include/fpdfdoc/fpdf_doc.h"
+#include "../../../core/include/fpdfdoc/fpdf_vt.h"
+#include "../../../core/include/fxcrt/fx_xml.h"
+#include "../../../public/fpdf_fwlevent.h"
+#include "../fx_systemhandler.h"
#include "../fxedit/fx_edit.h"
-#endif
+#endif // PDFWINDOW_H_