From 59dfc62e56ec5dd88e5445e13467e0e1a3f1690f Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 2 Oct 2017 09:10:06 -0400 Subject: Removing unused defines Remove unused defines. Change-Id: Ibf10d8470f19cbf4528fe1342398a39ef15c1d12 Reviewed-on: https://pdfium-review.googlesource.com/15110 Commit-Queue: dsinclair Reviewed-by: Ryan Harrison --- core/fdrm/crypto/fx_crypt.h | 1 - core/fpdfapi/font/cpdf_fontencoding.h | 1 - core/fpdfapi/parser/cpdf_document.h | 5 +--- core/fpdfdoc/cpdf_annot.h | 5 ---- core/fpdftext/cpdf_textpage.h | 4 --- core/fxcodec/fx_codec_def.h | 48 ----------------------------------- core/fxcodec/gif/cfx_gif.h | 2 -- core/fxcodec/jbig2/JBig2_Context.h | 2 -- core/fxcodec/jbig2/JBig2_Define.h | 1 - core/fxcodec/jbig2/JBig2_Segment.h | 3 --- core/fxcodec/lbmp/fx_bmp.h | 3 --- core/fxcrt/fx_stream.h | 1 - core/fxge/cfx_renderdevice.h | 1 - core/fxge/cfx_unicodeencoding.h | 3 --- core/fxge/cttfontdesc.h | 8 ------ 15 files changed, 1 insertion(+), 87 deletions(-) diff --git a/core/fdrm/crypto/fx_crypt.h b/core/fdrm/crypto/fx_crypt.h index 5416080af7..4f6717fed8 100644 --- a/core/fdrm/crypto/fx_crypt.h +++ b/core/fdrm/crypto/fx_crypt.h @@ -17,7 +17,6 @@ struct CRYPT_rc4_context { }; #define MAX_NR 14 -#define MAX_NK 8 #define MAX_NB 8 struct CRYPT_aes_context { void (*encrypt)(CRYPT_aes_context* ctx, unsigned int* block); diff --git a/core/fpdfapi/font/cpdf_fontencoding.h b/core/fpdfapi/font/cpdf_fontencoding.h index cb99975b98..040708f554 100644 --- a/core/fpdfapi/font/cpdf_fontencoding.h +++ b/core/fpdfapi/font/cpdf_fontencoding.h @@ -22,7 +22,6 @@ #define PDFFONT_ENCODING_ZAPFDINGBATS 6 #define PDFFONT_ENCODING_PDFDOC 7 #define PDFFONT_ENCODING_MS_SYMBOL 8 -#define PDFFONT_ENCODING_UNICODE 9 uint32_t FT_CharCodeFromUnicode(int encoding, wchar_t unicode); wchar_t FT_UnicodeFromCharCode(int encoding, uint32_t charcode); diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h index ab82c4a96a..d73dbc1df9 100644 --- a/core/fpdfapi/parser/cpdf_document.h +++ b/core/fpdfapi/parser/cpdf_document.h @@ -32,14 +32,11 @@ class CPDF_Pattern; class CPDF_StreamAcc; class JBig2_DocumentContext; -#define FPDFPERM_PRINT 0x0004 #define FPDFPERM_MODIFY 0x0008 -#define FPDFPERM_EXTRACT 0x0010 #define FPDFPERM_ANNOT_FORM 0x0020 #define FPDFPERM_FILL_FORM 0x0100 #define FPDFPERM_EXTRACT_ACCESS 0x0200 -#define FPDFPERM_ASSEMBLE 0x0400 -#define FPDFPERM_PRINT_HIGH 0x0800 + #define FPDF_PAGE_MAX_NUM 0xFFFFF class CPDF_Document : public CPDF_IndirectObjectHolder { diff --git a/core/fpdfdoc/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h index ab38eff1d8..39448ba209 100644 --- a/core/fpdfdoc/cpdf_annot.h +++ b/core/fpdfdoc/cpdf_annot.h @@ -27,12 +27,7 @@ class CPDF_Stream; #define ANNOTFLAG_INVISIBLE 0x0001 #define ANNOTFLAG_HIDDEN 0x0002 #define ANNOTFLAG_PRINT 0x0004 -#define ANNOTFLAG_NOZOOM 0x0008 -#define ANNOTFLAG_NOROTATE 0x0010 #define ANNOTFLAG_NOVIEW 0x0020 -#define ANNOTFLAG_READONLY 0x0040 -#define ANNOTFLAG_LOCKED 0x0080 -#define ANNOTFLAG_TOGGLENOVIEW 0x0100 class CPDF_Annot { public: diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h index 155f991a91..4275d82a18 100644 --- a/core/fpdftext/cpdf_textpage.h +++ b/core/fpdftext/cpdf_textpage.h @@ -25,7 +25,6 @@ class CPDF_TextObject; #define FPDFTEXT_MATCHWHOLEWORD 0x00000002 #define FPDFTEXT_CONSECUTIVE 0x00000004 -#define FPDFTEXT_CHAR_ERROR -1 #define FPDFTEXT_CHAR_NORMAL 0 #define FPDFTEXT_CHAR_GENERATED 1 #define FPDFTEXT_CHAR_UNUNICODE 2 @@ -37,9 +36,6 @@ class CPDF_TextObject; #define TEXT_RETURN_CHAR L'\r' #define TEXT_HYPHEN_CHAR L'-' #define TEXT_EMPTY L"" -#define TEXT_SPACE L" " -#define TEXT_RETURN_LINEFEED L"\r\n" -#define TEXT_LINEFEED L"\n" #define TEXT_HYPHEN L"-" #define TEXT_CHARRATIO_GAPDELTA 0.070 diff --git a/core/fxcodec/fx_codec_def.h b/core/fxcodec/fx_codec_def.h index 1d9b1dc832..3983285d6d 100644 --- a/core/fxcodec/fx_codec_def.h +++ b/core/fxcodec/fx_codec_def.h @@ -23,44 +23,6 @@ enum FXCODEC_STATUS { FXCODEC_STATUS_ERR_PARAMS }; -#define JP2_SPACE_INVALID -1 -#define JPX_SPACE_INVALID -1 -#define JP2_SPACE_bilevel1 0 -#define JP2_SPACE_YCbCr1 1 -#define JP2_SPACE_YCbCr2 3 -#define JP2_SPACE_YCbCr3 4 -#define JP2_SPACE_PhotoYCC 9 -#define JP2_SPACE_CMY 11 -#define JP2_SPACE_CMYK 12 -#define JP2_SPACE_YCCK 13 -#define JP2_SPACE_CIELab 14 -#define JP2_SPACE_bilevel2 15 -#define JP2_SPACE_sRGB 16 -#define JP2_SPACE_sLUM 17 -#define JP2_SPACE_sYCC 18 -#define JP2_SPACE_CIEJab 19 -#define JP2_SPACE_esRGB 20 -#define JP2_SPACE_ROMMRGB 21 -#define JP2_SPACE_YPbPr60 22 -#define JP2_SPACE_YPbPr50 23 -#define JP2_SPACE_esYCC 24 -#define JP2_SPACE_iccLUM 100 -#define JP2_SPACE_iccRGB 101 -#define Icc_INTENT_PERCEPTUAL 0 -#define Icc_INTENT_RELATIVE_COLORIMETRIC 1 -#define Icc_INTENT_SATURATION 2 -#define Icc_INTENT_ABSOLUTE_COLORIMETRIC 3 -#define Icc_FORMAT_SWAP (1 << 10) -#define Icc_FLAGS_DEFAULT 0x0000 -#define Icc_FLAGS_BLACKPOINTCOMPENSATION 0x2000 -#define Icc_FLAGS_NOWHITEONWHITEFIXUP 0x0004 -#define Icc_FLAGS_HIGHRESPRECALC 0x0400 -#define Icc_FLAGS_LOWRESPRECALC 0x0800 -#define Icc_FLAGS_GAMUTCHECK 0x1000 -#define Icc_FLAGS_SOFTPROOFING 0x4000 -#define Icc_PARAMTYPE_NONE 0 -#define Icc_PARAMTYPE_BUFFER 1 -#define Icc_PARAMTYPE_PARAM 2 #ifdef PDF_ENABLE_XFA enum FXCODEC_IMAGE_TYPE { FXCODEC_IMAGE_UNKNOWN = 0, @@ -78,15 +40,5 @@ enum FXCODEC_RESUNIT { FXCODEC_RESUNIT_METER }; #endif // PDF_ENABLE_XFA -#define EXIFTAG_USHORT_RESUNIT 296 -#define EXIFTAG_FLOAT_DPIX 282 -#define EXIFTAG_FLOAT_DPIY 283 -#define EXIFTAG_USHORT_ORIENTATION 274 -#define EXIFTAG_STRING_MANUFACTURER 271 -#define EXIFTAG_STRING_MODULE 272 -#define EXIFTAG_STRING_SOFTWARE 305 -#define EXIFTAG_STRING_IAMGEDESCRIPTION 270 -#define EXIFTAG_STRING_DATETIME 306 -#define EXIFTAG_STRING_COPYRIGHT 33432 #endif // CORE_FXCODEC_FX_CODEC_DEF_H_ diff --git a/core/fxcodec/gif/cfx_gif.h b/core/fxcodec/gif/cfx_gif.h index 02a4862017..f723526841 100644 --- a/core/fxcodec/gif/cfx_gif.h +++ b/core/fxcodec/gif/cfx_gif.h @@ -19,12 +19,10 @@ class CFX_GifContext; #define GIF_BLOCK_GCE 0xF9 #define GIF_BLOCK_PTE 0x01 #define GIF_BLOCK_CE 0xFE -#define GIF_BLOCK_AE 0xFF #define GIF_BLOCK_TERMINAL 0x00 #define GIF_MAX_LZW_EXP 12 #define GIF_MAX_LZW_CODE 4096 #define GIF_DATA_BLOCK 255 -#define GIF_MAX_ERROR_SIZE 256 #define GIF_D_STATUS_SIG 0x01 #define GIF_D_STATUS_TAIL 0x02 #define GIF_D_STATUS_EXT 0x03 diff --git a/core/fxcodec/jbig2/JBig2_Context.h b/core/fxcodec/jbig2/JBig2_Context.h index bed1079db9..314db9083a 100644 --- a/core/fxcodec/jbig2/JBig2_Context.h +++ b/core/fxcodec/jbig2/JBig2_Context.h @@ -33,8 +33,6 @@ using CJBig2_CachePair = #define JBIG2_ERROR_FATAL -3 #define JBIG2_END_OF_PAGE 2 #define JBIG2_END_OF_FILE 3 -#define JBIG2_ERROR_FILE_FORMAT -4 -#define JBIG2_ERROR_STREAM_TYPE -5 #define JBIG2_ERROR_LIMIT -6 #define JBIG2_MIN_SEGMENT_SIZE 11 diff --git a/core/fxcodec/jbig2/JBig2_Define.h b/core/fxcodec/jbig2/JBig2_Define.h index 2934de4e9b..6fc3434ac7 100644 --- a/core/fxcodec/jbig2/JBig2_Define.h +++ b/core/fxcodec/jbig2/JBig2_Define.h @@ -10,7 +10,6 @@ #include "core/fxcrt/fx_system.h" #define JBIG2_memset memset -#define JBIG2_memcmp memcmp #define JBIG2_memcpy memcpy #define JBIG2_OOB 1 diff --git a/core/fxcodec/jbig2/JBig2_Segment.h b/core/fxcodec/jbig2/JBig2_Segment.h index 5dc57a37d4..914115b522 100644 --- a/core/fxcodec/jbig2/JBig2_Segment.h +++ b/core/fxcodec/jbig2/JBig2_Segment.h @@ -15,9 +15,6 @@ #include "core/fxcodec/jbig2/JBig2_PatternDict.h" #include "core/fxcodec/jbig2/JBig2_SymbolDict.h" -#define JBIG2_GET_INT32(buf) \ - (((buf)[0] << 24) | ((buf)[1] << 16) | ((buf)[2] << 8) | (buf)[3]) -#define JBIG2_GET_INT16(buf) (((buf)[0] << 8) | (buf)[1]) typedef enum { JBIG2_SEGMENT_HEADER_UNPARSED, JBIG2_SEGMENT_DATA_UNPARSED, diff --git a/core/fxcodec/lbmp/fx_bmp.h b/core/fxcodec/lbmp/fx_bmp.h index ca55885aef..1dfbcc1410 100644 --- a/core/fxcodec/lbmp/fx_bmp.h +++ b/core/fxcodec/lbmp/fx_bmp.h @@ -23,7 +23,6 @@ #define BMP_D_STATUS_DATA 0x04 #define BMP_D_STATUS_TAIL 0x00 #define BMP_SIGNATURE 0x4D42 -#define BMP_PAL_NEW 0 #define BMP_PAL_OLD 1 #define RLE_MARKER 0 #define RLE_EOL 0 @@ -33,8 +32,6 @@ #define BMP_RLE8 1L #define BMP_RLE4 2L #define BMP_BITFIELDS 3L -#define BMP_BIT_555 0 -#define BMP_BIT_565 1 // Limit width to (MAXINT32 - 31) / 32 #define BMP_MAX_WIDTH 67108863 #pragma pack(1) diff --git a/core/fxcrt/fx_stream.h b/core/fxcrt/fx_stream.h index 84e33c2060..8d0a596bd9 100644 --- a/core/fxcrt/fx_stream.h +++ b/core/fxcrt/fx_stream.h @@ -32,7 +32,6 @@ FX_FileHandle* FX_OpenFolder(const char* path); bool FX_GetNextFile(FX_FileHandle* handle, ByteString* filename, bool* bFolder); void FX_CloseFolder(FX_FileHandle* handle); -#define FX_FILEMODE_Write 0 #define FX_FILEMODE_ReadOnly 1 #define FX_FILEMODE_Truncate 2 diff --git a/core/fxge/cfx_renderdevice.h b/core/fxge/cfx_renderdevice.h index 191e300490..0f1cf9b6ca 100644 --- a/core/fxge/cfx_renderdevice.h +++ b/core/fxge/cfx_renderdevice.h @@ -31,7 +31,6 @@ class IFX_RenderDeviceDriver; #define FXRC_GET_BITS 0x01 #define FXRC_BIT_MASK 0x02 -#define FXRC_ALPHA_MASK 0x04 #define FXRC_ALPHA_PATH 0x10 #define FXRC_ALPHA_IMAGE 0x20 #define FXRC_ALPHA_OUTPUT 0x40 diff --git a/core/fxge/cfx_unicodeencoding.h b/core/fxge/cfx_unicodeencoding.h index d64d8877d9..40562e7c4a 100644 --- a/core/fxge/cfx_unicodeencoding.h +++ b/core/fxge/cfx_unicodeencoding.h @@ -9,9 +9,6 @@ #include "core/fxge/fx_font.h" -#define ENCODING_INTERNAL 0 -#define ENCODING_UNICODE 1 - #ifdef PDF_ENABLE_XFA #define FXFM_ENC_TAG(a, b, c, d) \ (((uint32_t)(a) << 24) | ((uint32_t)(b) << 16) | ((uint32_t)(c) << 8) | \ diff --git a/core/fxge/cttfontdesc.h b/core/fxge/cttfontdesc.h index 6eb36360c0..ee1e0b0102 100644 --- a/core/fxge/cttfontdesc.h +++ b/core/fxge/cttfontdesc.h @@ -10,14 +10,6 @@ #include "core/fxcrt/fx_system.h" #include "core/fxge/fx_font.h" -#define FX_FONT_FLAG_SERIF 0x01 -#define FX_FONT_FLAG_FIXEDPITCH 0x02 -#define FX_FONT_FLAG_ITALIC 0x04 -#define FX_FONT_FLAG_BOLD 0x08 -#define FX_FONT_FLAG_SYMBOLIC_SYMBOL 0x10 -#define FX_FONT_FLAG_SYMBOLIC_DINGBATS 0x20 -#define FX_FONT_FLAG_MULTIPLEMASTER 0x40 - class CTTFontDesc { public: CTTFontDesc() : m_Type(0), m_pFontData(nullptr), m_RefCount(0) {} -- cgit v1.2.3