diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-27 16:07:42 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-27 16:07:42 -0700 |
| commit | 14f57a153dcbc4c5fedeffe12a3b4f915cc5d558 (patch) | |
| tree | c30bc8fde0acbac964db8bc9e96e893d57cc29f8 /core/include | |
| parent | cddfde0cddbc8467e0d5fa04c30405ee257750fc (diff) | |
| download | pdfium-14f57a153dcbc4c5fedeffe12a3b4f915cc5d558.tar.xz | |
Remove rendundant ../include from paths of files in include/ directory
Tiny bit of tidying I noticed while trying to figure out include rules.
In other words,
cd core/include
git grep 'include.*include'
git grep 'include.*src'
Should produce no output, and
cd fpdfsdk/include
git grep 'include.*include' | grep -v ../core/include
git grep 'include.*src'
Should produce no output as well.
Fix some IWYU, header guards, include ordering, whitespace along the way.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1162453003
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fdrm/fx_crypt.h | 14 | ||||
| -rw-r--r-- | core/include/fpdfapi/fpdfapi.h | 12 | ||||
| -rw-r--r-- | core/include/fxge/fx_font.h | 15 |
3 files changed, 24 insertions, 17 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_ |