* include/freetype/internal/ftdriver.h,
include/freetype/internal/ftobjs.h, include/freetype/internal/psaux.h, src/cid/cidgload.c, src/psaux/psobjs.c, src/psaux/t1decode.c, src/psaux/psobjs.h, src/pshinter/pshrec.c, src/pshinter/pshalgo.c, src/psnames/psmodule.c, src/raster/ftraster.c, src/sfnt/sfobjs.c, src/smooth/ftgrays.c, src/smooth/ftsmooth.c, src/truetype/ttobjs.c, src/truetype/ttdriver.c, src/truetype/ttgload.c, src/type1/t1afm.c, src/type1/t1gload.c, src/type1/t1gload.h, src/type1/t1load.c, src/type1/t1objs.c, src/type42/t42parse.c, src/type42/t42parse.h: Many casts and slight argument type changes to make it work with a 16bit compiler.
This commit is contained in:
parent
3229b88005
commit
7386197677
22
ChangeLog
22
ChangeLog
|
@ -1,3 +1,25 @@
|
||||||
|
2003-06-04 Wolfgang Domröse <porthos.domroese@harz.de>
|
||||||
|
|
||||||
|
* include/freetype/internal/ftdriver.h,
|
||||||
|
include/freetype/internal/ftobjs.h,
|
||||||
|
include/freetype/internal/psaux.h, src/cid/cidgload.c,
|
||||||
|
src/psaux/psobjs.c, src/psaux/t1decode.c, src/psaux/psobjs.h,
|
||||||
|
src/pshinter/pshrec.c, src/pshinter/pshalgo.c,
|
||||||
|
src/psnames/psmodule.c, src/raster/ftraster.c, src/sfnt/sfobjs.c,
|
||||||
|
src/smooth/ftgrays.c, src/smooth/ftsmooth.c, src/truetype/ttobjs.c,
|
||||||
|
src/truetype/ttdriver.c, src/truetype/ttgload.c, src/type1/t1afm.c,
|
||||||
|
src/type1/t1gload.c, src/type1/t1gload.h, src/type1/t1load.c,
|
||||||
|
src/type1/t1objs.c, src/type42/t42parse.c, src/type42/t42parse.h:
|
||||||
|
Many casts and slight argument type changes to make it work with
|
||||||
|
a 16bit compiler.
|
||||||
|
|
||||||
|
2003-06-04 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* include/freetype/config/ftoption.h: Defining
|
||||||
|
TT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING by default is a bad idea
|
||||||
|
since some fonts (e.g. Arial) produce worse results than without
|
||||||
|
hinting. Reverted.
|
||||||
|
|
||||||
2003-06-04 Werner Lemberg <wl@gnu.org>
|
2003-06-04 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
* src/truetype/ttgload.c (load_truetype_glyph)
|
* src/truetype/ttgload.c (load_truetype_glyph)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* FreeType Image cache (specification). */
|
/* FreeType Image cache (specification). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2000-2001, 2002 by */
|
/* Copyright 2000-2001, 2002, 2003 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -208,12 +208,12 @@ FT_BEGIN_HEADER
|
||||||
/* FTC_Image_Desc */
|
/* FTC_Image_Desc */
|
||||||
/* */
|
/* */
|
||||||
/* <Description> */
|
/* <Description> */
|
||||||
/* THIS TYPE IS DEPRECATED. Use @FTC_ImageDesc instead. */
|
/* THIS TYPE IS DEPRECATED. Use @FTC_ImageDescRec instead. */
|
||||||
/* */
|
/* */
|
||||||
/* A simple structure used to describe a given glyph image category. */
|
/* A simple structure used to describe a given glyph image category. */
|
||||||
/* */
|
/* */
|
||||||
/* <Fields> */
|
/* <Fields> */
|
||||||
/* size :: An @FTC_SizeRec used to describe the glyph's face */
|
/* font :: An @FTC_FontRec used to describe the glyph's face */
|
||||||
/* and size. */
|
/* and size. */
|
||||||
/* */
|
/* */
|
||||||
/* image_type :: The glyph image's type. */
|
/* image_type :: The glyph image's type. */
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* FreeType font driver interface (specification). */
|
/* FreeType font driver interface (specification). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 1996-2001, 2002 by */
|
/* Copyright 1996-2001, 2002, 2003 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -169,9 +169,9 @@ FT_BEGIN_HEADER
|
||||||
{
|
{
|
||||||
FT_Module_Class root;
|
FT_Module_Class root;
|
||||||
|
|
||||||
FT_Int face_object_size;
|
FT_Long face_object_size;
|
||||||
FT_Int size_object_size;
|
FT_Long size_object_size;
|
||||||
FT_Int slot_object_size;
|
FT_Long slot_object_size;
|
||||||
|
|
||||||
FT_Face_InitFunc init_face;
|
FT_Face_InitFunc init_face;
|
||||||
FT_Face_DoneFunc done_face;
|
FT_Face_DoneFunc done_face;
|
||||||
|
|
|
@ -239,7 +239,7 @@ FT_BEGIN_HEADER
|
||||||
|
|
||||||
typedef struct FT_CMap_ClassRec_
|
typedef struct FT_CMap_ClassRec_
|
||||||
{
|
{
|
||||||
FT_UInt size;
|
FT_ULong size;
|
||||||
FT_CMap_InitFunc init;
|
FT_CMap_InitFunc init;
|
||||||
FT_CMap_DoneFunc done;
|
FT_CMap_DoneFunc done;
|
||||||
FT_CMap_CharIndexFunc char_index;
|
FT_CMap_CharIndexFunc char_index;
|
||||||
|
|
|
@ -73,7 +73,7 @@ FT_BEGIN_HEADER
|
||||||
(*add)( PS_Table table,
|
(*add)( PS_Table table,
|
||||||
FT_Int index,
|
FT_Int index,
|
||||||
void* object,
|
void* object,
|
||||||
FT_Int length );
|
FT_PtrDist length );
|
||||||
|
|
||||||
void
|
void
|
||||||
(*release)( PS_Table table );
|
(*release)( PS_Table table );
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
FT_Error error = 0;
|
FT_Error error = 0;
|
||||||
FT_Byte* charstring = 0;
|
FT_Byte* charstring = 0;
|
||||||
FT_Memory memory = face->root.memory;
|
FT_Memory memory = face->root.memory;
|
||||||
FT_UInt glyph_length = 0;
|
FT_ULong glyph_length = 0;
|
||||||
|
|
||||||
|
|
||||||
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
||||||
|
@ -107,8 +107,7 @@
|
||||||
fd_select = (FT_UInt) cid_get_offset( &p, (FT_Byte)cid->fd_bytes );
|
fd_select = (FT_UInt) cid_get_offset( &p, (FT_Byte)cid->fd_bytes );
|
||||||
off1 = (FT_ULong)cid_get_offset( &p, (FT_Byte)cid->gd_bytes );
|
off1 = (FT_ULong)cid_get_offset( &p, (FT_Byte)cid->gd_bytes );
|
||||||
p += cid->fd_bytes;
|
p += cid->fd_bytes;
|
||||||
glyph_length = (FT_UInt) cid_get_offset(
|
glyph_length = cid_get_offset( &p, (FT_Byte)cid->gd_bytes ) - off1;
|
||||||
&p, (FT_Byte)cid->gd_bytes ) - off1;
|
|
||||||
FT_FRAME_EXIT();
|
FT_FRAME_EXIT();
|
||||||
|
|
||||||
if ( glyph_length == 0 )
|
if ( glyph_length == 0 )
|
||||||
|
@ -148,9 +147,9 @@
|
||||||
if ( decoder->lenIV >= 0 )
|
if ( decoder->lenIV >= 0 )
|
||||||
cid_decrypt( charstring, glyph_length, 4330 );
|
cid_decrypt( charstring, glyph_length, 4330 );
|
||||||
|
|
||||||
error = decoder->funcs.parse_charstrings( decoder,
|
error = decoder->funcs.parse_charstrings(
|
||||||
charstring + cs_offset,
|
decoder, charstring + cs_offset,
|
||||||
glyph_length - cs_offset );
|
(FT_Int)glyph_length - cs_offset );
|
||||||
}
|
}
|
||||||
|
|
||||||
FT_FREE( charstring );
|
FT_FREE( charstring );
|
||||||
|
|
|
@ -156,7 +156,7 @@
|
||||||
ps_table_add( PS_Table table,
|
ps_table_add( PS_Table table,
|
||||||
FT_Int idx,
|
FT_Int idx,
|
||||||
void* object,
|
void* object,
|
||||||
FT_Int length )
|
FT_PtrDist length )
|
||||||
{
|
{
|
||||||
if ( idx < 0 || idx > table->max_elems )
|
if ( idx < 0 || idx > table->max_elems )
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* Auxiliary functions for PostScript fonts (specification). */
|
/* Auxiliary functions for PostScript fonts (specification). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 1996-2001, 2002 by */
|
/* Copyright 1996-2001, 2002, 2003 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -55,7 +55,7 @@ FT_BEGIN_HEADER
|
||||||
ps_table_add( PS_Table table,
|
ps_table_add( PS_Table table,
|
||||||
FT_Int idx,
|
FT_Int idx,
|
||||||
void* object,
|
void* object,
|
||||||
FT_Int length );
|
FT_PtrDist length );
|
||||||
|
|
||||||
FT_LOCAL( void )
|
FT_LOCAL( void )
|
||||||
ps_table_done( PS_Table table );
|
ps_table_done( PS_Table table );
|
||||||
|
|
|
@ -241,8 +241,8 @@
|
||||||
/* subglyph 1 = accent character */
|
/* subglyph 1 = accent character */
|
||||||
subg->index = achar_index;
|
subg->index = achar_index;
|
||||||
subg->flags = FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES;
|
subg->flags = FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES;
|
||||||
subg->arg1 = adx - asb;
|
subg->arg1 = (FT_Int)( adx - asb );
|
||||||
subg->arg2 = ady;
|
subg->arg2 = (FT_Int)ady;
|
||||||
|
|
||||||
/* set up remaining glyph fields */
|
/* set up remaining glyph fields */
|
||||||
glyph->num_subglyphs = 2;
|
glyph->num_subglyphs = 2;
|
||||||
|
@ -565,7 +565,7 @@
|
||||||
goto Stack_Underflow;
|
goto Stack_Underflow;
|
||||||
|
|
||||||
top -= 2;
|
top -= 2;
|
||||||
switch ( top[1] )
|
switch ( (FT_Int)top[1] )
|
||||||
{
|
{
|
||||||
case 1: /* start flex feature */
|
case 1: /* start flex feature */
|
||||||
if ( top[0] != 0 )
|
if ( top[0] != 0 )
|
||||||
|
@ -706,7 +706,7 @@
|
||||||
values = top;
|
values = top;
|
||||||
for ( nn = 0; nn < num_points; nn++ )
|
for ( nn = 0; nn < num_points; nn++ )
|
||||||
{
|
{
|
||||||
FT_Int tmp = values[0];
|
FT_Long tmp = values[0];
|
||||||
|
|
||||||
|
|
||||||
for ( mm = 1; mm < blend->num_designs; mm++ )
|
for ( mm = 1; mm < blend->num_designs; mm++ )
|
||||||
|
@ -785,8 +785,8 @@
|
||||||
|
|
||||||
case op_seac:
|
case op_seac:
|
||||||
/* return immediately after the processing */
|
/* return immediately after the processing */
|
||||||
return t1operator_seac( decoder, top[0], top[1],
|
return t1operator_seac( decoder, top[0], top[1], top[2],
|
||||||
top[2], top[3], top[4] );
|
(FT_Int)top[3], (FT_Int)top[4] );
|
||||||
|
|
||||||
case op_sbw:
|
case op_sbw:
|
||||||
FT_TRACE4(( " sbw" ));
|
FT_TRACE4(( " sbw" ));
|
||||||
|
@ -945,7 +945,7 @@
|
||||||
|
|
||||||
FT_TRACE4(( " callsubr" ));
|
FT_TRACE4(( " callsubr" ));
|
||||||
|
|
||||||
idx = top[0];
|
idx = (FT_Int)top[0];
|
||||||
if ( idx < 0 || idx >= (FT_Int)decoder->num_subrs )
|
if ( idx < 0 || idx >= (FT_Int)decoder->num_subrs )
|
||||||
{
|
{
|
||||||
FT_ERROR(( "t1_decoder_parse_charstrings: "
|
FT_ERROR(( "t1_decoder_parse_charstrings: "
|
||||||
|
|
|
@ -1168,8 +1168,8 @@
|
||||||
|
|
||||||
for ( n = 0; n < glyph->num_points; n++, point++ )
|
for ( n = 0; n < glyph->num_points; n++, point++ )
|
||||||
{
|
{
|
||||||
FT_Int n_prev = point->prev - points;
|
FT_Int n_prev = (FT_Int)( point->prev - points );
|
||||||
FT_Int n_next = point->next - points;
|
FT_Int n_next = (FT_Int)( point->next - points );
|
||||||
FT_Pos dxi, dyi, dxo, dyo;
|
FT_Pos dxi, dyi, dxo, dyo;
|
||||||
|
|
||||||
|
|
||||||
|
@ -1448,7 +1448,8 @@
|
||||||
for ( ; num_hints > 0; num_hints--, sort++ )
|
for ( ; num_hints > 0; num_hints--, sort++ )
|
||||||
{
|
{
|
||||||
PSH_Hint hint = sort[0];
|
PSH_Hint hint = sort[0];
|
||||||
FT_Pos d, flag;
|
FT_Pos d;
|
||||||
|
FT_Int flag;
|
||||||
|
|
||||||
|
|
||||||
if ( point->flags2 & min_flag )
|
if ( point->flags2 & min_flag )
|
||||||
|
|
|
@ -861,7 +861,8 @@
|
||||||
FT_Memory memory = hints->memory;
|
FT_Memory memory = hints->memory;
|
||||||
|
|
||||||
|
|
||||||
error = ps_dimension_add_t1stem( dim, stems[0], stems[1],
|
error = ps_dimension_add_t1stem(
|
||||||
|
dim, (FT_Int)stems[0], (FT_Int)stems[1],
|
||||||
memory, NULL );
|
memory, NULL );
|
||||||
if ( error )
|
if ( error )
|
||||||
{
|
{
|
||||||
|
@ -917,7 +918,8 @@
|
||||||
/* add the three stems to our hints/masks table */
|
/* add the three stems to our hints/masks table */
|
||||||
for ( count = 0; count < 3; count++, stems += 2 )
|
for ( count = 0; count < 3; count++, stems += 2 )
|
||||||
{
|
{
|
||||||
error = ps_dimension_add_t1stem( dim, stems[0], stems[1],
|
error = ps_dimension_add_t1stem(
|
||||||
|
dim, (FT_Int)stems[0], (FT_Int)stems[1],
|
||||||
memory, &idx[count] );
|
memory, &idx[count] );
|
||||||
if ( error )
|
if ( error )
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
@ -1164,7 +1166,8 @@
|
||||||
FT_Int count,
|
FT_Int count,
|
||||||
FT_Fixed* coords )
|
FT_Fixed* coords )
|
||||||
{
|
{
|
||||||
FT_Pos stems[32], y, n, total = count;
|
FT_Pos stems[32], y, n;
|
||||||
|
FT_Int total = count;
|
||||||
|
|
||||||
|
|
||||||
y = 0;
|
y = 0;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* PSNames module implementation (body). */
|
/* PSNames module implementation (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 1996-2001, 2002 by */
|
/* Copyright 1996-2001, 2002, 2003 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -172,7 +172,7 @@
|
||||||
|
|
||||||
if ( uni_char != 0 && uni_char != 0xFFFF )
|
if ( uni_char != 0 && uni_char != 0xFFFF )
|
||||||
{
|
{
|
||||||
map->unicode = uni_char;
|
map->unicode = (FT_UInt)uni_char;
|
||||||
map->glyph_index = n;
|
map->glyph_index = n;
|
||||||
map++;
|
map++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -917,7 +917,7 @@
|
||||||
/* Take care: miny-y1 can be a very large value; we use */
|
/* Take care: miny-y1 can be a very large value; we use */
|
||||||
/* a slow MulDiv function to avoid clipping bugs */
|
/* a slow MulDiv function to avoid clipping bugs */
|
||||||
x1 += SMulDiv( Dx, miny - y1, Dy );
|
x1 += SMulDiv( Dx, miny - y1, Dy );
|
||||||
e1 = TRUNC( miny );
|
e1 = (Int)TRUNC( miny );
|
||||||
f1 = 0;
|
f1 = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -633,7 +633,7 @@
|
||||||
root->face_flags |= FT_FACE_FLAG_VERTICAL;
|
root->face_flags |= FT_FACE_FLAG_VERTICAL;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
root->num_fixed_sizes = face->num_sbit_strikes;
|
root->num_fixed_sizes = (FT_Int)face->num_sbit_strikes;
|
||||||
|
|
||||||
if ( FT_NEW_ARRAY( root->available_sizes, face->num_sbit_strikes ) )
|
if ( FT_NEW_ARRAY( root->available_sizes, face->num_sbit_strikes ) )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
|
|
@ -340,7 +340,7 @@
|
||||||
long byte_size )
|
long byte_size )
|
||||||
{
|
{
|
||||||
ras.cells = (PCell)buffer;
|
ras.cells = (PCell)buffer;
|
||||||
ras.max_cells = byte_size / sizeof ( TCell );
|
ras.max_cells = (int)( byte_size / sizeof ( TCell ) );
|
||||||
ras.num_cells = 0;
|
ras.num_cells = 0;
|
||||||
ras.area = 0;
|
ras.area = 0;
|
||||||
ras.cover = 0;
|
ras.cover = 0;
|
||||||
|
@ -576,7 +576,7 @@
|
||||||
rem += (TCoord)dx;
|
rem += (TCoord)dx;
|
||||||
}
|
}
|
||||||
|
|
||||||
mod -= dx;
|
mod -= (int)dx;
|
||||||
|
|
||||||
while ( ex1 != ex2 )
|
while ( ex1 != ex2 )
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* Anti-aliasing renderer interface (body). */
|
/* Anti-aliasing renderer interface (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2000-2001, 2002 by */
|
/* Copyright 2000-2001, 2002, 2003 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -137,8 +137,8 @@
|
||||||
cbox.xMax = ( cbox.xMax + 63 ) & -64;
|
cbox.xMax = ( cbox.xMax + 63 ) & -64;
|
||||||
cbox.yMax = ( cbox.yMax + 63 ) & -64;
|
cbox.yMax = ( cbox.yMax + 63 ) & -64;
|
||||||
|
|
||||||
width = ( cbox.xMax - cbox.xMin ) >> 6;
|
width = (FT_UInt)( ( cbox.xMax - cbox.xMin ) >> 6 );
|
||||||
height = ( cbox.yMax - cbox.yMin ) >> 6;
|
height = (FT_UInt)( ( cbox.yMax - cbox.yMin ) >> 6 );
|
||||||
bitmap = &slot->bitmap;
|
bitmap = &slot->bitmap;
|
||||||
memory = render->root.memory;
|
memory = render->root.memory;
|
||||||
|
|
||||||
|
|
|
@ -115,7 +115,7 @@
|
||||||
|
|
||||||
while ( left <= right )
|
while ( left <= right )
|
||||||
{
|
{
|
||||||
FT_Int middle = left + ( ( right - left ) >> 1 );
|
FT_Long middle = left + ( ( right - left ) >> 1 );
|
||||||
FT_ULong cur_pair;
|
FT_ULong cur_pair;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -886,7 +886,7 @@
|
||||||
count = 0;
|
count = 0;
|
||||||
|
|
||||||
if ( glyph_index < (FT_UInt)face->num_locations - 1 )
|
if ( glyph_index < (FT_UInt)face->num_locations - 1 )
|
||||||
count = face->glyph_locations[glyph_index + 1] - offset;
|
count = (FT_UInt)( face->glyph_locations[glyph_index + 1] - offset );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( count == 0 )
|
if ( count == 0 )
|
||||||
|
@ -1184,12 +1184,12 @@
|
||||||
/* */
|
/* */
|
||||||
/* This algorithm is a guess and works much better than the above. */
|
/* This algorithm is a guess and works much better than the above. */
|
||||||
/* */
|
/* */
|
||||||
int mac_xscale = FT_SqrtFixed(
|
FT_Fixed mac_xscale = FT_SqrtFixed(
|
||||||
FT_MulFix( subglyph->transform.xx,
|
FT_MulFix( subglyph->transform.xx,
|
||||||
subglyph->transform.xx ) +
|
subglyph->transform.xx ) +
|
||||||
FT_MulFix( subglyph->transform.xy,
|
FT_MulFix( subglyph->transform.xy,
|
||||||
subglyph->transform.xy) );
|
subglyph->transform.xy) );
|
||||||
int mac_yscale = FT_SqrtFixed(
|
FT_Fixed mac_yscale = FT_SqrtFixed(
|
||||||
FT_MulFix( subglyph->transform.yy,
|
FT_MulFix( subglyph->transform.yy,
|
||||||
subglyph->transform.yy ) +
|
subglyph->transform.yy ) +
|
||||||
FT_MulFix( subglyph->transform.yx,
|
FT_MulFix( subglyph->transform.yx,
|
||||||
|
@ -1647,9 +1647,9 @@
|
||||||
|
|
||||||
|
|
||||||
error = sfnt->load_sbit_image( face,
|
error = sfnt->load_sbit_image( face,
|
||||||
size->strike_index,
|
(FT_ULong)size->strike_index,
|
||||||
glyph_index,
|
(FT_UInt)glyph_index,
|
||||||
load_flags,
|
(FT_Int)load_flags,
|
||||||
stream,
|
stream,
|
||||||
&glyph->bitmap,
|
&glyph->bitmap,
|
||||||
&metrics );
|
&metrics );
|
||||||
|
|
|
@ -760,7 +760,7 @@
|
||||||
strike->hori.max_width +
|
strike->hori.max_width +
|
||||||
strike->hori.min_advance_SB ) << 6;
|
strike->hori.min_advance_SB ) << 6;
|
||||||
|
|
||||||
size->strike_index = strike_index;
|
size->strike_index = (FT_UInt)strike_index;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* AFM support for Type 1 fonts (body). */
|
/* AFM support for Type 1 fonts (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 1996-2001, 2002 by */
|
/* Copyright 1996-2001, 2002, 2003 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -148,7 +148,7 @@
|
||||||
FT_ULong index2 = KERN_INDEX( pair2->glyph1, pair2->glyph2 );
|
FT_ULong index2 = KERN_INDEX( pair2->glyph1, pair2->glyph2 );
|
||||||
|
|
||||||
|
|
||||||
return ( index1 - index2 );
|
return (int)( index1 - index2 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -143,7 +143,7 @@
|
||||||
|
|
||||||
FT_LOCAL_DEF( FT_Error )
|
FT_LOCAL_DEF( FT_Error )
|
||||||
T1_Compute_Max_Advance( T1_Face face,
|
T1_Compute_Max_Advance( T1_Face face,
|
||||||
FT_Int* max_advance )
|
FT_Pos* max_advance )
|
||||||
{
|
{
|
||||||
FT_Error error;
|
FT_Error error;
|
||||||
T1_DecoderRec decoder;
|
T1_DecoderRec decoder;
|
||||||
|
@ -185,7 +185,7 @@
|
||||||
if ( glyph_index == 0 || decoder.builder.advance.x > *max_advance )
|
if ( glyph_index == 0 || decoder.builder.advance.x > *max_advance )
|
||||||
*max_advance = decoder.builder.advance.x;
|
*max_advance = decoder.builder.advance.x;
|
||||||
|
|
||||||
/* ignore the error if one occured - skip to next glyph */
|
/* ignore the error if one occurred - skip to next glyph */
|
||||||
}
|
}
|
||||||
|
|
||||||
return T1_Err_Ok;
|
return T1_Err_Ok;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* Type 1 Glyph Loader (specification). */
|
/* Type 1 Glyph Loader (specification). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 1996-2001, 2002 by */
|
/* Copyright 1996-2001, 2002, 2003 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -29,7 +29,7 @@ FT_BEGIN_HEADER
|
||||||
|
|
||||||
FT_LOCAL( FT_Error )
|
FT_LOCAL( FT_Error )
|
||||||
T1_Compute_Max_Advance( T1_Face face,
|
T1_Compute_Max_Advance( T1_Face face,
|
||||||
FT_Int* max_advance );
|
FT_Pos* max_advance );
|
||||||
|
|
||||||
FT_LOCAL( FT_Error )
|
FT_LOCAL( FT_Error )
|
||||||
T1_Load_Glyph( T1_GlyphSlot glyph,
|
T1_Load_Glyph( T1_GlyphSlot glyph,
|
||||||
|
|
|
@ -1213,12 +1213,12 @@
|
||||||
FT_MEM_COPY( temp, base, size );
|
FT_MEM_COPY( temp, base, size );
|
||||||
psaux->t1_decrypt( temp, size, 4330 );
|
psaux->t1_decrypt( temp, size, 4330 );
|
||||||
size -= face->type1.private_dict.lenIV;
|
size -= face->type1.private_dict.lenIV;
|
||||||
error = T1_Add_Table( table, idx,
|
error = T1_Add_Table( table, (FT_Int)idx,
|
||||||
temp + face->type1.private_dict.lenIV, size );
|
temp + face->type1.private_dict.lenIV, size );
|
||||||
FT_FREE( temp );
|
FT_FREE( temp );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
error = T1_Add_Table( table, idx, base, size );
|
error = T1_Add_Table( table, (FT_Int)idx, base, size );
|
||||||
if ( error )
|
if ( error )
|
||||||
goto Fail;
|
goto Fail;
|
||||||
}
|
}
|
||||||
|
|
|
@ -424,7 +424,7 @@
|
||||||
root->max_advance_width =
|
root->max_advance_width =
|
||||||
(FT_Short)( root->bbox.xMax );
|
(FT_Short)( root->bbox.xMax );
|
||||||
{
|
{
|
||||||
FT_Int max_advance;
|
FT_Pos max_advance;
|
||||||
|
|
||||||
|
|
||||||
error = T1_Compute_Max_Advance( face, &max_advance );
|
error = T1_Compute_Max_Advance( face, &max_advance );
|
||||||
|
|
|
@ -383,7 +383,7 @@
|
||||||
|
|
||||||
|
|
||||||
/* read the number of entries in the encoding, should be 256 */
|
/* read the number of entries in the encoding, should be 256 */
|
||||||
count = T1_ToInt( parser );
|
count = (FT_Int)T1_ToInt( parser );
|
||||||
if ( parser->root.error )
|
if ( parser->root.error )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -451,7 +451,7 @@
|
||||||
|
|
||||||
|
|
||||||
parser->root.cursor = cur;
|
parser->root.cursor = cur;
|
||||||
charcode = T1_ToInt( parser );
|
charcode = (FT_Int)T1_ToInt( parser );
|
||||||
cur = parser->root.cursor;
|
cur = parser->root.cursor;
|
||||||
|
|
||||||
/* skip whitespace */
|
/* skip whitespace */
|
||||||
|
@ -715,7 +715,7 @@
|
||||||
FT_Int n;
|
FT_Int n;
|
||||||
|
|
||||||
|
|
||||||
loader->num_glyphs = T1_ToInt( parser );
|
loader->num_glyphs = (FT_Int)T1_ToInt( parser );
|
||||||
if ( parser->root.error )
|
if ( parser->root.error )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -867,8 +867,8 @@
|
||||||
T42_Parser parser = &loader->parser;
|
T42_Parser parser = &loader->parser;
|
||||||
FT_Byte* cur = base;
|
FT_Byte* cur = base;
|
||||||
FT_Byte* limit = cur + size;
|
FT_Byte* limit = cur + size;
|
||||||
FT_UInt n_keywords = sizeof ( t42_keywords ) /
|
FT_UInt n_keywords = (FT_UInt)( sizeof ( t42_keywords ) /
|
||||||
sizeof ( t42_keywords[0] );
|
sizeof ( t42_keywords[0] ) );
|
||||||
|
|
||||||
|
|
||||||
parser->root.cursor = base;
|
parser->root.cursor = base;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* Type 42 font parser (specification). */
|
/* Type 42 font parser (specification). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2002 by Roberto Alameda. */
|
/* Copyright 2002, 2003 by Roberto Alameda. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
/* modified, and distributed under the terms of the FreeType project */
|
/* modified, and distributed under the terms of the FreeType project */
|
||||||
|
@ -31,7 +31,7 @@ FT_BEGIN_HEADER
|
||||||
FT_Stream stream;
|
FT_Stream stream;
|
||||||
|
|
||||||
FT_Byte* base_dict;
|
FT_Byte* base_dict;
|
||||||
FT_Int base_len;
|
FT_Long base_len;
|
||||||
|
|
||||||
FT_Byte in_memory;
|
FT_Byte in_memory;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue