diff options
| author | David Turner <david@freetype.org> | 2000-10-23 22:46:56 +0000 |
|---|---|---|
| committer | David Turner <david@freetype.org> | 2000-10-23 22:46:56 +0000 |
| commit | dc26e7b77f6751d014123ccebbd78d9a0603f030 (patch) | |
| tree | 6c2710a01f9ba2efba64d632511ff3004b30f3cf /src | |
| parent | 8aed85292358a9e0f89931fa0d1f5ca72e591f31 (diff) | |
- minor reformatting of "ftmodule.h"
- added missing "const" statements in the source code in order
to really get rid of writable static variables
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/ftinit.c | 4 | ||||
| -rw-r--r-- | src/base/ftoutln.c | 6 | ||||
| -rw-r--r-- | src/raster1/ftraster.c | 2 | ||||
| -rw-r--r-- | src/raster1/ftraster.h | 2 | ||||
| -rw-r--r-- | src/smooth/ftgrays.c | 10 | ||||
| -rw-r--r-- | src/smooth/ftgrays.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/base/ftinit.c b/src/base/ftinit.c index ed060d5a..b5a4abeb 100644 --- a/src/base/ftinit.c +++ b/src/base/ftinit.c @@ -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 }; diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c index 20292d0c..d983f6c9 100644 --- a/src/base/ftoutln.c +++ b/src/base/ftoutln.c @@ -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 ) diff --git a/src/raster1/ftraster.c b/src/raster1/ftraster.c index 2f300c49..3db811b6 100644 --- a/src/raster1/ftraster.c +++ b/src/raster1/ftraster.c @@ -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, diff --git a/src/raster1/ftraster.h b/src/raster1/ftraster.h index 5c7faae5..36fa51cd 100644 --- a/src/raster1/ftraster.h +++ b/src/raster1/ftraster.h @@ -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 } diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 5a793ef9..6b67705f 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -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, diff --git a/src/smooth/ftgrays.h b/src/smooth/ftgrays.h index 2423a0e4..7b0956d9 100644 --- a/src/smooth/ftgrays.h +++ b/src/smooth/ftgrays.h @@ -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 } |