ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* src/cff/cffdrivr.c (cff_get_glyph_name): Fix debug message. 

* src/cff/cffobjs.c (CFF_Driver_Init, CFF_Driver_Done)
[TT_CONFIG_OPTION_EXTEND_ENGINE]: Removed.
* src/cff/sfobjs.c (SFNT_Load_Face)
[TT_CONFIG_OPTION_EXTEND_ENGINE]: Ditto.
* src/truetype/ttobjs.c (TT_Init_Driver, TT_Done_Driver)
[TT_CONFIG_OPTION_EXTEND_ENGINE]: Ditto.

* src/truetype/ttdriver.c, src/truetype/ttobjs.c,
src/truetype/ttobjs.h: Renaming driver functions to the
FT_<Subject>_<Action> scheme:

  TT_Init_Driver => TT_Driver_Init
  TT_Done_Driver => TT_Driver_Done
  TT_Init_Face   => TT_Face_Init
  TT_Done_Face   => TT_Face_Done
  TT_Init_Size   => TT_Size_Init
  TT_Done_Size   => TT_Size_Done
  TT_Reset_Size  => TT_Size_Reset
This commit is contained in:
Werner Lemberg 2002-03-30 16:41:09 +00:00
parent 56054f310b
commit 48c984b5bb
25 changed files with 263 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ChangeLog
View File

@ -1,16 +1,36 @@
2002-03-30 David Turner <david@freetype.org>
* src/sfnt/sfobjs.c (tt_face_get_name): bug-fix
* include/freetype/internal/tttypes.h: adding comments to some of
* include/freetype/internal/tttypes.h: Adding comments to some of
the TT_FaceRec fields.
* src/sfnt/ttcmap0.c (TT_Build_CMaps): removed compiler warnings
* src/sfnt/ttcmap0.c (TT_Build_CMaps): Removed compiler warnings.
* src/sfnt/sfobjs.c (tt_face_get_name): Bug-fix.
2002-03-30 Werner Lemberg <wl@gnu.org>
* include/freetype/t1tables.h (t1_blend_max): Fix typo.
* src/base/ftstream.c: Simplify FT_ERROR calls.
* src/cff/cffdrivr.c (cff_get_glyph_name): Fix debug message.
* src/cff/cffobjs.c (CFF_Driver_Init, CFF_Driver_Done)
[TT_CONFIG_OPTION_EXTEND_ENGINE]: Removed.
* src/cff/sfobjs.c (SFNT_Load_Face)
[TT_CONFIG_OPTION_EXTEND_ENGINE]: Ditto.
* src/truetype/ttobjs.c (TT_Init_Driver, TT_Done_Driver)
[TT_CONFIG_OPTION_EXTEND_ENGINE]: Ditto.
* src/truetype/ttdriver.c, src/truetype/ttobjs.c,
src/truetype/ttobjs.h: Renaming driver functions to the
FT_<Subject>_<Action> scheme:
TT_Init_Driver => TT_Driver_Init
TT_Done_Driver => TT_Driver_Done
TT_Init_Face => TT_Face_Init
TT_Done_Face => TT_Face_Done
TT_Init_Size => TT_Size_Init
TT_Done_Size => TT_Size_Done
TT_Reset_Size => TT_Size_Reset
2002-03-29 Werner Lemberg <wl@gnu.org>
@ -103,6 +123,11 @@
Also introduced the FT_PEEK_XXXX functions.
* src/cff/cffobjs.c (CFF_Build_Unicode_Charmap): Removed commented
out function.
(find_encoding): Removed.
(CFF_Face_Init): Remove charmap support.
* include/freetype/config/ftoption.h (FT_CONFIG_OPTION_USE_CMAPS,
TT_CONFIG_CMAP_FORMAT{0,2,4,6,8,10,12}): New macros to fine-tune
support of cmaps.

2
src/cache/descrip.mms vendored
View File

@ -3,7 +3,7 @@
#
# Copyright 2001 by
# Copyright 2001, 2002 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,

