Cosmetic code changes.

This commit is contained in:
Werner Lemberg 2008-05-28 22:17:28 +00:00
parent 0e9b0ec460
commit 2b0b4221ab
21 changed files with 54 additions and 50 deletions

View File

@ -5,7 +5,7 @@
/* FreeType API for color filtering of subpixel bitmap glyphs */ /* FreeType API for color filtering of subpixel bitmap glyphs */
/* (specification). */ /* (specification). */
/* */ /* */
/* Copyright 2006, 2007 by */ /* Copyright 2006, 2007, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -85,7 +85,7 @@ FT_BEGIN_HEADER
* @since: * @since:
* 2.3.0 * 2.3.0
*/ */
typedef enum typedef enum FT_LcdFilter_
{ {
FT_LCD_FILTER_NONE = 0, FT_LCD_FILTER_NONE = 0,
FT_LCD_FILTER_DEFAULT = 1, FT_LCD_FILTER_DEFAULT = 1,

View File

@ -4,7 +4,7 @@
/* */ /* */
/* FreeType modules public interface (specification). */ /* FreeType modules public interface (specification). */
/* */ /* */
/* Copyright 1996-2001, 2002, 2003, 2006 by */ /* Copyright 1996-2001, 2002, 2003, 2006, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -362,7 +362,7 @@ FT_BEGIN_HEADER
* 2.2 * 2.2
* *
*/ */
typedef enum typedef enum FT_TrueTypeEngineType_
{ {
FT_TRUETYPE_ENGINE_TYPE_NONE = 0, FT_TRUETYPE_ENGINE_TYPE_NONE = 0,
FT_TRUETYPE_ENGINE_TYPE_UNPATENTED, FT_TRUETYPE_ENGINE_TYPE_UNPATENTED,

View File

@ -5,7 +5,7 @@
/* Support for the FT_Outline type used to store glyph shapes of */ /* Support for the FT_Outline type used to store glyph shapes of */
/* most scalable font formats (specification). */ /* most scalable font formats (specification). */
/* */ /* */
/* Copyright 1996-2001, 2002, 2003, 2005, 2006, 2007 by */ /* Copyright 1996-2001, 2002, 2003, 2005, 2006, 2007, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -473,7 +473,7 @@ FT_BEGIN_HEADER
* the glyph have different orientation. * the glyph have different orientation.
* *
*/ */
typedef enum typedef enum FT_Orientation_
{ {
FT_ORIENTATION_TRUETYPE = 0, FT_ORIENTATION_TRUETYPE = 0,
FT_ORIENTATION_POSTSCRIPT = 1, FT_ORIENTATION_POSTSCRIPT = 1,

View File

@ -4,7 +4,7 @@
/* */ /* */
/* FreeType path stroker (specification). */ /* FreeType path stroker (specification). */
/* */ /* */
/* Copyright 2002, 2003, 2004, 2005, 2006 by */ /* Copyright 2002, 2003, 2004, 2005, 2006, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -84,7 +84,7 @@ FT_BEGIN_HEADER
* is too closed (this is useful to avoid unpleasant spikes * is too closed (this is useful to avoid unpleasant spikes
* in beveled rendering). * in beveled rendering).
*/ */
typedef enum typedef enum FT_Stroker_LineJoin_
{ {
FT_STROKER_LINEJOIN_ROUND = 0, FT_STROKER_LINEJOIN_ROUND = 0,
FT_STROKER_LINEJOIN_BEVEL, FT_STROKER_LINEJOIN_BEVEL,
@ -115,7 +115,7 @@ FT_BEGIN_HEADER
* The end of lines is rendered as a square around the * The end of lines is rendered as a square around the
* last point. * last point.
*/ */
typedef enum typedef enum FT_Stroker_LineCap_
{ {
FT_STROKER_LINECAP_BUTT = 0, FT_STROKER_LINECAP_BUTT = 0,
FT_STROKER_LINECAP_ROUND, FT_STROKER_LINECAP_ROUND,
@ -149,7 +149,7 @@ FT_BEGIN_HEADER
* You can however use @FT_Outline_GetInsideBorder and * You can however use @FT_Outline_GetInsideBorder and
* @FT_Outline_GetOutsideBorder to get these. * @FT_Outline_GetOutsideBorder to get these.
*/ */
typedef enum typedef enum FT_StrokerBorder_
{ {
FT_STROKER_BORDER_LEFT = 0, FT_STROKER_BORDER_LEFT = 0,
FT_STROKER_BORDER_RIGHT FT_STROKER_BORDER_RIGHT

View File

@ -54,7 +54,7 @@ FT_BEGIN_HEADER
#define FT_TRACE_DEF( x ) trace_ ## x , #define FT_TRACE_DEF( x ) trace_ ## x ,
/* defining the enumeration */ /* defining the enumeration */
typedef enum typedef enum FT_Trace_
{ {
#include FT_INTERNAL_TRACE_H #include FT_INTERNAL_TRACE_H
trace_count trace_count

View File

@ -5,7 +5,7 @@
/* Basic SFNT/TrueType type definitions and interface (specification */ /* Basic SFNT/TrueType type definitions and interface (specification */
/* only). */ /* only). */
/* */ /* */
/* Copyright 1996-2001, 2002, 2004, 2005, 2006, 2007 by */ /* Copyright 1996-2001, 2002, 2004, 2005, 2006, 2007, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -586,7 +586,7 @@ FT_BEGIN_HEADER
/* table_offset :: The offset of the index table in the `EBLC' */ /* table_offset :: The offset of the index table in the `EBLC' */
/* table. Only used during strike loading. */ /* table. Only used during strike loading. */
/* */ /* */
typedef struct TT_SBit_RangeRec typedef struct TT_SBit_RangeRec_
{ {
FT_UShort first_glyph; FT_UShort first_glyph;
FT_UShort last_glyph; FT_UShort last_glyph;

View File

@ -190,7 +190,7 @@ FT_BEGIN_HEADER
/* given blend dictionary (font info or private). Used to support */ /* given blend dictionary (font info or private). Used to support */
/* Multiple Masters fonts. */ /* Multiple Masters fonts. */
/* */ /* */
typedef enum typedef enum T1_Blend_Flags_
{ {
/*# required fields in a FontInfo blend dictionary */ /*# required fields in a FontInfo blend dictionary */
T1_BLEND_UNDERLINE_POSITION = 0, T1_BLEND_UNDERLINE_POSITION = 0,

View File

@ -5,7 +5,7 @@
/* Basic SFNT/TrueType tables definitions and interface */ /* Basic SFNT/TrueType tables definitions and interface */
/* (specification only). */ /* (specification only). */
/* */ /* */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */ /* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -555,7 +555,7 @@ FT_BEGIN_HEADER
/* An enumeration used to specify the index of an SFNT table. */ /* An enumeration used to specify the index of an SFNT table. */
/* Used in the @FT_Get_Sfnt_Table API function. */ /* Used in the @FT_Get_Sfnt_Table API function. */
/* */ /* */
typedef enum typedef enum FT_Sfnt_Tag_
{ {
ft_sfnt_head = 0, ft_sfnt_head = 0,
ft_sfnt_maxp = 1, ft_sfnt_maxp = 1,

View File

@ -4,7 +4,7 @@
/* */ /* */
/* Auto-fitter hinting routines (specification). */ /* Auto-fitter hinting routines (specification). */
/* */ /* */
/* Copyright 2003, 2004, 2005, 2006, 2007 by */ /* Copyright 2003, 2004, 2005, 2006, 2007, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -30,7 +30,7 @@ FT_BEGIN_HEADER
* script analysis routines (until now). * script analysis routines (until now).
*/ */
typedef enum typedef enum AF_Dimension_
{ {
AF_DIMENSION_HORZ = 0, /* x coordinates, */ AF_DIMENSION_HORZ = 0, /* x coordinates, */
/* i.e., vertical segments & edges */ /* i.e., vertical segments & edges */
@ -44,7 +44,7 @@ FT_BEGIN_HEADER
/* hint directions -- the values are computed so that two vectors are */ /* hint directions -- the values are computed so that two vectors are */
/* in opposite directions iff `dir1 + dir2 == 0' */ /* in opposite directions iff `dir1 + dir2 == 0' */
typedef enum typedef enum AF_Direction_
{ {
AF_DIR_NONE = 4, AF_DIR_NONE = 4,
AF_DIR_RIGHT = 1, AF_DIR_RIGHT = 1,
@ -56,7 +56,7 @@ FT_BEGIN_HEADER
/* point hint flags */ /* point hint flags */
typedef enum typedef enum AF_Flags_
{ {
AF_FLAG_NONE = 0, AF_FLAG_NONE = 0,
@ -87,7 +87,7 @@ FT_BEGIN_HEADER
/* edge hint flags */ /* edge hint flags */
typedef enum typedef enum AF_Edge_Flags_
{ {
AF_EDGE_NORMAL = 0, AF_EDGE_NORMAL = 0,
AF_EDGE_ROUND = 1 << 0, AF_EDGE_ROUND = 1 << 0,

View File

@ -4,7 +4,7 @@
/* */ /* */
/* Auto-fitter types (specification only). */ /* Auto-fitter types (specification only). */
/* */ /* */
/* Copyright 2003, 2004, 2005, 2006, 2007 by */ /* Copyright 2003, 2004, 2005, 2006, 2007, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -202,7 +202,7 @@ extern void* _af_debug_hints;
* auto-hinted glyph image. * auto-hinted glyph image.
*/ */
typedef enum typedef enum AF_ScalerFlags_
{ {
AF_SCALER_FLAG_NO_HORIZONTAL = 1, /* disable horizontal hinting */ AF_SCALER_FLAG_NO_HORIZONTAL = 1, /* disable horizontal hinting */
AF_SCALER_FLAG_NO_VERTICAL = 2, /* disable vertical hinting */ AF_SCALER_FLAG_NO_VERTICAL = 2, /* disable vertical hinting */
@ -260,7 +260,7 @@ extern void* _af_debug_hints;
* used by more than one script. * used by more than one script.
*/ */
typedef enum typedef enum AF_Script_
{ {
AF_SCRIPT_NONE = 0, AF_SCRIPT_NONE = 0,
AF_SCRIPT_LATIN = 1, AF_SCRIPT_LATIN = 1,

View File

@ -4,7 +4,7 @@
/* */ /* */
/* FreeType path stroker (body). */ /* FreeType path stroker (body). */
/* */ /* */
/* Copyright 2002, 2003, 2004, 2005, 2006 by */ /* Copyright 2002, 2003, 2004, 2005, 2006, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -230,7 +230,7 @@
/***************************************************************************/ /***************************************************************************/
/***************************************************************************/ /***************************************************************************/
typedef enum typedef enum FT_StrokeTags_
{ {
FT_STROKE_TAG_ON = 1, /* on-curve point */ FT_STROKE_TAG_ON = 1, /* on-curve point */
FT_STROKE_TAG_CUBIC = 2, /* cubic off-point */ FT_STROKE_TAG_CUBIC = 2, /* cubic off-point */

View File

@ -4,7 +4,8 @@
/* */ /* */
/* TrueTypeGX/AAT feat table validation (body). */ /* TrueTypeGX/AAT feat table validation (body). */
/* */ /* */
/* Copyright 2004, 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* Copyright 2004, 2005, 2008 by */
/* suzuki toshiya, Masatake YAMATO, Red Hat K.K., */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -59,7 +60,7 @@
#define GXV_FEAT_DATA( field ) GXV_TABLE_DATA( feat, field ) #define GXV_FEAT_DATA( field ) GXV_TABLE_DATA( feat, field )
typedef enum typedef enum GXV_FeatureFlagsMask_
{ {
GXV_FEAT_MASK_EXCLUSIVE_SETTINGS = 0x8000U, GXV_FEAT_MASK_EXCLUSIVE_SETTINGS = 0x8000U,
GXV_FEAT_MASK_DYNAMIC_DEFAULT = 0x4000, GXV_FEAT_MASK_DYNAMIC_DEFAULT = 0x4000,

View File

@ -8,7 +8,7 @@
/* be used to parse compressed PCF fonts, as found with many X11 server */ /* be used to parse compressed PCF fonts, as found with many X11 server */
/* distributions. */ /* distributions. */
/* */ /* */
/* Copyright 2005, 2006, 2007 by David Turner. */ /* Copyright 2005, 2006, 2007, 2008 by David Turner. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
/* modified, and distributed under the terms of the FreeType project */ /* modified, and distributed under the terms of the FreeType project */
@ -46,7 +46,7 @@
#define LZW_MASK( n ) ( ( 1U << (n) ) - 1U ) #define LZW_MASK( n ) ( ( 1U << (n) ) - 1U )
typedef enum typedef enum FT_LzwPhase_
{ {
FT_LZW_PHASE_START = 0, FT_LZW_PHASE_START = 0,
FT_LZW_PHASE_CODE, FT_LZW_PHASE_CODE,
@ -109,7 +109,7 @@
* `free_ent', `num_bits' cannot grow larger than `max_bits'. * `free_ent', `num_bits' cannot grow larger than `max_bits'.
*/ */
typedef struct _FT_LzwStateRec typedef struct FT_LzwStateRec_
{ {
FT_LzwPhase phase; FT_LzwPhase phase;
FT_Int in_eof; FT_Int in_eof;

View File

@ -4,7 +4,7 @@
/* */ /* */
/* PostScript hinting algorithm (specification). */ /* PostScript hinting algorithm (specification). */
/* */ /* */
/* Copyright 2001, 2002, 2003 by */ /* Copyright 2001, 2002, 2003, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -32,7 +32,7 @@ FT_BEGIN_HEADER
typedef struct PSH_HintRec_* PSH_Hint; typedef struct PSH_HintRec_* PSH_Hint;
/* hint bit-flags */ /* hint bit-flags */
typedef enum typedef enum PSH_Hint_Flags_
{ {
PSH_HINT_GHOST = PS_HINT_FLAG_GHOST, PSH_HINT_GHOST = PS_HINT_FLAG_GHOST,
PSH_HINT_BOTTOM = PS_HINT_FLAG_BOTTOM, PSH_HINT_BOTTOM = PS_HINT_FLAG_BOTTOM,

View File

@ -4,7 +4,7 @@
/* */ /* */
/* Postscript (Type1/Type2) hints recorder (specification). */ /* Postscript (Type1/Type2) hints recorder (specification). */
/* */ /* */
/* Copyright 2001, 2002, 2003, 2006 by */ /* Copyright 2001, 2002, 2003, 2006, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -52,7 +52,7 @@ FT_BEGIN_HEADER
typedef struct PS_HintRec_* PS_Hint; typedef struct PS_HintRec_* PS_Hint;
/* hint types */ /* hint types */
typedef enum typedef enum PS_Hint_Type_
{ {
PS_HINT_TYPE_1 = 1, PS_HINT_TYPE_1 = 1,
PS_HINT_TYPE_2 = 2 PS_HINT_TYPE_2 = 2
@ -61,7 +61,7 @@ FT_BEGIN_HEADER
/* hint flags */ /* hint flags */
typedef enum typedef enum PS_Hint_Flags_
{ {
PS_HINT_FLAG_GHOST = 1, PS_HINT_FLAG_GHOST = 1,
PS_HINT_FLAG_BOTTOM = 2 PS_HINT_FLAG_BOTTOM = 2

View File

@ -4,7 +4,7 @@
/* */ /* */
/* SFNT object management (base). */ /* SFNT object management (base). */
/* */ /* */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */ /* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -285,7 +285,7 @@
sfnt_find_encoding( int platform_id, sfnt_find_encoding( int platform_id,
int encoding_id ) int encoding_id )
{ {
typedef struct TEncoding typedef struct TEncoding_
{ {
int platform_id; int platform_id;
int encoding_id; int encoding_id;

View File

@ -5,7 +5,7 @@
/* TrueType and OpenType embedded bitmap support (body). */ /* TrueType and OpenType embedded bitmap support (body). */
/* This is a heap-optimized version. */ /* This is a heap-optimized version. */
/* */ /* */
/* Copyright 2005, 2006, 2007 by */ /* Copyright 2005, 2006, 2007, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -207,7 +207,7 @@
} }
typedef struct typedef struct TT_SBitDecoderRec_
{ {
TT_Face face; TT_Face face;
FT_Stream stream; FT_Stream stream;

View File

@ -10,7 +10,7 @@
* accepted if you are using GCC for compilation (and probably by * accepted if you are using GCC for compilation (and probably by
* other compilers too). * other compilers too).
* *
* Author: David Turner, 2005, 2006 * Author: David Turner, 2005, 2006, 2008
* *
* This code is explicitly placed into the public domain. * This code is explicitly placed into the public domain.
* *
@ -26,7 +26,7 @@
#define LINEBUFF_SIZE 1024 #define LINEBUFF_SIZE 1024
typedef enum typedef enum OutputFormat_
{ {
OUTPUT_LIST = 0, /* output the list of names, one per line */ OUTPUT_LIST = 0, /* output the list of names, one per line */
OUTPUT_WINDOWS_DEF, /* output a Windows .DEF file for Visual C++ or Mingw */ OUTPUT_WINDOWS_DEF, /* output a Windows .DEF file for Visual C++ or Mingw */
@ -44,7 +44,7 @@ panic( const char* message )
} }
typedef struct typedef struct NameRec_
{ {
char* name; char* name;
unsigned int hash; unsigned int hash;
@ -191,7 +191,7 @@ names_dump( FILE* out,
/* states of the line parser */ /* states of the line parser */
typedef enum typedef enum State_
{ {
STATE_START = 0, /* waiting for FT_EXPORT keyword and return type */ STATE_START = 0, /* waiting for FT_EXPORT keyword and return type */
STATE_TYPE /* type was read, waiting for function name */ STATE_TYPE /* type was read, waiting for function name */

View File

@ -337,7 +337,8 @@
} }
typedef struct GX_GVar_Head_ { typedef struct GX_GVar_Head_
{
FT_Long version; FT_Long version;
FT_UShort axisCount; FT_UShort axisCount;
FT_UShort globalCoordCount; FT_UShort globalCoordCount;
@ -564,7 +565,8 @@
/*************************************************************************/ /*************************************************************************/
typedef struct GX_FVar_Head_ { typedef struct GX_FVar_Head_
{
FT_Long version; FT_Long version;
FT_UShort offsetToData; FT_UShort offsetToData;
FT_UShort countSizePairs; FT_UShort countSizePairs;
@ -576,7 +578,8 @@
} GX_FVar_Head; } GX_FVar_Head;
typedef struct fvar_axis { typedef struct fvar_axis_
{
FT_ULong axisTag; FT_ULong axisTag;
FT_ULong minValue; FT_ULong minValue;
FT_ULong defaultValue; FT_ULong defaultValue;

View File

@ -6278,7 +6278,7 @@
/* Local variables for Ins_IUP: */ /* Local variables for Ins_IUP: */
typedef struct typedef struct IUP_WorkerRec_
{ {
FT_Vector* orgs; /* original and current coordinate */ FT_Vector* orgs; /* original and current coordinate */
FT_Vector* curs; /* arrays */ FT_Vector* curs; /* arrays */

View File

@ -4,7 +4,7 @@
/* */ /* */
/* Type 42 font parser (body). */ /* Type 42 font parser (body). */
/* */ /* */
/* Copyright 2002, 2003, 2004, 2005, 2006, 2007 by Roberto Alameda. */ /* Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 by Roberto Alameda. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
/* modified, and distributed under the terms of the FreeType project */ /* modified, and distributed under the terms of the FreeType project */
@ -471,7 +471,7 @@
} }
typedef enum typedef enum T42_Load_Status_
{ {
BEFORE_START, BEFORE_START,
BEFORE_TABLE_DIR, BEFORE_TABLE_DIR,