minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* include/freetype/freetype.h (FT_Vector_Transform), 

include/freetype/ftimage.h (FT_Raster_Params),
include/freetype/ftoutln.h, src/base/ftoutln.c (FT_Outline_Get_CBox,
FT_Outline_Copy, FT_Outline_Transform, FT_Vector_Transform,
FT_Outline_Get_Bitmap), src/raster/ftraster.c (ft_black_render),
src/smooth/ftgrays.c (gray_raster_render): Decorate parameters with
`const' where appropriate.

* src/sfnt/ttsbit0.c (tt_sbit_decoder_load_image): Fix arguments
to call of tt_sbit_decoder_load_bitmap.
This commit is contained in:
Werner Lemberg 2005-04-14 16:03:15 +00:00
parent e7602c4b4a
commit c01c904249
8 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,13 @@
2005-04-14 Kirill Smelkov <kirr@mns.spb.ru>
* include/freetype/freetype.h (FT_Vector_Transform),
include/freetype/ftimage.h (FT_Raster_Params),
include/freetype/ftoutln.h, src/base/ftoutln.c (FT_Outline_Get_CBox,
FT_Outline_Copy, FT_Outline_Transform, FT_Vector_Transform,
FT_Outline_Get_Bitmap), src/raster/ftraster.c (ft_black_render),
src/smooth/ftgrays.c (gray_raster_render): Decorate parameters with
`const' where appropriate.
2005-04-14 Werner Lemberg <wl@gnu.org>
* src/type1/t1load.c (parse_charstrings): Catch this non-standard
@ -7,6 +17,9 @@
Private begin
CharStrings begin
* src/sfnt/ttsbit0.c (tt_sbit_decoder_load_image): Fix arguments
to call of tt_sbit_decoder_load_bitmap.
2005-04-13 Werner Lemberg <wl@gnu.org>
* docs/TODO: Updated.

4
include/freetype/freetype.h
View File

@ -3074,8 +3074,8 @@ FT_BEGIN_HEADER
/* The result is undefined if either `vector' or `matrix' is invalid. */
/* */
FT_EXPORT( void )
FT_Vector_Transform( FT_Vector* vec,
FT_Matrix* matrix );
FT_Vector_Transform( FT_Vector* vec,
const FT_Matrix* matrix );
/* */

4
include/freetype/ftimage.h
View File