2
src/cache/ftccache.c vendored
View File

@ -4,7 +4,7 @@
/* */
/* The FreeType internal cache interface (body). */
/* */
/* Copyright 2000-2001 by */
/* Copyright 2000-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

2
src/cache/ftccmap.c vendored
View File

@ -4,7 +4,7 @@
/* */
/* FreeType CharMap cache (body) */
/* */
/* Copyright 2000-2001 by */
/* Copyright 2000-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

2
src/cache/ftcmanag.c vendored
View File

@ -4,7 +4,7 @@
/* */
/* FreeType Cache Manager (body). */
/* */
/* Copyright 2000-2001 by */
/* Copyright 2000-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

2
src/cache/ftcsbits.c vendored
View File

@ -4,7 +4,7 @@
/* */
/* FreeType sbits manager (body). */
/* */
/* Copyright 2000-2001 by */
/* Copyright 2000-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

2
src/cache/ftlru.c vendored
View File

@ -4,7 +4,7 @@
/* */
/* Simple LRU list-cache (body). */
/* */
/* Copyright 2000-2001 by */
/* Copyright 2000-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

2
src/cache/rules.mk vendored
View File

@ -3,7 +3,7 @@
#
# Copyright 2000 by
# Copyright 2000, 2001 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,

9
src/cff/cffdrivr.c
View File

@ -4,7 +4,7 @@
/* */
/* OpenType font driver implementation (body). */
/* */
/* Copyright 1996-2001 by */
/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -235,12 +235,13 @@
PSNames_Service psnames;
FT_Error error;
psnames = (PSNames_Service)FT_Get_Module_Interface(
face->root.driver->root.library, "psnames" );
if ( !psnames )
{
FT_ERROR(( "CFF_Init_Face:" ));
FT_ERROR(( "cff_get_glyph_name:" ));
FT_ERROR(( " cannot open CFF & CEF fonts\n" ));
FT_ERROR(( " " ));
FT_ERROR(( " without the `PSNames' module\n" ));
@ -358,7 +359,8 @@
cmap->loaded = TRUE;
}
return ( cmap->get_next_char ? cmap->get_next_char( cmap, charcode ) : 0 );
return ( cmap->get_next_char ? cmap->get_next_char( cmap, charcode )
: 0 );
}
@ -439,6 +441,7 @@
{
FT_Module sfnt;
#ifndef FT_CONFIG_OPTION_NO_GLYPH_NAMES
if ( strcmp( (const char*)interface, "glyph_name" ) == 0 )

2
src/cff/cffdrivr.h
View File

@ -4,7 +4,7 @@
/* */
/* High-level OpenType driver interface (specification). */
/* */
/* Copyright 1996-2001 by */
/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

11
src/cff/cffgload.c
View File

@ -4,7 +4,7 @@
/* */
/* OpenType Glyph Loader (body). */
/* */
/* Copyright 1996-2001 by */
/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -426,6 +426,7 @@
builder->last = *point;
}
outline->n_points++;
}
@ -492,6 +493,7 @@
if ( !error )
error = add_point1( builder, x, y );
}
return error;
}
@ -502,6 +504,7 @@
{
FT_Outline* outline = builder->current;
/* XXXX: We must not include the last point in the path if it */
/* is located on the first point. */
if ( outline->n_points > 1 )
@ -519,7 +522,7 @@
}
/* `delete' last point only if it coincides with the first */
/* point and it is not a control point (which can happen). */
/* point and if it is not a control point (which can happen). */
if ( p1->x == p2->x && p1->y == p2->y )
if ( *control == FT_Curve_Tag_On )
outline->n_points--;
@ -1124,16 +1127,14 @@
{
FT_UInt maskbyte;
FT_TRACE4(( " " ));
for ( maskbyte = 0;
maskbyte < (FT_UInt)(( decoder->num_hints + 7 ) >> 3);
maskbyte++, ip++ )
{
FT_TRACE4(( "%02X", *ip ));
}
}
#else
ip += ( decoder->num_hints + 7 ) >> 3;
#endif

