formatting, and remove the "interface" identifier
that causes problems with MS C++
This commit is contained in:
parent
ea10fbf91f
commit
46ab6331e0
|
@ -1227,7 +1227,7 @@
|
|||
|
||||
|
||||
typedef struct FT_SubGlyph_ FT_SubGlyph;
|
||||
|
||||
|
||||
struct FT_SubGlyph_
|
||||
{
|
||||
FT_Int index;
|
||||
|
@ -1305,7 +1305,7 @@
|
|||
FT_Glyph_Format format;
|
||||
FT_Bitmap bitmap;
|
||||
FT_Outline outline;
|
||||
|
||||
|
||||
FT_Int num_subglyphs;
|
||||
FT_Int max_subglyphs;
|
||||
FT_SubGlyph* subglyphs;
|
||||
|
@ -1380,11 +1380,11 @@
|
|||
/* ft_stream_pathname :: create a new input stream from a C pathname */
|
||||
/* */
|
||||
typedef enum {
|
||||
|
||||
|
||||
ft_stream_memory = 1,
|
||||
ft_stream_copy = 2,
|
||||
ft_stream_pathname = 3
|
||||
|
||||
|
||||
} FT_Stream_Type;
|
||||
|
||||
/*************************************************************************
|
||||
|
@ -1428,7 +1428,7 @@
|
|||
* should not close the stream before the library does !!
|
||||
*
|
||||
*************************************************************************/
|
||||
|
||||
|
||||
typedef struct FT_Open_Args_
|
||||
{
|
||||
FT_Stream_Type stream_type;
|
||||
|
@ -1559,7 +1559,7 @@
|
|||
EXPORT_DEF
|
||||
FT_Error FT_Attach_File( FT_Face face,
|
||||
const char* filepathname );
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
/* */
|
||||
/* <Function> */
|
||||
|
@ -2103,7 +2103,7 @@
|
|||
/* <Input> */
|
||||
/* outline :: A pointer to the source target. */
|
||||
/* */
|
||||
/* interface :: A table of `emitters', i.e,. function pointers called */
|
||||
/* funcs :: A table of `emitters', i.e,. function pointers called */
|
||||
/* during decomposition to indicate path operations. */
|
||||
/* */
|
||||
/* user :: A typeless pointer which is passed to each emitter */
|
||||
|
@ -2115,9 +2115,9 @@
|
|||
/* */
|
||||
EXPORT_DEF
|
||||
int FT_Outline_Decompose( FT_Outline* outline,
|
||||
FT_Outline_Funcs* interface,
|
||||
FT_Outline_Funcs* funcs,
|
||||
void* user );
|
||||
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
/* */
|
||||
|
@ -2308,22 +2308,22 @@
|
|||
* FT_Get_Raster
|
||||
*
|
||||
* <Description>
|
||||
* Return a pointer to the raster corresponding to a given glyph
|
||||
* format tag.
|
||||
* Return a pointer to the raster corresponding to a given glyph
|
||||
* format tag.
|
||||
*
|
||||
* <Input>
|
||||
* library :: handle to source library object
|
||||
* glyph_format :: glyph format tag
|
||||
*
|
||||
* <Output>
|
||||
* raster_funcs :: if this field is not 0, returns a pointer to the
|
||||
* raster_funcs :: if this field is not 0, returns a pointer to the
|
||||
* raster's interface/descriptor..
|
||||
*
|
||||
* <Return>
|
||||
* a pointer to the corresponding raster object.
|
||||
*
|
||||
*************************************************************************/
|
||||
|
||||
|
||||
EXPORT_DEF
|
||||
FT_Raster FT_Get_Raster( FT_Library library,
|
||||
FT_Glyph_Format glyph_format,
|
||||
|
|
|
@ -99,7 +99,7 @@
|
|||
* have been found to date..
|
||||
*
|
||||
*************************************************************************/
|
||||
|
||||
|
||||
typedef enum FT_Pixel_Mode_
|
||||
{
|
||||
ft_pixel_mode_none = 0,
|
||||
|
@ -112,9 +112,9 @@
|
|||
ft_pixel_mode_rgb16,
|
||||
ft_pixel_mode_rgb24,
|
||||
ft_pixel_mode_rgb32,
|
||||
|
||||
|
||||
ft_pixel_mode_max /* do not remove */
|
||||
|
||||
|
||||
} FT_Pixel_Mode;
|
||||
|
||||
|
||||
|
@ -138,51 +138,51 @@
|
|||
* FreeType, these types are not handled by the library itself.
|
||||
*
|
||||
*************************************************************************/
|
||||
|
||||
|
||||
typedef enum FT_Palette_Mode_
|
||||
{
|
||||
ft_palette_mode_rgb = 0,
|
||||
ft_palette_mode_rgba,
|
||||
|
||||
|
||||
ft_palettte_mode_max /* do not remove */
|
||||
|
||||
|
||||
} FT_Palette_Mode;
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
*
|
||||
* <Struct>
|
||||
* FT_Bitmap
|
||||
*
|
||||
* <Description>
|
||||
* A structure used to describe a bitmap or pixmap to the raster.
|
||||
* Note that we now manage pixmaps of various depths through the
|
||||
*
|
||||
* <Struct>
|
||||
* FT_Bitmap
|
||||
*
|
||||
* <Description>
|
||||
* A structure used to describe a bitmap or pixmap to the raster.
|
||||
* Note that we now manage pixmaps of various depths through the
|
||||
* `pixel_mode' field.
|
||||
*
|
||||
* <Fields>
|
||||
* rows :: The number of bitmap rows.
|
||||
*
|
||||
* width :: The number of pixels in bitmap row.
|
||||
*
|
||||
* pitch :: The pitch's absolute value is the number of bytes
|
||||
* taken by one bitmap row, including padding. However,
|
||||
* the pitch is positive when the bitmap has a `down'
|
||||
* flow, and negative when it has an `up' flow. In all
|
||||
* cases, the pitch is an offset to add to a bitmap
|
||||
* pointer in order to go down one row.
|
||||
*
|
||||
* buffer :: A typeless pointer to the bitmap buffer. This value
|
||||
* should be aligned on 32-bit boundaries in most cases.
|
||||
*
|
||||
* num_grays :: this field is only used with ft_pixel_mode_grays,
|
||||
* it gives the number of gray levels used in the
|
||||
* bitmap.
|
||||
*
|
||||
* pixel_mode :: the pixel_mode, i.e. how pixel bits are stored
|
||||
*
|
||||
* palette_mode :: this field is only used with paletted pixel modes,
|
||||
* it indicates how the palette is stored
|
||||
*
|
||||
*
|
||||
* <Fields>
|
||||
* rows :: The number of bitmap rows.
|
||||
*
|
||||
* width :: The number of pixels in bitmap row.
|
||||
*
|
||||
* pitch :: The pitch's absolute value is the number of bytes
|
||||
* taken by one bitmap row, including padding. However,
|
||||
* the pitch is positive when the bitmap has a `down'
|
||||
* flow, and negative when it has an `up' flow. In all
|
||||
* cases, the pitch is an offset to add to a bitmap
|
||||
* pointer in order to go down one row.
|
||||
*
|
||||
* buffer :: A typeless pointer to the bitmap buffer. This value
|
||||
* should be aligned on 32-bit boundaries in most cases.
|
||||
*
|
||||
* num_grays :: this field is only used with ft_pixel_mode_grays,
|
||||
* it gives the number of gray levels used in the
|
||||
* bitmap.
|
||||
*
|
||||
* pixel_mode :: the pixel_mode, i.e. how pixel bits are stored
|
||||
*
|
||||
* palette_mode :: this field is only used with paletted pixel modes,
|
||||
* it indicates how the palette is stored
|
||||
*
|
||||
* palette :: a typeless pointer to the bitmap palette. only used
|
||||
* for paletted pixel modes.
|
||||
*
|
||||
|
@ -197,7 +197,7 @@
|
|||
*
|
||||
*
|
||||
*************************************************************************/
|
||||
|
||||
|
||||
typedef struct FT_Bitmap_
|
||||
{
|
||||
int rows;
|
||||
|
@ -265,7 +265,7 @@
|
|||
short* contours; /* the contour end points */
|
||||
|
||||
int flags; /* outline masks */
|
||||
|
||||
|
||||
} FT_Outline;
|
||||
|
||||
/*************************************************************************/
|
||||
|
@ -325,7 +325,7 @@
|
|||
ft_outline_ignore_dropouts = 8,
|
||||
ft_outline_high_precision = 256,
|
||||
ft_outline_single_pass = 512
|
||||
|
||||
|
||||
} FT_Outline_Flags;
|
||||
|
||||
|
||||
|
@ -515,7 +515,7 @@
|
|||
* Hershey contain glyph in this format).
|
||||
*
|
||||
***********************************************************************/
|
||||
|
||||
|
||||
typedef enum FT_Glyph_Format_
|
||||
{
|
||||
ft_glyph_format_none = 0,
|
||||
|
@ -523,7 +523,7 @@
|
|||
ft_glyph_format_bitmap = FT_IMAGE_TAG('b','i','t','s'),
|
||||
ft_glyph_format_outline = FT_IMAGE_TAG('o','u','t','l'),
|
||||
ft_glyph_format_plotter = FT_IMAGE_TAG('p','l','o','t')
|
||||
|
||||
|
||||
} FT_Glyph_Format;
|
||||
|
||||
/*************************************************************************/
|
||||
|
@ -586,9 +586,9 @@
|
|||
typedef struct FT_Span_
|
||||
{
|
||||
short x;
|
||||
short len;
|
||||
unsigned short len;
|
||||
unsigned char coverage;
|
||||
|
||||
|
||||
} FT_Span;
|
||||
|
||||
|
||||
|
@ -630,7 +630,7 @@
|
|||
int count,
|
||||
FT_Span* spans,
|
||||
void* user );
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
/* */
|
||||
/* <FuncType> */
|
||||
|
@ -683,7 +683,7 @@
|
|||
* FT_Raster_Flag
|
||||
*
|
||||
* <Description>
|
||||
* An enumeration used to list the bit flags used in the "flags"
|
||||
* An enumeration used to list the bit flags used in the "flags"
|
||||
* field of a FT_Raster_Params function.
|
||||
*
|
||||
* <Fields>
|
||||
|
@ -702,11 +702,11 @@
|
|||
*
|
||||
**************************************************************************/
|
||||
typedef enum {
|
||||
|
||||
|
||||
ft_raster_flag_default = 0,
|
||||
ft_raster_flag_aa = 1,
|
||||
ft_raster_flag_direct = 2
|
||||
|
||||
|
||||
} FT_Raster_Flag;
|
||||
|
||||
/**************************************************************************
|
||||
|
@ -747,7 +747,7 @@
|
|||
* drop-out control per-se the TrueType specification..
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
typedef struct FT_Raster_Params_
|
||||
{
|
||||
FT_Bitmap* target;
|
||||
|
@ -758,7 +758,7 @@
|
|||
FT_Raster_BitTest_Func bit_test;
|
||||
FT_Raster_BitSet_Func bit_set;
|
||||
void* user;
|
||||
|
||||
|
||||
} FT_Raster_Params;
|
||||
|
||||
|
||||
|
@ -791,7 +791,7 @@
|
|||
|
||||
typedef int (*FT_Raster_New_Func)( void* memory,
|
||||
FT_Raster *raster );
|
||||
|
||||
|
||||
|
||||
/**************************************************************************
|
||||
* <FuncType>
|
||||
|
@ -806,8 +806,8 @@
|
|||
**************************************************************************/
|
||||
|
||||
typedef void (*FT_Raster_Done_Func)( FT_Raster raster );
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
|
@ -927,9 +927,9 @@
|
|||
FT_Raster_Set_Mode_Func raster_set_mode;
|
||||
FT_Raster_Render_Func raster_render;
|
||||
FT_Raster_Done_Func raster_done;
|
||||
|
||||
|
||||
} FT_Raster_Funcs;
|
||||
|
||||
|
||||
#endif /* FTIMAGE_H */
|
||||
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* FreeType low-level system interface definition
|
||||
*
|
||||
* This file contains the definitions of the stream and memory interfaces
|
||||
* used by FreeType.
|
||||
* used by FreeType.
|
||||
*
|
||||
*
|
||||
* Copyright 1996-1999 by
|
||||
|
@ -29,7 +29,7 @@
|
|||
*************************************************************************/
|
||||
|
||||
typedef struct FT_MemoryRec_* FT_Memory;
|
||||
|
||||
|
||||
typedef void* (*FT_Alloc_Func)( FT_Memory memory,
|
||||
long size );
|
||||
|
||||
|
@ -56,12 +56,12 @@
|
|||
* I / O M A N A G E M E N T
|
||||
*
|
||||
*************************************************************************/
|
||||
|
||||
|
||||
typedef union FT_StreamDesc_
|
||||
{
|
||||
long value;
|
||||
void* pointer;
|
||||
|
||||
|
||||
} FT_StreamDesc;
|
||||
|
||||
|
||||
|
@ -79,7 +79,7 @@
|
|||
char* base;
|
||||
unsigned long size;
|
||||
unsigned long pos;
|
||||
|
||||
|
||||
FT_StreamDesc descriptor;
|
||||
FT_StreamDesc pathname; /* ignored by FreeType - useful for debugging */
|
||||
|
||||
|
|
|
@ -651,11 +651,11 @@
|
|||
* Borland compilers (read: from BC++ 3.1 on) can increase this limit.
|
||||
* If you get a warning with such a compiler, use the -i40 switch.
|
||||
*/
|
||||
|
||||
|
||||
#define TT_UCR_ARABIC_PRESENTATION_FORMS_A \
|
||||
TT_UCR_ARABIC_PRESENTATIONS_A
|
||||
#define TT_UCR_ARABIC_PRESENTATION_FORMS_B \
|
||||
TT_UCR_ARABIC_PRESENTATIONS_B
|
||||
TT_UCR_ARABIC_PRESENTATIONS_B
|
||||
|
||||
#define TT_UCR_COMBINING_DIACRITICAL_MARKS \
|
||||
TT_UCR_COMBINING_DIACRITICS
|
||||
|
|
Loading…
Reference in New Issue