mirrors/Modest
1
0
Fork 0
mirror of https://github.com/lexborisov/Modest synced 2024-11-22 05:41:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem with read ttf file

Browse Source
This commit is contained in:
lexborisov 2017-03-13 22:50:47 +03:00
parent d6e53ec7ac
commit e55f360724
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/myfont/glyf.c
View File

@ -66,14 +66,14 @@ mystatus_t myfont_glyf_load_data(myfont_font_t *mf, myfont_table_glyph_t *glyph,
{
memset(&glyph->head, 0, sizeof(myfont_table_glyf_head_t));
/* get current data */
uint8_t *data = &font_data[offset];
// load head
offset += 10;
if(offset > data_size)
return MyFONT_STATUS_ERROR_TABLE_UNEXPECTED_ENDING;
/* get current data */
uint8_t *data = &font_data[offset];
glyph->head.numberOfContours = myfont_read_16(&data);
glyph->head.xMin = myfont_read_16(&data);
glyph->head.yMin = myfont_read_16(&data);

28
source/myfont/myfont.c
View File

@ -167,11 +167,13 @@ void * myfont_destroy_font_data(myfont_font_t *mf, uint8_t* return_data)
return NULL;
}
mystatus_t myfont_load(myfont_font_t *mf, uint8_t* data, size_t data_size)
mystatus_t myfont_load(myfont_font_t *mf, uint8_t* font_data, size_t data_size)
{
if(data_size < 12)
return MyFONT_STATUS_ERROR_TABLE_UNEXPECTED_ENDING;
uint8_t* data = font_data;
mf->header.version_major = myfont_read_u16(&data);
mf->header.version_minor = myfont_read_u16(&data);
mf->header.numTables = myfont_read_u16(&data);
@ -239,40 +241,40 @@ mystatus_t myfont_load(myfont_font_t *mf, uint8_t* data, size_t data_size)
mystatus_t status;
if((status = myfont_load_table_cmap(mf, data, data_size)))
if((status = myfont_load_table_cmap(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_CMAP;
if((status = myfont_load_table_head(mf, data, data_size)))
if((status = myfont_load_table_head(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_HEAD;
if((status = myfont_load_table_name(mf, data, data_size)))
if((status = myfont_load_table_name(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_NAME;
if((status = myfont_load_table_os_2(mf, data, data_size)))
if((status = myfont_load_table_os_2(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_OS_2;
if((status = myfont_load_table_maxp(mf, data, data_size)))
if((status = myfont_load_table_maxp(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_MAXP;
if((status = myfont_load_table_hhea(mf, data, data_size)))
if((status = myfont_load_table_hhea(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_HHEA;
if((status = myfont_load_table_hmtx(mf, data, data_size)))
if((status = myfont_load_table_hmtx(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_HMTX;
if((status = myfont_load_table_loca(mf, data, data_size)))
if((status = myfont_load_table_loca(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_LOCA;
if((status = myfont_load_table_glyf(mf, data, data_size)))
if((status = myfont_load_table_glyf(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_GLYF;
if((status = myfont_load_table_vhea(mf, data, data_size)))
if((status = myfont_load_table_vhea(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_VHEA;
if((status = myfont_load_table_vmtx(mf, data, data_size)))
if((status = myfont_load_table_vmtx(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_VMTX;
if((status = myfont_load_table_pclt(mf, data, data_size)))
if((status = myfont_load_table_pclt(mf, font_data, data_size)))
return MyFONT_STATUS_ERROR_TABLE_LOAD_PCLT;
return MyFONT_STATUS_OK;