Formatting.

This commit is contained in:
Werner Lemberg 2008-11-29 09:31:44 +00:00
parent c7597edb6a
commit 02197280b4
7 changed files with 22 additions and 22 deletions

View File

@ -46,7 +46,7 @@
#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_DEBUG_H
#if defined( FT_DEBUG_LEVEL_ERROR ) #ifdef FT_DEBUG_LEVEL_ERROR
/* documentation is in ftdebug.h */ /* documentation is in ftdebug.h */

View File

@ -1170,7 +1170,7 @@
} }
#if defined( FT_CONFIG_OPTION_MAC_FONTS ) #ifdef FT_CONFIG_OPTION_MAC_FONTS
/* The behavior here is very similar to that in base/ftmac.c, but it */ /* The behavior here is very similar to that in base/ftmac.c, but it */
/* is designed to work on non-mac systems, so no mac specific calls. */ /* is designed to work on non-mac systems, so no mac specific calls. */
@ -1287,7 +1287,7 @@
args.driver = FT_Get_Module( library, driver_name ); args.driver = FT_Get_Module( library, driver_name );
} }
#if defined( FT_MACINTOSH ) #ifdef FT_MACINTOSH
/* At this point, face_index has served its purpose; */ /* At this point, face_index has served its purpose; */
/* whoever calls this function has already used it to */ /* whoever calls this function has already used it to */
/* locate the correct font data. We should not propagate */ /* locate the correct font data. We should not propagate */
@ -1302,7 +1302,7 @@
if ( error == FT_Err_Ok ) if ( error == FT_Err_Ok )
(*aface)->face_flags &= ~FT_FACE_FLAG_EXTERNAL_STREAM; (*aface)->face_flags &= ~FT_FACE_FLAG_EXTERNAL_STREAM;
else else
#if defined( FT_MACINTOSH ) #ifdef FT_MACINTOSH
FT_Stream_Free( stream, 0 ); FT_Stream_Free( stream, 0 );
#else #else
{ {

View File

@ -2,7 +2,7 @@
FreeType font driver for pcf fonts FreeType font driver for pcf fonts
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by
Francesco Zappa Nardelli Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
@ -48,7 +48,7 @@ THE SOFTWARE.
#define FT_COMPONENT trace_pcfread #define FT_COMPONENT trace_pcfread
#if defined( FT_DEBUG_LEVEL_TRACE ) #ifdef FT_DEBUG_LEVEL_TRACE
static const char* const tableNames[] = static const char* const tableNames[] =
{ {
"prop", "accl", "mtrcs", "bmps", "imtrcs", "prop", "accl", "mtrcs", "bmps", "imtrcs",
@ -152,7 +152,7 @@ THE SOFTWARE.
break; break;
} }
#if defined( FT_DEBUG_LEVEL_TRACE ) #ifdef FT_DEBUG_LEVEL_TRACE
{ {
FT_UInt i, j; FT_UInt i, j;

View File

@ -961,7 +961,7 @@
FT_UInt i, count; FT_UInt i, count;
#if !defined FT_CONFIG_OPTION_OLD_INTERNALS #ifndef FT_CONFIG_OPTION_OLD_INTERNALS
count = face->sbit_num_strikes; count = face->sbit_num_strikes;
#else #else
count = (FT_UInt)face->num_sbit_strikes; count = (FT_UInt)face->num_sbit_strikes;
@ -1075,7 +1075,7 @@
} }
/* freeing the horizontal metrics */ /* freeing the horizontal metrics */
#if !defined FT_CONFIG_OPTION_OLD_INTERNALS #ifndef FT_CONFIG_OPTION_OLD_INTERNALS
{ {
FT_Stream stream = FT_FACE_STREAM( face ); FT_Stream stream = FT_FACE_STREAM( face );

View File

@ -4,7 +4,7 @@
/* */ /* */
/* Load the metrics tables common to TTF and OTF fonts (body). */ /* Load the metrics tables common to TTF and OTF fonts (body). */
/* */ /* */
/* 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, */
@ -60,7 +60,7 @@
/* <Return> */ /* <Return> */
/* FreeType error code. 0 means success. */ /* FreeType error code. 0 means success. */
/* */ /* */
#if !defined FT_CONFIG_OPTION_OLD_INTERNALS #ifndef FT_CONFIG_OPTION_OLD_INTERNALS
FT_LOCAL_DEF( FT_Error ) FT_LOCAL_DEF( FT_Error )
tt_face_load_hmtx( TT_Face face, tt_face_load_hmtx( TT_Face face,
@ -97,7 +97,7 @@
return error; return error;
} }
#else /* !OPTIMIZE_MEMORY || OLD_INTERNALS */ #else /* !FT_CONFIG_OPTION_OLD_INTERNALS */
FT_LOCAL_DEF( FT_Error ) FT_LOCAL_DEF( FT_Error )
tt_face_load_hmtx( TT_Face face, tt_face_load_hmtx( TT_Face face,
@ -229,7 +229,7 @@
return error; return error;
} }
#endif /* !OPTIMIZE_MEMORY || OLD_INTERNALS */ #endif /* !FT_CONFIG_OPTION_OLD_INTERNALS */
/*************************************************************************/ /*************************************************************************/
@ -341,7 +341,7 @@
/* */ /* */
/* advance :: The advance width resp. advance height. */ /* advance :: The advance width resp. advance height. */
/* */ /* */
#if !defined FT_CONFIG_OPTION_OLD_INTERNALS #ifndef FT_CONFIG_OPTION_OLD_INTERNALS
FT_LOCAL_DEF( FT_Error ) FT_LOCAL_DEF( FT_Error )
tt_face_get_metrics( TT_Face face, tt_face_get_metrics( TT_Face face,
@ -420,7 +420,7 @@
return SFNT_Err_Ok; return SFNT_Err_Ok;
} }
#else /* OLD_INTERNALS */ #else /* !FT_CONFIG_OPTION_OLD_INTERNALS */
FT_LOCAL_DEF( FT_Error ) FT_LOCAL_DEF( FT_Error )
tt_face_get_metrics( TT_Face face, tt_face_get_metrics( TT_Face face,
@ -460,7 +460,7 @@
return SFNT_Err_Ok; return SFNT_Err_Ok;
} }
#endif /* !OPTIMIZE_MEMORY || OLD_INTERNALS */ #endif /* !FT_CONFIG_OPTION_OLD_INTERNALS */
/* END */ /* END */

View File

@ -4,7 +4,7 @@
/* */ /* */
/* TrueType and OpenType embedded bitmap support (body). */ /* TrueType and OpenType embedded bitmap support (body). */
/* */ /* */
/* 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, */
@ -24,11 +24,11 @@
* Alas, the memory-optimized sbit loader can't be used when implementing * Alas, the memory-optimized sbit loader can't be used when implementing
* the `old internals' hack * the `old internals' hack
*/ */
#if !defined FT_CONFIG_OPTION_OLD_INTERNALS #ifndef FT_CONFIG_OPTION_OLD_INTERNALS
#include "ttsbit0.c" #include "ttsbit0.c"
#else /* !FT_CONFIG_OPTION_OLD_INTERNALS */ #else /* FT_CONFIG_OPTION_OLD_INTERNALS */
#include <ft2build.h> #include <ft2build.h>
#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_DEBUG_H
@ -1496,7 +1496,7 @@
return error; return error;
} }
#endif /* !FT_CONFIG_OPTION_OLD_INTERNALS */ #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
/* END */ /* END */

View File

@ -4,7 +4,7 @@
/* */ /* */
/* TrueType and OpenType embedded bitmap support (specification). */ /* TrueType and OpenType embedded bitmap support (specification). */
/* */ /* */
/* 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, */
@ -45,7 +45,7 @@ FT_BEGIN_HEADER
FT_ULong strike_index, FT_ULong strike_index,
FT_Size_Metrics* metrics ); FT_Size_Metrics* metrics );
#if defined FT_CONFIG_OPTION_OLD_INTERNALS #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
FT_LOCAL( FT_Error ) FT_LOCAL( FT_Error )
tt_find_sbit_image( TT_Face face, tt_find_sbit_image( TT_Face face,
FT_UInt glyph_index, FT_UInt glyph_index,