12
src/cff/cffgload.h
View File

@ -4,7 +4,7 @@
/* */
/* OpenType Glyph Loader (specification). */
/* */
/* Copyright 1996-2001 by */
/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -47,13 +47,11 @@ FT_BEGIN_HEADER
/* */
/* glyph :: The current glyph slot. */
/* */
/* current :: The current glyph outline. */
/* loader :: The current glyph loader. */
/* */
/* base :: The base glyph outline. */
/* */
/* max_points :: maximum points in builder outline */
/* */
/* max_contours :: Maximal number of contours in builder outline. */
/* current :: The current glyph outline. */
/* */
/* last :: The last point position. */
/* */
@ -84,6 +82,10 @@ FT_BEGIN_HEADER
/* the metrics of a given glyph, not load all of its */
/* points. */
/* */
/* hints_funcs :: Auxiliary pointer for hinting. */
/* */
/* hints_globals :: Auxiliary pointer for hinting. */
/* */
typedef struct CFF_Builder_
{
FT_Memory memory;

2
src/cff/cffload.c
View File

@ -4,7 +4,7 @@
/* */
/* OpenType and CFF data/program tables loader (body). */
/* */
/* Copyright 1996-2001 by */
/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

2
src/cff/cffload.h
View File

@ -4,7 +4,7 @@
/* */
/* OpenType & CFF data/program tables loader (specification). */
/* */
/* Copyright 1996-2001 by */
/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

26
src/cff/cffobjs.c
View File

@ -4,7 +4,7 @@
/* */
/* OpenType objects manager (body). */
/* */
/* Copyright 1996-2001 by */
/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -44,8 +44,6 @@
#define FT_COMPONENT trace_cffobjs
/*************************************************************************/
/* */
/* SIZE FUNCTIONS */
@ -449,7 +447,7 @@
root->style_flags = flags;
/* XXX: no charmaps for pure CFF fonts for now !! */
/* XXX: no charmaps for pure CFF fonts currently! */
}
}
@ -488,36 +486,16 @@
FT_LOCAL_DEF( FT_Error )
CFF_Driver_Init( CFF_Driver driver )
{
/* init extension registry if needed */
#ifdef TT_CONFIG_OPTION_EXTEND_ENGINE
return TT_Init_Extensions( driver );
#else
FT_UNUSED( driver );
return CFF_Err_Ok;
#endif
}
FT_LOCAL_DEF( void )
CFF_Driver_Done( CFF_Driver driver )
{
/* destroy extensions registry if needed */
#ifdef TT_CONFIG_OPTION_EXTEND_ENGINE
TT_Done_Extensions( driver );
#else
FT_UNUSED( driver );
#endif
}

3
src/cff/cffobjs.h
View File

@ -4,7 +4,7 @@
/* */
/* OpenType objects manager (specification). */
/* */
/* Copyright 1996-2001 by */
/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -124,6 +124,7 @@ FT_BEGIN_HEADER
FT_LOCAL( FT_Error )
CFF_GlyphSlot_Init( CFF_GlyphSlot slot );
/*************************************************************************/
/* */
/* Face functions */

2
src/cff/cffparse.c
View File

@ -4,7 +4,7 @@
/* */
/* CFF token stream parser (body) */
/* */
/* Copyright 1996-2001 by */
/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

2
src/cff/cffparse.h
View File

@ -4,7 +4,7 @@
/* */
/* CFF token stream parser (specification) */
/* */
/* Copyright 1996-2001 by */
/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

4
src/cff/cfftoken.h
View File

@ -2,9 +2,9 @@
/* */
/* cfftoken.h */
/* */
/* CFF token definitions */
/* CFF token definitions (specification only). */
/* */
/* Copyright 1996-2001 by */
/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

2
src/cff/descrip.mms
View File

@ -3,7 +3,7 @@
#
# Copyright 2001 by
# Copyright 2001, 2002 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,

