minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[pk] Fixes. 

* Now pk driver loads bitmaps properly and ftview
displays proper glyphs from pk driver.
This commit is contained in:
Parth Wazurkar 2018-08-02 00:48:05 +05:30
parent 1b16b2267e
commit dddc46b0b8
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/freetype/internal/tfm.h
View File

@ -48,7 +48,7 @@ FT_BEGIN_HEADER
/* Font Info */
FT_Long cs; /* Check Sum */
/* Metrics */
FT_ULong ds; /* Design Size */
FT_ULong ds, fs; /* Design Size */
FT_UInt design_size;
FT_UInt slant;
FT_UInt begin_char, end_char;

10
src/pk/pklib.c
View File

@ -320,10 +320,10 @@ unsigned char bits_table[] = {
k = READ_UINT1( stream );
if ( FT_STREAM_SKIP( k ) )
goto Exit;
ds = READ_UINT4( stream );
check_sum = READ_UINT4( stream );
hppp = READ_UINT4( stream );
vppp = READ_UINT4( stream );
ds = READ_INT4( stream );
check_sum = READ_INT4( stream );
hppp = READ_INT4( stream );
vppp = READ_INT4( stream );
/* gptr = ftell(fp); */
gptr = stream->pos;
@ -510,6 +510,7 @@ unsigned char bits_table[] = {
if (pk_read_14(stream, dny_f, bw, rs, &(go->bm_table[index]), cc) < 0)
{
/* vf_error = VF_ERR_ILL_FONT_FILE; (FOR TRACING) */
FT_ERROR(( "pk_load_font: error in `pk_read_14'\n" ));
error = FT_THROW( Unknown_File_Format );
goto Exit;
}
@ -519,6 +520,7 @@ unsigned char bits_table[] = {
if (pk_read_n14(stream, dny_f, bw, rs, &(go->bm_table[index]), cc) < 0)
{
/* vf_error = VF_ERR_ILL_FONT_FILE; (FOR TRACING) */
FT_ERROR(( "pk_load_font: error in `pk_read_n14'\n" ));
error = FT_THROW( Unknown_File_Format );
goto Exit;
}

1
src/tfm/tfmobjs.c
View File

@ -167,6 +167,7 @@
return error;
lf = (FT_ULong)READ_UINT2( stream );
fi->fs = 4*lf - 1 ;
#if 0
if ((lf == 11) || (lf == 9))