diff --git a/src/_ftbitmap.c b/src/_ftbitmap.c index 56864dbb3..8b84087d4 100644 --- a/src/_ftbitmap.c +++ b/src/_ftbitmap.c @@ -38,16 +38,6 @@ } - /* deprecated function name; retained for ABI compatibility */ - - FT_EXPORT_DEF( void ) - FT_Bitmap_New( FT_Bitmap *abitmap ) - { - if ( abitmap ) - *abitmap = null_bitmap; - } - - /* documentation is in ftbitmap.h */ FT_EXPORT_DEF( FT_Error ) diff --git a/src/freetype/ftbitmap.h b/src/freetype/ftbitmap.h index e9cc4899a..2cec2527d 100644 --- a/src/freetype/ftbitmap.h +++ b/src/freetype/ftbitmap.h @@ -57,18 +57,10 @@ FT_BEGIN_HEADER /* */ /* abitmap :: A pointer to the bitmap structure. */ /* */ - /* */ - /* A deprecated name for the same function is `FT_Bitmap_New'. */ - /* */ FT_EXPORT( void ) FT_Bitmap_Init( FT_Bitmap *abitmap ); - /* deprecated */ - FT_EXPORT( void ) - FT_Bitmap_New( FT_Bitmap *abitmap ); - - /*************************************************************************/ /* */ /* */ diff --git a/src/freetype/ftglyph.h b/src/freetype/ftglyph.h index e5bc319ab..8f2e793f1 100644 --- a/src/freetype/ftglyph.h +++ b/src/freetype/ftglyph.h @@ -325,15 +325,6 @@ FT_BEGIN_HEADER } FT_Glyph_BBox_Mode; - /* these constants are deprecated; use the corresponding */ - /* `FT_Glyph_BBox_Mode' values instead */ -#define ft_glyph_bbox_unscaled FT_GLYPH_BBOX_UNSCALED -#define ft_glyph_bbox_subpixels FT_GLYPH_BBOX_SUBPIXELS -#define ft_glyph_bbox_gridfit FT_GLYPH_BBOX_GRIDFIT -#define ft_glyph_bbox_truncate FT_GLYPH_BBOX_TRUNCATE -#define ft_glyph_bbox_pixels FT_GLYPH_BBOX_PIXELS - - /*************************************************************************/ /* */ /* */ diff --git a/src/freetype/ftimage.h b/src/freetype/ftimage.h index 902633e5b..15452ac01 100644 --- a/src/freetype/ftimage.h +++ b/src/freetype/ftimage.h @@ -414,17 +414,6 @@ FT_BEGIN_HEADER #define FT_OUTLINE_HIGH_PRECISION 0x100 #define FT_OUTLINE_SINGLE_PASS 0x200 - - /* these constants are deprecated; use the corresponding */ - /* `FT_OUTLINE_XXX' values instead */ -#define ft_outline_none FT_OUTLINE_NONE -#define ft_outline_owner FT_OUTLINE_OWNER -#define ft_outline_even_odd_fill FT_OUTLINE_EVEN_ODD_FILL -#define ft_outline_reverse_fill FT_OUTLINE_REVERSE_FILL -#define ft_outline_ignore_dropouts FT_OUTLINE_IGNORE_DROPOUTS -#define ft_outline_high_precision FT_OUTLINE_HIGH_PRECISION -#define ft_outline_single_pass FT_OUTLINE_SINGLE_PASS - /* */ #define FT_CURVE_TAG( flag ) ( flag & 3 ) @@ -703,15 +692,6 @@ FT_BEGIN_HEADER } FT_Glyph_Format; - /* these constants are deprecated; use the corresponding */ - /* `FT_Glyph_Format' values instead. */ -#define ft_glyph_format_none FT_GLYPH_FORMAT_NONE -#define ft_glyph_format_composite FT_GLYPH_FORMAT_COMPOSITE -#define ft_glyph_format_bitmap FT_GLYPH_FORMAT_BITMAP -#define ft_glyph_format_outline FT_GLYPH_FORMAT_OUTLINE -#define ft_glyph_format_plotter FT_GLYPH_FORMAT_PLOTTER - - /*************************************************************************/ /*************************************************************************/ /*************************************************************************/ @@ -921,13 +901,6 @@ FT_BEGIN_HEADER #define FT_RASTER_FLAG_DIRECT 0x2 #define FT_RASTER_FLAG_CLIP 0x4 - /* these constants are deprecated; use the corresponding */ - /* `FT_RASTER_FLAG_XXX' values instead */ -#define ft_raster_flag_default FT_RASTER_FLAG_DEFAULT -#define ft_raster_flag_aa FT_RASTER_FLAG_AA -#define ft_raster_flag_direct FT_RASTER_FLAG_DIRECT -#define ft_raster_flag_clip FT_RASTER_FLAG_CLIP - /*************************************************************************/ /* */ diff --git a/src/freetype/ftrender.h b/src/freetype/ftrender.h index e84236a00..98830bcd5 100644 --- a/src/freetype/ftrender.h +++ b/src/freetype/ftrender.h @@ -62,14 +62,6 @@ FT_BEGIN_HEADER (*FT_Glyph_PrepareFunc)( FT_Glyph glyph, FT_GlyphSlot slot ); -/* deprecated */ -#define FT_Glyph_Init_Func FT_Glyph_InitFunc -#define FT_Glyph_Done_Func FT_Glyph_DoneFunc -#define FT_Glyph_Transform_Func FT_Glyph_TransformFunc -#define FT_Glyph_BBox_Func FT_Glyph_GetBBoxFunc -#define FT_Glyph_Copy_Func FT_Glyph_CopyFunc -#define FT_Glyph_Prepare_Func FT_Glyph_PrepareFunc - struct FT_Glyph_Class_ { @@ -109,12 +101,6 @@ FT_BEGIN_HEADER FT_ULong mode_tag, FT_Pointer mode_ptr ); -/* deprecated identifiers */ -#define FTRenderer_render FT_Renderer_RenderFunc -#define FTRenderer_transform FT_Renderer_TransformFunc -#define FTRenderer_getCBox FT_Renderer_GetCBoxFunc -#define FTRenderer_setMode FT_Renderer_SetModeFunc - /*************************************************************************/ /* */ diff --git a/src/freetype/ttnameid.h b/src/freetype/ttnameid.h index 603ee1e4f..945120622 100644 --- a/src/freetype/ttnameid.h +++ b/src/freetype/ttnameid.h @@ -829,10 +829,6 @@ FT_BEGIN_HEADER /* This is new in OpenType 1.8 */ #define TT_NAME_ID_VARIATIONS_PREFIX 25 - /* these two values are deprecated */ -#define TT_NAME_ID_PREFERRED_FAMILY TT_NAME_ID_TYPOGRAPHIC_FAMILY -#define TT_NAME_ID_PREFERRED_SUBFAMILY TT_NAME_ID_TYPOGRAPHIC_SUBFAMILY - /*********************************************************************** *