- minor reformatting of "ftmodule.h"

- added missing "const" statements in the source code in order
  to really get rid of writable static variables
This commit is contained in:
David Turner 2000-10-23 22:46:56 +00:00
parent 8aed852923
commit dc26e7b77f
7 changed files with 16 additions and 16 deletions

View File

@ -53,9 +53,9 @@
/* FreeType error code. 0 means sucess. */
/* */
FT_EXPORT_DEF( FT_Error ) FT_Outline_Decompose(
FT_Outline* outline,
FT_Outline_Funcs* interface,
void* user );
FT_Outline* outline,
const FT_Outline_Funcs* interface,
void* user );
/*************************************************************************/

View File

@ -65,8 +65,8 @@
#define FT_USE_MODULE( x ) (const FT_Module_Class*)&x,
static
const FT_Module_Class* ft_default_modules[] =
{
const FT_Module_Class* const ft_default_modules[] =
const {
#include <freetype/config/ftmodule.h>
0
};

View File

@ -66,9 +66,9 @@
/* FreeType error code. 0 means sucess. */
/* */
FT_EXPORT_FUNC( FT_Error ) FT_Outline_Decompose(
FT_Outline* outline,
FT_Outline_Funcs* interface,
void* user )
FT_Outline* outline,
const FT_Outline_Funcs* interface,
void* user )
{
#undef SCALED
#define SCALED( x ) ( ( (x) << shift ) - delta )

View File

@ -3281,7 +3281,7 @@
}
FT_Raster_Funcs ft_standard_raster =
const FT_Raster_Funcs ft_standard_raster =
{
ft_glyph_format_outline,
(FT_Raster_New_Func) ft_black_new,

View File

@ -37,7 +37,7 @@
#define FT_EXPORT_VAR( x ) extern x
#endif
FT_EXPORT_VAR( FT_Raster_Funcs ) ft_standard_raster;
FT_EXPORT_VAR( const FT_Raster_Funcs ) ft_standard_raster;
#ifdef __cplusplus
}

View File

@ -1486,9 +1486,9 @@
/* Error code. 0 means sucess. */
/* */
static
int FT_Outline_Decompose( FT_Outline* outline,
FT_Outline_Funcs* interface,
void* user )
int FT_Outline_Decompose( FT_Outline* outline,
const FT_Outline_Funcs* interface,
void* user )
{
#undef SCALED
#define SCALED( x ) ( ( (x) << shift ) - delta )
@ -1699,7 +1699,7 @@
int grays_convert_glyph( RAS_ARG_ FT_Outline* outline )
{
static
FT_Outline_Funcs interface =
const FT_Outline_Funcs interface =
{
(FT_Outline_MoveTo_Func) Move_To,
(FT_Outline_LineTo_Func) Line_To,
@ -1958,7 +1958,7 @@
}
FT_Raster_Funcs ft_grays_raster =
const FT_Raster_Funcs ft_grays_raster =
{
ft_glyph_format_outline,

View File

@ -40,7 +40,7 @@
#define FT_EXPORT_VAR( x ) extern x
#endif
FT_EXPORT_VAR( FT_Raster_Funcs ) ft_grays_raster;
FT_EXPORT_VAR( const FT_Raster_Funcs ) ft_grays_raster;
#ifdef __cplusplus
}