@ -5,7 +5,7 @@
/* FreeType glyph image formats and default raster interface */
/* (specification). */
/* */
/* Copyright 1996-2001, 2002, 2003, 2004 by */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -1030,7 +1030,7 @@ FT_BEGIN_HEADER
/* */
typedef struct FT_Raster_Params_
{
FT_Bitmap* target;
const FT_Bitmap* target;
void* source;
int flags;
FT_SpanFunc gray_spans;

20
include/freetype/ftoutln.h
View File

@ -5,7 +5,7 @@
/* Support for the FT_Outline type used to store glyph shapes of */
/* most scalable font formats (specification). */
/* */
/* Copyright 1996-2001, 2002, 2003 by */
/* Copyright 1996-2001, 2002, 2003, 2005 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -229,8 +229,8 @@ FT_BEGIN_HEADER
/* acbox :: The outline's control box. */
/* */
FT_EXPORT( void )
FT_Outline_Get_CBox( FT_Outline* outline,
FT_BBox *acbox );
FT_Outline_Get_CBox( const FT_Outline* outline,
FT_BBox *acbox );
/*************************************************************************/
@ -275,8 +275,8 @@ FT_BEGIN_HEADER
/* FreeType error code. 0 means success. */
/* */
FT_EXPORT( FT_Error )
FT_Outline_Copy( FT_Outline* source,
FT_Outline *target );
FT_Outline_Copy( const FT_Outline* source,
FT_Outline *target );
/*************************************************************************/
@ -299,8 +299,8 @@ FT_BEGIN_HEADER
/* outline's points. */
/* */
FT_EXPORT( void )
FT_Outline_Transform( FT_Outline* outline,
FT_Matrix* matrix );
FT_Outline_Transform( FT_Outline* outline,
const FT_Matrix* matrix );
/*************************************************************************/
@ -353,9 +353,9 @@ FT_BEGIN_HEADER
/* It will use the raster correponding to the default glyph format. */
/* */
FT_EXPORT( FT_Error )
FT_Outline_Get_Bitmap( FT_Library library,
FT_Outline* outline,
FT_Bitmap *abitmap );
FT_Outline_Get_Bitmap( FT_Library library,
FT_Outline* outline,
const FT_Bitmap *abitmap );
/*************************************************************************/

24
src/base/ftoutln.c
View File

@ -4,7 +4,7 @@
/* */
/* FreeType outline management (body). */
/* */
/* Copyright 1996-2001, 2002, 2003, 2004 by */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -347,8 +347,8 @@
/* documentation is in ftoutln.h */
FT_EXPORT_DEF( FT_Error )
FT_Outline_Copy( FT_Outline* source,
FT_Outline *target )
FT_Outline_Copy( const FT_Outline* source,
FT_Outline *target )
{
FT_Int is_owner;
@ -414,8 +414,8 @@
/* documentation is in ftoutln.h */
FT_EXPORT_DEF( void )
FT_Outline_Get_CBox( FT_Outline* outline,
FT_BBox *acbox )
FT_Outline_Get_CBox( const FT_Outline* outline,
FT_BBox *acbox )
{
FT_Pos xMin, yMin, xMax, yMax;
@ -591,9 +591,9 @@
/* documentation is in ftoutln.h */
FT_EXPORT_DEF( FT_Error )
FT_Outline_Get_Bitmap( FT_Library library,
FT_Outline* outline,
FT_Bitmap *abitmap )
FT_Outline_Get_Bitmap( FT_Library library,
FT_Outline* outline,
const FT_Bitmap *abitmap )
{
FT_Raster_Params params;
@ -618,8 +618,8 @@
/* documentation is in ftoutln.h */
FT_EXPORT_DEF( void )
FT_Vector_Transform( FT_Vector* vector,
FT_Matrix* matrix )
FT_Vector_Transform( FT_Vector* vector,
const FT_Matrix* matrix )
{
FT_Pos xz, yz;
@ -641,8 +641,8 @@
/* documentation is in ftoutln.h */
FT_EXPORT_DEF( void )
FT_Outline_Transform( FT_Outline* outline,
FT_Matrix* matrix )
FT_Outline_Transform( FT_Outline* outline,
const FT_Matrix* matrix )
{
FT_Vector* vec = outline->points;
FT_Vector* limit = vec + outline->n_points;

4
src/raster/ftraster.c
View File

@ -3257,8 +3257,8 @@
ft_black_render( TRaster_Instance* raster,
FT_Raster_Params* params )
{
FT_Outline* outline = (FT_Outline*)params->source;
FT_Bitmap* target_map = params->target;
FT_Outline* outline = (FT_Outline*)params->source;
const FT_Bitmap* target_map = params->target;
if ( !raster || !raster->buff || !raster->sizeBuff )

2
src/sfnt/ttsbit0.c
View File

@ -927,7 +927,7 @@
return tt_sbit_decoder_load_bitmap( decoder,
image_format,
image_offset + image_start,
image_start,
image_end,
x_pos,
y_pos );

6
src/smooth/ftgrays.c
View File

@ -4,7 +4,7 @@
/* */
/* A new `perfect' anti-aliasing renderer (body). */
/* */
/* Copyright 2000-2001, 2002, 2003 by */
/* Copyright 2000-2001, 2002, 2003, 2005 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -1963,8 +1963,8 @@
gray_raster_render( PRaster raster,
FT_Raster_Params* params )
{
FT_Outline* outline = (FT_Outline*)params->source;
FT_Bitmap* target_map = params->target;
FT_Outline* outline = (FT_Outline*)params->source;
const FT_Bitmap* target_map = params->target;
if ( !raster || !raster->cells || !raster->max_cells )