2
src/cff/rules.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000 by
# Copyright 1996-2000, 2001 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,

5
src/sfnt/sfobjs.c
View File

@ -478,11 +478,6 @@
LOAD_( pclt ) )
goto Exit;
#ifdef TT_CONFIG_OPTION_EXTEND_ENGINE
if ( ( error = TT_Extension_Create( face ) ) != SFNT_Err_Ok )
goto Exit;
#endif
face->root.family_name = tt_face_get_name( face, TT_NAME_ID_FONT_FAMILY );
face->root.style_name = tt_face_get_name( face, TT_NAME_ID_FONT_SUBFAMILY );

18
src/truetype/ttdriver.c
View File

@ -222,7 +222,7 @@
size->strike_index = 0xFFFF;
#endif
return TT_Reset_Size( size );
return TT_Size_Reset( size );
}
@ -261,7 +261,7 @@
size->strike_index = 0xFFFF;
#endif
return TT_Reset_Size( size );
return TT_Size_Reset( size );
}
@ -319,7 +319,7 @@
if ( !size->ttmetrics.valid )
{
if ( FT_SET_ERROR( TT_Reset_Size( size ) ) )
if ( FT_SET_ERROR( TT_Size_Reset( size ) ) )
return error;
}
}
@ -496,8 +496,8 @@
(void*)0, /* driver specific interface */
(FT_Module_Constructor)TT_Init_Driver,
(FT_Module_Destructor) TT_Done_Driver,
(FT_Module_Constructor)TT_Driver_Init,
(FT_Module_Destructor) TT_Driver_Done,
(FT_Module_Requester) tt_get_interface,
},
@ -506,10 +506,10 @@
sizeof ( FT_GlyphSlotRec ),
(FT_Face_InitFunc) TT_Init_Face,
(FT_Face_DoneFunc) TT_Done_Face,
(FT_Size_InitFunc) TT_Init_Size,
(FT_Size_DoneFunc) TT_Done_Size,
(FT_Face_InitFunc) TT_Face_Init,
(FT_Face_DoneFunc) TT_Face_Done,
(FT_Size_InitFunc) TT_Size_Init,
(FT_Size_DoneFunc) TT_Size_Done,
(FT_Slot_InitFunc)0,
(FT_Slot_DoneFunc)0,

43
src/truetype/ttobjs.c
View File

