Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

formatting, copyright

Browse Source
BRANCH-2-1-5
Werner Lemberg 23 years ago
parent 540dff7648
commit f1c46e5e00
13 changed files with 114 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ChangeLog
  2. 43
      src/cid/cidgload.c
  3. 2
      src/cid/cidgload.h
  4. 62
      src/cid/cidload.c
  5. 2
      src/cid/cidload.h
  6. 17
      src/cid/cidobjs.c
  7. 2
      src/cid/cidobjs.h
  8. 8
      src/cid/cidparse.c
  9. 28
      src/cid/cidparse.h
  10. 39
      src/cid/cidriver.c
  11. 4
      src/cid/cidriver.h
  12. 20
      src/cid/cidtoken.h
  13. 2
      src/cid/rules.mk

2
ChangeLog
Unescape View File

@ -212,6 +212,8 @@
FTDriver_initGlyphSlot => FT_Slot_InitFunc
etc.
* src/cid/cidobjs.c (CID_Face_Init): Remove dead code.
* include/freetype/internal/ftobjs.h, src/base/ftobjs.c: Updated a
few face method definitions:

43
src/cid/cidgload.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* CID-keyed Type1 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, */
@ -40,20 +40,20 @@
cid_load_glyph( T1_Decoder decoder,
FT_UInt glyph_index )
{
CID_Face face = (CID_Face)decoder->builder.face;
CID_Face face = (CID_Face)decoder->builder.face;
CID_FaceInfo cid = &face->cid;
FT_Byte* p;
FT_UInt entry_len = cid->fd_bytes + cid->gd_bytes;
FT_UInt fd_select;
FT_ULong off1, glyph_len;
FT_Stream stream = face->root.stream;
FT_Error error = 0;
FT_Byte* p;
FT_UInt entry_len = cid->fd_bytes + cid->gd_bytes;
FT_UInt fd_select;
FT_ULong off1, glyph_len;
FT_Stream stream = face->root.stream;
FT_Error error = 0;
/* read the CID font dict index and charstring offset from the CIDMap */
if ( FT_STREAM_SEEK( cid->data_offset + cid->cidmap_offset +
glyph_index * entry_len ) ||
FT_FRAME_ENTER( 2 * entry_len ) )
glyph_index * entry_len ) ||
FT_FRAME_ENTER( 2 * entry_len ) )
goto Exit;
p = (FT_Byte*)stream->cursor;
@ -68,10 +68,10 @@
/* the charstrings */
if ( glyph_len > 0 )
{
CID_FaceDict dict;
CID_Subrs cid_subrs = face->subrs + fd_select;
FT_Byte* charstring;
FT_Memory memory = face->root.memory;
CID_FaceDict dict;
CID_Subrs cid_subrs = face->subrs + fd_select;
FT_Byte* charstring;
FT_Memory memory = face->root.memory;
/* setup subrs */
@ -92,9 +92,10 @@
if ( FT_ALLOC( charstring, glyph_len ) )
goto Exit;
if ( !FT_STREAM_READ_AT( cid->data_offset + off1, charstring, glyph_len ) )
if ( !FT_STREAM_READ_AT( cid->data_offset + off1,
charstring, glyph_len ) )
{
FT_Int cs_offset;
FT_Int cs_offset;
/* Adjustment for seed bytes. */
@ -142,9 +143,9 @@
CID_Compute_Max_Advance( CID_Face face,
FT_Int* max_advance )
{
FT_Error error;
FT_Error error;
T1_DecoderRec decoder;
FT_Int glyph_index;
FT_Int glyph_index;
PSAux_Service psaux = (PSAux_Service)face->psaux;
@ -207,10 +208,10 @@
FT_Int glyph_index,
FT_Int load_flags )
{
FT_Error error;
FT_Error error;
T1_DecoderRec decoder;
CID_Face face = (CID_Face)glyph->root.face;
FT_Bool hinting;
CID_Face face = (CID_Face)glyph->root.face;
FT_Bool hinting;
PSAux_Service psaux = (PSAux_Service)face->psaux;
FT_Matrix font_matrix;

2
src/cid/cidgload.h
Unescape 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, */

62
src/cid/cidload.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* CID-keyed Type1 font 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, */
@ -88,15 +88,15 @@
static FT_Error
cid_load_keyword( CID_Face face,
CID_Loader* loader,
cid_load_keyword( CID_Face face,
CID_Loader* loader,
const T1_Field keyword )
{
FT_Error error;
CID_Parser* parser = &loader->parser;
FT_Byte* object;
void* dummy_object;
CID_FaceInfo cid = &face->cid;
FT_Error error;
CID_Parser* parser = &loader->parser;
FT_Byte* object;
void* dummy_object;
CID_FaceInfo cid = &face->cid;
/* if the keyword has a dedicated callback, call it */
@ -181,12 +181,12 @@
parse_font_matrix( CID_Face face,
CID_Parser* parser )
{
FT_Matrix* matrix;
FT_Vector* offset;
FT_Matrix* matrix;
FT_Vector* offset;
CID_FaceDict dict;
FT_Face root = (FT_Face)&face->root;
FT_Fixed temp[6];
FT_Fixed temp_scale;
FT_Face root = (FT_Face)&face->root;
FT_Fixed temp[6];
FT_Fixed temp_scale;
if ( parser->num_dict >= 0 )
@ -236,9 +236,9 @@
CID_Parser* parser )
{
CID_FaceInfo cid = &face->cid;
FT_Memory memory = face->root.memory;
FT_Error error = CID_Err_Ok;
FT_Long num_dicts;
FT_Memory memory = face->root.memory;
FT_Error error = CID_Err_Ok;
FT_Long num_dicts;
num_dicts = CID_ToInt( parser );
@ -390,14 +390,14 @@
static FT_Error
cid_read_subrs( CID_Face face )
{
CID_FaceInfo cid = &face->cid;
FT_Memory memory = face->root.memory;
FT_Stream stream = face->root.stream;
FT_Error error;
FT_Int n;
CID_Subrs subr;
FT_UInt max_offsets = 0;
FT_ULong* offsets = 0;
CID_FaceInfo cid = &face->cid;
FT_Memory memory = face->root.memory;
FT_Stream stream = face->root.stream;
FT_Error error;
FT_Int n;
CID_Subrs subr;
FT_UInt max_offsets = 0;
FT_ULong* offsets = 0;
if ( FT_NEW_ARRAY( face->subrs, cid->num_dicts ) )
@ -407,10 +407,10 @@
for ( n = 0; n < cid->num_dicts; n++, subr++ )
{
CID_FaceDict dict = cid->font_dicts + n;
FT_Int lenIV = dict->private_dict.lenIV;
FT_UInt count, num_subrs = dict->num_subrs;
FT_ULong data_len;
FT_Byte* p;
FT_Int lenIV = dict->private_dict.lenIV;
FT_UInt count, num_subrs = dict->num_subrs;
FT_ULong data_len;
FT_Byte* p;
/* reallocate offsets array if needed */
@ -518,9 +518,9 @@
FT_LOCAL_DEF( FT_Error )
CID_Open_Face( CID_Face face )
{
CID_Loader loader;
CID_Parser* parser;
FT_Error error;
CID_Loader loader;
CID_Parser* parser;
FT_Error error;
t1_init_loader( &loader, face );

2
src/cid/cidload.h
Unescape View File

@ -4,7 +4,7 @@
/* */
/* CID-keyed Type1 font 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, */

17
src/cid/cidobjs.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* CID 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, */
@ -131,10 +131,10 @@
if ( funcs )
{
PSH_Globals globals;
CID_Face face = (CID_Face)size->root.face;
PSH_Globals globals;
CID_Face face = (CID_Face)size->root.face;
CID_FaceDict dict = face->cid.font_dicts + face->root.face_index;
PS_Private priv = &dict->private_dict;
PS_Private priv = &dict->private_dict;
error = funcs->create( size->root.face->memory, priv, &globals );
@ -162,15 +162,12 @@
}
/*************************************************************************/
/* */
/* FACE FUNCTIONS */
/* */
/*************************************************************************/
/*************************************************************************/
/* */
/* <Function> */
@ -199,7 +196,7 @@
/* release subrs */
if ( face->subrs )
{
FT_Int n;
FT_Int n;
for ( n = 0; n < cid->num_dicts; n++ )
@ -269,7 +266,7 @@
FT_Int num_params,
FT_Parameter* params )
{
FT_Error error;
FT_Error error;
PSNames_Service psnames;
PSAux_Service psaux;
PSHinter_Service pshinter;
@ -386,7 +383,6 @@
root->bbox.xMax = (face->cid.font_bbox.xMax + 0xFFFFU) >> 16;
root->bbox.yMax = (face->cid.font_bbox.yMax + 0xFFFFU) >> 16;
if ( !root->units_per_EM )
root->units_per_EM = 1000;
@ -395,7 +391,6 @@
root->height = (FT_Short)(
( ( root->ascender + root->descender ) * 12 ) / 10 );
root->underline_position = face->cid.font_info.underline_position;
root->underline_thickness = face->cid.font_info.underline_thickness;

2
src/cid/cidobjs.h
Unescape View File

@ -4,7 +4,7 @@
/* */
/* CID 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, */

8
src/cid/cidparse.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* CID-keyed Type1 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, */
@ -51,9 +51,9 @@
FT_LOCAL_DEF( FT_Error )
CID_New_Parser( CID_Parser* parser,
FT_Stream stream,
FT_Memory memory,
CID_New_Parser( CID_Parser* parser,
FT_Stream stream,
FT_Memory memory,
PSAux_Service psaux )
{
FT_Error error;

28
src/cid/cidparse.h
Unescape View File

@ -4,7 +4,7 @@
/* */
/* CID-keyed Type1 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, */
@ -39,7 +39,7 @@ FT_BEGIN_HEADER
/* quickly. */
/* */
/* <Fields> */
/* root :: the root PS_ParserRec fields */
/* root :: The root PS_ParserRec fields. */
/* */
/* stream :: The current input stream. */
/* */
@ -65,16 +65,16 @@ FT_BEGIN_HEADER
FT_ULong data_offset;
CID_FaceInfo cid;
CID_FaceInfo cid;
FT_Int num_dict;
} CID_Parser;
FT_LOCAL( FT_Error )
CID_New_Parser( CID_Parser* parser,
FT_Stream stream,
FT_Memory memory,
CID_New_Parser( CID_Parser* parser,
FT_Stream stream,
FT_Memory memory,
PSAux_Service psaux );
FT_LOCAL( void )
@ -90,21 +90,21 @@ FT_BEGIN_HEADER
#define CID_Skip_Spaces( p ) (p)->root.funcs.skip_spaces( &(p)->root )
#define CID_Skip_Alpha( p ) (p)->root.funcs.skip_alpha ( &(p)->root )
#define CID_ToInt( p ) (p)->root.funcs.to_int( &(p)->root )
#define CID_ToFixed( p, t ) (p)->root.funcs.to_fixed( &(p)->root, t )
#define CID_ToInt( p ) (p)->root.funcs.to_int( &(p)->root )
#define CID_ToFixed( p, t ) (p)->root.funcs.to_fixed( &(p)->root, t )
#define CID_ToCoordArray( p, m, c ) \
#define CID_ToCoordArray( p, m, c ) \
(p)->root.funcs.to_coord_array( &(p)->root, m, c )
#define CID_ToFixedArray( p, m, f, t ) \
#define CID_ToFixedArray( p, m, f, t ) \
(p)->root.funcs.to_fixed_array( &(p)->root, m, f, t )
#define CID_ToToken( p, t ) \
#define CID_ToToken( p, t ) \
(p)->root.funcs.to_token( &(p)->root, t )
#define CID_ToTokenArray( p, t, m, c ) \
#define CID_ToTokenArray( p, t, m, c ) \
(p)->root.funcs.to_token_array( &(p)->root, t, m, c )
#define CID_Load_Field( p, f, o ) \
#define CID_Load_Field( p, f, o ) \
(p)->root.funcs.load_field( &(p)->root, f, o, 0, 0 )
#define CID_Load_Field_Table( p, f, o ) \
#define CID_Load_Field_Table( p, f, o ) \
(p)->root.funcs.load_field_table( &(p)->root, f, o, 0, 0 )

39
src/cid/cidriver.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* CID driver interface (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, */
@ -38,14 +38,14 @@
#define FT_COMPONENT trace_ciddriver
static const char*
cid_get_postscript_name( CID_Face face )
{
const char* result = face->cid.cid_font_name;
if ( result && result[0] == '/' )
result ++;
result++;
return result;
}
@ -86,7 +86,6 @@
return CID_Err_Ok;
}
#endif /* 0 */
@ -110,8 +109,8 @@
CID_Get_Char_Index( FT_CharMap charmap,
FT_Long charcode )
{
T1_Face face;
FT_UInt result = 0;
T1_Face face;
FT_UInt result = 0;
PSNames_Service psnames;
@ -210,7 +209,7 @@
CID_Get_Next_Char( FT_CharMap charmap,
FT_Long charcode )
{
T1_Face face;
T1_Face face;
PSNames_Service psnames;
@ -314,26 +313,26 @@
sizeof( CID_SizeRec ),
sizeof( CID_GlyphSlotRec ),
(FT_Face_InitFunc) CID_Face_Init,
(FT_Face_DoneFunc) CID_Face_Done,
(FT_Face_InitFunc) CID_Face_Init,
(FT_Face_DoneFunc) CID_Face_Done,
(FT_Size_InitFunc) CID_Size_Init,
(FT_Size_DoneFunc) CID_Size_Done,
(FT_Slot_InitFunc)CID_GlyphSlot_Init,
(FT_Slot_DoneFunc)CID_GlyphSlot_Done,
(FT_Size_InitFunc) CID_Size_Init,
(FT_Size_DoneFunc) CID_Size_Done,
(FT_Slot_InitFunc) CID_GlyphSlot_Init,
(FT_Slot_DoneFunc) CID_GlyphSlot_Done,
(FT_Size_ResetPointsFunc) CID_Size_Reset,
(FT_Size_ResetPixelsFunc)CID_Size_Reset,
(FT_Size_ResetPixelsFunc) CID_Size_Reset,
(FT_Slot_LoadFunc) CID_Load_Glyph,
(FT_CharMap_CharIndexFunc) CID_Get_Char_Index,
(FT_Slot_LoadFunc) CID_Load_Glyph,
(FT_CharMap_CharIndexFunc)CID_Get_Char_Index,
(FT_Face_GetKerningFunc) 0,
(FT_Face_AttachFunc) 0,
(FT_Face_GetKerningFunc) 0,
(FT_Face_AttachFunc) 0,
(FT_Face_GetAdvancesFunc) 0,
(FT_Face_GetAdvancesFunc) 0,
(FT_CharMap_CharNextFunc) CID_Get_Next_Char
(FT_CharMap_CharNextFunc) CID_Get_Next_Char
};

4
src/cid/cidriver.h
Unescape View File

@ -4,7 +4,7 @@
/* */
/* High-level CID 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, */
@ -28,7 +28,7 @@ FT_BEGIN_HEADER
FT_CALLBACK_TABLE
const FT_Driver_ClassRec t1cid_driver_class;
const FT_Driver_ClassRec t1cid_driver_class;
FT_END_HEADER

20
src/cid/cidtoken.h
Unescape View File

@ -4,7 +4,7 @@
/* */
/* CID 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, */
@ -39,15 +39,15 @@
#undef T1CODE
#define T1CODE T1_FIELD_LOCATION_FONT_INFO
T1_FIELD_STRING( "version", version )
T1_FIELD_STRING( "Notice", notice )
T1_FIELD_STRING( "FullName", full_name )
T1_FIELD_STRING( "FamilyName", family_name )
T1_FIELD_STRING( "Weight", weight )
T1_FIELD_FIXED ( "ItalicAngle", italic_angle )
T1_FIELD_TYPE_BOOL ( "isFixedPitch", is_fixed_pitch )
T1_FIELD_NUM ( "UnderlinePosition", underline_position )
T1_FIELD_NUM ( "UnderlineThickness", underline_thickness )
T1_FIELD_STRING ( "version", version )
T1_FIELD_STRING ( "Notice", notice )
T1_FIELD_STRING ( "FullName", full_name )
T1_FIELD_STRING ( "FamilyName", family_name )
T1_FIELD_STRING ( "Weight", weight )
T1_FIELD_FIXED ( "ItalicAngle", italic_angle )
T1_FIELD_TYPE_BOOL( "isFixedPitch", is_fixed_pitch )
T1_FIELD_NUM ( "UnderlinePosition", underline_position )
T1_FIELD_NUM ( "UnderlineThickness", underline_thickness )
#undef FT_STRUCTURE

2
src/cid/rules.mk
Unescape 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,

Write Preview
Loading…
Cancel
Save