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/cid/cidgload.c (cid_slot_load_glyph), 

src/truetype/ttgload.c (tt_prepare_zone): removing compiler warnings
This commit is contained in:
David Turner 2006-08-16 09:11:31 +00:00
parent f1e96066a6
commit 9fbfc6af07
3 changed files with 110 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-08-16 David Turner <david@freetype.org>
* src/cid/cidgload.c (cid_slot_load_glyph),
src/truetype/ttgload.c (tt_prepare_zone): removing compiler warnings
2006-08-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2006-08-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* modules.cfg (BASE_EXTENSIONS): Compile in ftgxval.c by default to * modules.cfg (BASE_EXTENSIONS): Compile in ftgxval.c by default to

13
src/cid/cidgload.c
View File

@ -289,7 +289,6 @@
cidglyph->format = FT_GLYPH_FORMAT_OUTLINE; cidglyph->format = FT_GLYPH_FORMAT_OUTLINE;
{
error = psaux->t1_decoder_funcs->init( &decoder, error = psaux->t1_decoder_funcs->init( &decoder,
cidglyph->face, cidglyph->face,
cidsize, cidsize,
@ -299,9 +298,9 @@
hinting, hinting,
FT_LOAD_TARGET_MODE( load_flags ), FT_LOAD_TARGET_MODE( load_flags ),
cid_load_glyph ); cid_load_glyph );
if (error)
goto Exit;
if ( !error )
{
/* TODO: initialize decoder.len_buildchar and decoder.buildchar */ /* TODO: initialize decoder.len_buildchar and decoder.buildchar */
/* if we ever support CID-keyed multiple master fonts */ /* if we ever support CID-keyed multiple master fonts */
@ -310,20 +309,18 @@
( ( load_flags & FT_LOAD_NO_RECURSE ) != 0 ) ); ( ( load_flags & FT_LOAD_NO_RECURSE ) != 0 ) );
error = cid_load_glyph( &decoder, glyph_index ); error = cid_load_glyph( &decoder, glyph_index );
if (error)
goto Exit;
font_matrix = decoder.font_matrix; font_matrix = decoder.font_matrix;
font_offset = decoder.font_offset; font_offset = decoder.font_offset;
/* save new glyph tables */ /* save new glyph tables */
psaux->t1_decoder_funcs->done( &decoder ); psaux->t1_decoder_funcs->done( &decoder );
}
}
/* now, set the metrics -- this is rather simple, as */ /* now, set the metrics -- this is rather simple, as */
/* the left side bearing is the xMin, and the top side */ /* the left side bearing is the xMin, and the top side */
/* bearing the yMax */ /* bearing the yMax */
if ( !error )
{
cidglyph->outline.flags &= FT_OUTLINE_OWNER; cidglyph->outline.flags &= FT_OUTLINE_OWNER;
cidglyph->outline.flags |= FT_OUTLINE_REVERSE_FILL; cidglyph->outline.flags |= FT_OUTLINE_REVERSE_FILL;
@ -415,8 +412,8 @@
ft_synthesize_vertical_metrics( metrics, ft_synthesize_vertical_metrics( metrics,
metrics->vertAdvance ); metrics->vertAdvance );
} }
}
Exit:
return error; return error;
} }

2
src/truetype/ttgload.c
View File

@ -578,7 +578,7 @@
zone->cur = load->outline.points + start_point; zone->cur = load->outline.points + start_point;
zone->tags = (FT_Byte*)load->outline.tags + start_point; zone->tags = (FT_Byte*)load->outline.tags + start_point;
zone->contours = (FT_UShort*)load->outline.contours + start_contour; zone->contours = (FT_UShort*)load->outline.contours + start_contour;
zone->first_point = start_point; zone->first_point = (FT_UShort)start_point;
} }