From 255ce16e1d7f4bdd2d2eb3800f3778085376be2e Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 4 Jun 2005 05:27:18 +0000 Subject: [PATCH] * include/freetype/ftimage.h (FT_Outline_MoveToFunc, FT_Outline_LineToFunc, FT_Outline_ConicToFunc, FT_Outline_CubicToFunc, FT_Raster_RenderFunc), include/freetype/ftrender.h (FT_Glyph_TransformFunc, FT_Renderer_RenderFunc, FT_Renderer_TransformFunc): Don't use `const' to stay compatible with FreeType 2.1.9. --- ChangeLog | 9 +++++++++ include/freetype/ftimage.h | 26 +++++++++++++------------- include/freetype/ftrender.h | 22 +++++++++++----------- include/freetype/internal/ftmemory.h | 2 +- 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 593e4ef53..29239c811 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-06-04 Werner Lemberg + + * include/freetype/ftimage.h (FT_Outline_MoveToFunc, + FT_Outline_LineToFunc, FT_Outline_ConicToFunc, + FT_Outline_CubicToFunc, FT_Raster_RenderFunc), + include/freetype/ftrender.h (FT_Glyph_TransformFunc, + FT_Renderer_RenderFunc, FT_Renderer_TransformFunc): Don't use + `const' to stay compatible with FreeType 2.1.9. + 2005-06-01 Adam D. Moss * src/base/ftstroke.c (ft_stroker_inside): Revert `sigma' patch from diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h index aabcca47d..e92ace3a1 100644 --- a/include/freetype/ftimage.h +++ b/include/freetype/ftimage.h @@ -486,8 +486,8 @@ FT_BEGIN_HEADER /* Error code. 0 means success. */ /* */ typedef int - (*FT_Outline_MoveToFunc)( const FT_Vector* to, - void* user ); + (*FT_Outline_MoveToFunc)( FT_Vector* to, + void* user ); #define FT_Outline_MoveTo_Func FT_Outline_MoveToFunc @@ -512,8 +512,8 @@ FT_BEGIN_HEADER /* Error code. 0 means success. */ /* */ typedef int - (*FT_Outline_LineToFunc)( const FT_Vector* to, - void* user ); + (*FT_Outline_LineToFunc)( FT_Vector* to, + void* user ); #define FT_Outline_LineTo_Func FT_Outline_LineToFunc @@ -542,9 +542,9 @@ FT_BEGIN_HEADER /* Error code. 0 means success. */ /* */ typedef int - (*FT_Outline_ConicToFunc)( const FT_Vector* control, - const FT_Vector* to, - void* user ); + (*FT_Outline_ConicToFunc)( FT_Vector* control, + FT_Vector* to, + void* user ); #define FT_Outline_ConicTo_Func FT_Outline_ConicToFunc @@ -573,10 +573,10 @@ FT_BEGIN_HEADER /* Error code. 0 means success. */ /* */ typedef int - (*FT_Outline_CubicToFunc)( const FT_Vector* control1, - const FT_Vector* control2, - const FT_Vector* to, - void* user ); + (*FT_Outline_CubicToFunc)( FT_Vector* control1, + FT_Vector* control2, + FT_Vector* to, + void* user ); #define FT_Outline_CubicTo_Func FT_Outline_CubicToFunc @@ -1183,8 +1183,8 @@ FT_BEGIN_HEADER /* composition). */ /* */ typedef int - (*FT_Raster_RenderFunc)( FT_Raster raster, - const FT_Raster_Params* params ); + (*FT_Raster_RenderFunc)( FT_Raster raster, + FT_Raster_Params* params ); #define FT_Raster_Render_Func FT_Raster_RenderFunc diff --git a/include/freetype/ftrender.h b/include/freetype/ftrender.h index 5a01da479..21b051fc7 100644 --- a/include/freetype/ftrender.h +++ b/include/freetype/ftrender.h @@ -46,9 +46,9 @@ FT_BEGIN_HEADER (*FT_Glyph_DoneFunc)( FT_Glyph glyph ); typedef void - (*FT_Glyph_TransformFunc)( FT_Glyph glyph, - const FT_Matrix* matrix, - const FT_Vector* delta ); + (*FT_Glyph_TransformFunc)( FT_Glyph glyph, + FT_Matrix* matrix, + FT_Vector* delta ); typedef void (*FT_Glyph_GetBBoxFunc)( FT_Glyph glyph, @@ -85,16 +85,16 @@ FT_BEGIN_HEADER typedef FT_Error - (*FT_Renderer_RenderFunc)( FT_Renderer renderer, - FT_GlyphSlot slot, - FT_UInt mode, - const FT_Vector* origin ); + (*FT_Renderer_RenderFunc)( FT_Renderer renderer, + FT_GlyphSlot slot, + FT_UInt mode, + FT_Vector* origin ); typedef FT_Error - (*FT_Renderer_TransformFunc)( FT_Renderer renderer, - FT_GlyphSlot slot, - const FT_Matrix* matrix, - const FT_Vector* delta ); + (*FT_Renderer_TransformFunc)( FT_Renderer renderer, + FT_GlyphSlot slot, + FT_Matrix* matrix, + FT_Vector* delta ); typedef void diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h index cead50d72..d93a07797 100644 --- a/include/freetype/internal/ftmemory.h +++ b/include/freetype/internal/ftmemory.h @@ -192,7 +192,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* */ - /* FT_Realloc */ + /* FT_QRealloc */ /* */ /* */ /* Reallocates a block of memory pointed to by `*P' to `Size' bytes */