@ -133,7 +133,7 @@
/*************************************************************************/
/* */
/* <Function> */
/* TT_Init_Face */
/* TT_Face_Init */
/* */
/* <Description> */
/* Initializes a given TrueType face object. */
@ -154,7 +154,7 @@
/* FreeType error code. 0 means success. */
/* */
FT_LOCAL_DEF( FT_Error )
TT_Init_Face( FT_Stream stream,
TT_Face_Init( FT_Stream stream,
TT_Face face,
FT_Int face_index,
FT_Int num_params,
@ -216,7 +216,7 @@
/*************************************************************************/
/* */
/* <Function> */
/* TT_Done_Face */
/* TT_Face_Done */
/* */
/* <Description> */
/* Finalizes a given face object. */
@ -225,7 +225,7 @@
/* face :: A pointer to the face object to destroy. */
/* */
FT_LOCAL_DEF( void )
TT_Done_Face( TT_Face face )
TT_Face_Done( TT_Face face )
{
FT_Memory memory = face->root.memory;
FT_Stream stream = face->root.stream;
@ -266,7 +266,7 @@
/*************************************************************************/
/* */
/* <Function> */
/* TT_Init_Size */
/* TT_Size_Init */
/* */
/* <Description> */
/* Initializes a new TrueType size object. */
@ -278,7 +278,7 @@
/* FreeType error code. 0 means success. */
/* */
FT_LOCAL_DEF( FT_Error )
TT_Init_Size( TT_Size size )
TT_Size_Init( TT_Size size )
{
FT_Error error = TT_Err_Ok;
@ -447,7 +447,7 @@
/*************************************************************************/
/* */
/* <Function> */
/* TT_Done_Size */
/* TT_Size_Done */
/* */
/* <Description> */
/* The TrueType size object finalizer. */
@ -456,7 +456,7 @@
/* size :: A handle to the target size object. */
/* */
FT_LOCAL_DEF( void )
TT_Done_Size( TT_Size size )
TT_Size_Done( TT_Size size )
{
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
@ -738,7 +738,7 @@
/*************************************************************************/
/* */
/* <Function> */
/* TT_Reset_Size */
/* TT_Size_Reset */
/* */
/* <Description> */
/* Resets a TrueType size when resolutions and character dimensions */
@ -748,7 +748,7 @@
/* size :: A handle to the target size object. */
/* */
FT_LOCAL_DEF( FT_Error )
TT_Reset_Size( TT_Size size )
TT_Size_Reset( TT_Size size )
{
FT_Face face;
FT_Error error = TT_Err_Ok;
@ -788,7 +788,7 @@
/*************************************************************************/
/* */
/* <Function> */
/* TT_Init_Driver */
/* TT_Driver_Init */
/* */
/* <Description> */
/* Initializes a given TrueType driver object. */
@ -800,7 +800,7 @@
/* FreeType error code. 0 means success. */
/* */
FT_LOCAL_DEF( FT_Error )
TT_Init_Driver( TT_Driver driver )
TT_Driver_Init( TT_Driver driver )
{
FT_Error error;
@ -808,13 +808,6 @@
/* set `extra' in glyph loader */
error = FT_GlyphLoader_CreateExtra( FT_DRIVER( driver )->glyph_loader );
/* init extension registry if needed */
#ifdef TT_CONFIG_OPTION_EXTEND_ENGINE
if ( !error )
return TT_Init_Extensions( driver );
#endif
return error;
}
@ -822,7 +815,7 @@
/*************************************************************************/
/* */
/* <Function> */
/* TT_Done_Driver */
/* TT_Driver_Done */
/* */
/* <Description> */
/* Finalizes a given TrueType driver. */
@ -831,16 +824,8 @@
/* driver :: A handle to the target TrueType driver. */
/* */
FT_LOCAL_DEF( void )
TT_Done_Driver( TT_Driver driver )
TT_Driver_Done( TT_Driver driver )
{
/* destroy extensions registry if needed */
#ifdef TT_CONFIG_OPTION_EXTEND_ENGINE
TT_Done_Extensions( driver );
#endif
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
/* destroy the execution context */

14
src/truetype/ttobjs.h
View File

@ -379,14 +379,14 @@ FT_BEGIN_HEADER
/* Face functions */
/* */
FT_LOCAL( FT_Error )
TT_Init_Face( FT_Stream stream,
TT_Face_Init( FT_Stream stream,
TT_Face face,
FT_Int face_index,
FT_Int num_params,
FT_Parameter* params );
FT_LOCAL( void )
TT_Done_Face( TT_Face face );
TT_Face_Done( TT_Face face );
/*************************************************************************/
@ -394,13 +394,13 @@ FT_BEGIN_HEADER
/* Size functions */
/* */
FT_LOCAL( FT_Error )
TT_Init_Size( TT_Size size );
TT_Size_Init( TT_Size size );
FT_LOCAL( void )
TT_Done_Size( TT_Size size );
TT_Size_Done( TT_Size size );
FT_LOCAL( FT_Error )
TT_Reset_Size( TT_Size size );
TT_Size_Reset( TT_Size size );
/*************************************************************************/
@ -408,10 +408,10 @@ FT_BEGIN_HEADER
/* Driver functions */
/* */
FT_LOCAL( FT_Error )
TT_Init_Driver( TT_Driver driver );
TT_Driver_Init( TT_Driver driver );
FT_LOCAL( void )
TT_Done_Driver( TT_Driver driver );
TT_Driver_Done( TT_Driver driver );
FT_END_HEADER