ref: eba5ad4b37080ae2212241491ecc029591841b16
parent: b5713c54c31283ae7fa69549ef0c90bfa8cea14b
author: David Turner <[email protected]>
date: Thu Mar 14 07:56:35 EST 2002
no message
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,9 @@
src/base/ftnames.c, src/cff/cffdrivr.c,
src/sfnt/*.c, src/truetype/*.c: updated SFNT/TrueType type
definitions
+
+ * include/freetype/freetype.h, include/freetype/internal/ftgloadr.h:
+ updating type defintiions for the glyph loader
2002-03-13 Antoine Leca <[email protected]>
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -1134,7 +1134,7 @@
/* The subglyph implementation is not part of the high-level API, */
/* hence the forward structure declaration. */
/* */
- typedef struct FT_SubGlyph_ FT_SubGlyph;
+ typedef struct FT_SubGlyphRec_* FT_SubGlyph;
/*************************************************************************/
@@ -1299,7 +1299,7 @@
FT_Outline outline;
FT_UInt num_subglyphs;
- FT_SubGlyph* subglyphs;
+ FT_SubGlyph subglyphs;
void* control_data;
long control_len;
--- a/include/freetype/internal/ftgloadr.h
+++ b/include/freetype/internal/ftgloadr.h
@@ -50,7 +50,7 @@
};
- struct FT_SubGlyph_
+ typedef struct FT_SubGlyphRec_
{FT_Int index;
FT_UShort flags;
@@ -57,7 +57,8 @@
FT_Int arg1;
FT_Int arg2;
FT_Matrix transform;
- };
+
+ } FT_SubGlyphRec;
typedef struct FT_GlyphLoadRec_
@@ -65,7 +66,7 @@
FT_Outline outline; /* outline */
FT_Vector* extra_points; /* extra points table */
FT_UInt num_subglyphs; /* number of subglyphs */
- FT_SubGlyph* subglyphs; /* subglyphs */
+ FT_SubGlyph subglyphs; /* subglyphs */
} FT_GlyphLoadRec, *FT_GlyphLoad;
@@ -93,7 +94,7 @@
/* add an extra points table to a glyph loader */
FT_BASE( FT_Error )
- FT_GlyphLoader_Create_Extra( FT_GlyphLoader loader );
+ FT_GlyphLoader_CreateExtra( FT_GlyphLoader loader );
/* destroy a glyph loader */
FT_BASE( void )
@@ -110,15 +111,15 @@
/* check that there is enough room to add 'n_points' and 'n_contours' */
/* to the glyph loader.. */
FT_BASE( FT_Error )
- FT_GlyphLoader_Check_Points( FT_GlyphLoader loader,
- FT_UInt n_points,
- FT_UInt n_contours );
+ FT_GlyphLoader_CheckPoints( FT_GlyphLoader loader,
+ FT_UInt n_points,
+ FT_UInt n_contours );
/* check that there is enough room to add 'n_subs' sub-glyphs to */
/* a glyph loader */
FT_BASE( FT_Error )
- FT_GlyphLoader_Check_Subglyphs( FT_GlyphLoader loader,
- FT_UInt n_subs );
+ FT_GlyphLoader_CheckSubGlyphs( FT_GlyphLoader loader,
+ FT_UInt n_subs );
/* prepare a glyph loader, i.e. empty the current glyph */
FT_BASE( void )
@@ -130,8 +131,8 @@
/* copy points from one glyph loader to another */
FT_BASE( FT_Error )
- FT_GlyphLoader_Copy_Points( FT_GlyphLoader target,
- FT_GlyphLoader source );
+ FT_GlyphLoader_CopyPoints( FT_GlyphLoader target,
+ FT_GlyphLoader source );
/* */
--- a/src/autohint/ahhint.c
+++ b/src/autohint/ahhint.c
@@ -1141,7 +1141,7 @@
{FT_UInt nn, num_subglyphs = slot->num_subglyphs;
FT_UInt num_base_subgs, start_point;
- FT_SubGlyph* subglyph;
+ FT_SubGlyph subglyph;
start_point = gloader->base.outline.n_points;
--- a/src/autohint/ahloader.h
+++ b/src/autohint/ahloader.h
@@ -50,12 +50,12 @@
#define ah_loader_done FT_GlyphLoader_Done
#define ah_loader_reset FT_GlyphLoader_Reset
#define ah_loader_rewind FT_GlyphLoader_Rewind
- #define ah_loader_create_extra FT_GlyphLoader_Create_Extra
- #define ah_loader_check_points FT_GlyphLoader_Check_Points
- #define ah_loader_check_subglyphs FT_GlyphLoader_Check_Subglyphs
+ #define ah_loader_create_extra FT_GlyphLoader_CreateExtra
+ #define ah_loader_check_points FT_GlyphLoader_CheckPoints
+ #define ah_loader_check_subglyphs FT_GlyphLoader_CheckSubGlyphs
#define ah_loader_prepare FT_GlyphLoader_Prepare
#define ah_loader_add FT_GlyphLoader_Add
- #define ah_loader_copy_points FT_GlyphLoader_Copy_Points
+ #define ah_loader_copy_points FT_GlyphLoader_CopyPoints
FT_END_HEADER
--- a/src/base/ftgloadr.c
+++ b/src/base/ftgloadr.c
@@ -135,7 +135,7 @@
FT_BASE_DEF( FT_Error )
- FT_GlyphLoader_Create_Extra( FT_GlyphLoader loader )
+ FT_GlyphLoader_CreateExtra( FT_GlyphLoader loader )
{FT_Error error;
FT_Memory memory = loader->memory;
@@ -168,7 +168,7 @@
/* DOESN'T change the number of points within the loader! */
/* */
FT_BASE_DEF( FT_Error )
- FT_GlyphLoader_Check_Points( FT_GlyphLoader loader,
+ FT_GlyphLoader_CheckPoints( FT_GlyphLoader loader,
FT_UInt n_points,
FT_UInt n_contours )
{@@ -229,7 +229,7 @@
/* NOT change the number of subglyphs within the loader! */
/* */
FT_BASE_DEF( FT_Error )
- FT_GlyphLoader_Check_Subglyphs( FT_GlyphLoader loader,
+ FT_GlyphLoader_CheckSubGlyphs( FT_GlyphLoader loader,
FT_UInt n_subs )
{FT_Memory memory = loader->memory;
@@ -304,7 +304,7 @@
FT_BASE_DEF( FT_Error )
- FT_GlyphLoader_Copy_Points( FT_GlyphLoader target,
+ FT_GlyphLoader_CopyPoints( FT_GlyphLoader target,
FT_GlyphLoader source )
{FT_Error error;
@@ -312,7 +312,7 @@
FT_UInt num_contours = source->base.outline.n_contours;
- error = FT_GlyphLoader_Check_Points( target, num_points, num_contours );
+ error = FT_GlyphLoader_CheckPoints( target, num_points, num_contours );
if ( !error )
{FT_Outline* out = &target->base.outline;
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -400,7 +400,7 @@
check_points( CFF_Builder* builder,
FT_Int count )
{- return FT_GlyphLoader_Check_Points( builder->loader, count, 0 );
+ return FT_GlyphLoader_CheckPoints( builder->loader, count, 0 );
}
@@ -461,7 +461,7 @@
return CFF_Err_Ok;
}
- error = FT_GlyphLoader_Check_Points( builder->loader, 0, 1 );
+ error = FT_GlyphLoader_CheckPoints( builder->loader, 0, 1 );
if ( !error )
{if ( outline->n_contours > 0 )
@@ -589,11 +589,11 @@
{FT_GlyphSlot glyph = (FT_GlyphSlot)decoder->builder.glyph;
FT_GlyphLoader loader = glyph->internal->loader;
- FT_SubGlyph* subg;
+ FT_SubGlyph subg;
/* reallocate subglyph array if necessary */
- error = FT_GlyphLoader_Check_Subglyphs( loader, 2 );
+ error = FT_GlyphLoader_CheckSubGlyphs( loader, 2 );
if ( error )
goto Exit;
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -1148,7 +1148,7 @@
T1_Builder_Check_Points( T1_Builder builder,
FT_Int count )
{- return FT_GlyphLoader_Check_Points( builder->loader, count, 0 );
+ return FT_GlyphLoader_CheckPoints( builder->loader, count, 0 );
}
@@ -1214,7 +1214,7 @@
return PSaux_Err_Ok;
}
- error = FT_GlyphLoader_Check_Points( builder->loader, 0, 1 );
+ error = FT_GlyphLoader_CheckPoints( builder->loader, 0, 1 );
if ( !error )
{if ( outline->n_contours > 0 )
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -219,11 +219,11 @@
{FT_GlyphSlot glyph = (FT_GlyphSlot)decoder->builder.glyph;
FT_GlyphLoader loader = glyph->internal->loader;
- FT_SubGlyph* subg;
+ FT_SubGlyph subg;
/* reallocate subglyph array if necessary */
- error = FT_GlyphLoader_Check_Subglyphs( loader, 2 );
+ error = FT_GlyphLoader_CheckSubGlyphs( loader, 2 );
if ( error )
goto Exit;
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -295,7 +295,7 @@
if ( n_contours > 0 )
n_points = cur[-1] + 1;
- error = FT_GlyphLoader_Check_Points( gloader, n_points + 2, 0 );
+ error = FT_GlyphLoader_CheckPoints( gloader, n_points + 2, 0 );
if ( error )
goto Fail;
@@ -471,7 +471,7 @@
FT_Error error;
FT_Stream stream = loader->stream;
FT_GlyphLoader gloader = loader->gloader;
- FT_SubGlyph* subglyph;
+ FT_SubGlyph subglyph;
FT_UInt num_subglyphs;
FT_Int byte_len = loader->byte_len;
@@ -484,7 +484,7 @@
/* check that we can load a new subglyph */
- error = FT_GlyphLoader_Check_Subglyphs( gloader, num_subglyphs + 1 );
+ error = FT_GlyphLoader_CheckSubGlyphs( gloader, num_subglyphs + 1 );
if ( error )
goto Fail;
@@ -878,7 +878,7 @@
if ( contours_count >= 0 )
{/* check that we can add the contours to the glyph */
- error = FT_GlyphLoader_Check_Points( gloader, 0, contours_count );
+ error = FT_GlyphLoader_CheckPoints( gloader, 0, contours_count );
if ( error )
goto Fail;
@@ -965,7 +965,7 @@
/* Now, read each subglyph independently. */
{FT_Int n, num_base_points, num_new_points;
- FT_SubGlyph* subglyph = 0;
+ FT_SubGlyph subglyph = 0;
FT_UInt num_subglyphs = gloader->current.num_subglyphs;
FT_UInt num_base_subgs = gloader->base.num_subglyphs;
@@ -1229,7 +1229,7 @@
glyph->outline.flags &= ~ft_outline_single_pass;
/* copy outline to our glyph slot */
- FT_GlyphLoader_Copy_Points( glyph->internal->loader, loader->gloader );
+ FT_GlyphLoader_CopyPoints( glyph->internal->loader, loader->gloader );
glyph->outline = glyph->internal->loader->base.outline;
/* translate array so that (0,0) is the glyph's origin */
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -815,7 +815,7 @@
/* set `extra' in glyph loader */
- error = FT_GlyphLoader_Create_Extra( FT_DRIVER( driver )->glyph_loader );
+ error = FT_GlyphLoader_CreateExtra( FT_DRIVER( driver )->glyph_loader );
/* init extension registry if needed */