From 762b23281d51622fc65486521bf984b5ff146b78 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 20 Dec 2015 06:39:38 +0100 Subject: [PATCH] Minor clean-ups. --- include/freetype/internal/ftgloadr.h | 20 +------------------- include/freetype/internal/fthash.h | 2 +- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/include/freetype/internal/ftgloadr.h b/include/freetype/internal/ftgloadr.h index 970dd70cc..5e95c5061 100644 --- a/include/freetype/internal/ftgloadr.h +++ b/include/freetype/internal/ftgloadr.h @@ -36,24 +36,6 @@ FT_BEGIN_HEADER /* The glyph loader is an internal object used to load several glyphs */ /* together (for example, in the case of composites). */ /* */ - /* */ - /* The glyph loader implementation is not part of the high-level API, */ - /* hence the forward structure declaration. */ - /* */ - typedef struct FT_GlyphLoaderRec_* FT_GlyphLoader ; - - -#if 0 /* moved to freetype.h in version 2.2 */ -#define FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS 1 -#define FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES 2 -#define FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID 4 -#define FT_SUBGLYPH_FLAG_SCALE 8 -#define FT_SUBGLYPH_FLAG_XY_SCALE 0x40 -#define FT_SUBGLYPH_FLAG_2X2 0x80 -#define FT_SUBGLYPH_FLAG_USE_MY_METRICS 0x200 -#endif - - typedef struct FT_SubGlyphRec_ { FT_Int index; @@ -89,7 +71,7 @@ FT_BEGIN_HEADER void* other; /* for possible future extension? */ - } FT_GlyphLoaderRec; + } FT_GlyphLoaderRec, *FT_GlyphLoader; /* create new empty glyph loader */ diff --git a/include/freetype/internal/fthash.h b/include/freetype/internal/fthash.h index 2d6794214..46496d66a 100644 --- a/include/freetype/internal/fthash.h +++ b/include/freetype/internal/fthash.h @@ -84,7 +84,7 @@ FT_BEGIN_HEADER FT_Error ft_hash_insert( char* key, size_t data, - FT_Hash ht, + FT_Hash hash, FT_Memory memory ); FT_Hashnode