Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/draw/font/pcf.c

    rb7fd2a0 rd5c1051  
    146146}
    147147
    148 static errno_t pcf_resolve_glyph(void *opaque_data, const wchar_t chr,
     148static int pcf_resolve_glyph(void *opaque_data, const wchar_t chr,
    149149    glyph_id_t *glyph_id)
    150150{
     
    183183}
    184184
    185 static errno_t load_glyph_metrics(pcf_data_t *data, uint32_t glyph_id,
     185static int load_glyph_metrics(pcf_data_t *data, uint32_t glyph_id,
    186186    pcf_toc_entry_t *table, pcf_default_metrics_t *metrics)
    187187{
     
    253253}
    254254
    255 static errno_t pcf_load_glyph_surface(void *opaque_data, glyph_id_t glyph_id,
     255static int pcf_load_glyph_surface(void *opaque_data, glyph_id_t glyph_id,
    256256    surface_t **out_surface)
    257257{
     
    260260        pcf_default_metrics_t pcf_metrics;
    261261        memset(&pcf_metrics, 0, sizeof(pcf_default_metrics_t));
    262         errno_t rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
     262        int rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
    263263            &pcf_metrics);
    264264        if (rc != EOK)
     
    339339}
    340340
    341 static errno_t pcf_load_glyph_metrics(void *opaque_data, glyph_id_t glyph_id,
     341static int pcf_load_glyph_metrics(void *opaque_data, glyph_id_t glyph_id,
    342342    glyph_metrics_t *gm)
    343343{
     
    346346        pcf_default_metrics_t pcf_metrics;
    347347        memset(&pcf_metrics, 0, sizeof(pcf_default_metrics_t));
    348         errno_t rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
     348        int rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
    349349            &pcf_metrics);
    350350        if (rc != EOK)
     
    377377};
    378378
    379 static errno_t pcf_read_toc(pcf_data_t *data)
     379static int pcf_read_toc(pcf_data_t *data)
    380380{
    381381        int rc = fseek(data->file, 0, SEEK_END);
     
    460460}
    461461
    462 static errno_t pcf_seek_table_header(pcf_data_t *data, pcf_toc_entry_t *table)
     462static int pcf_seek_table_header(pcf_data_t *data, pcf_toc_entry_t *table)
    463463{
    464464        uint32_t format;
     
    478478}
    479479
    480 static errno_t pcf_read_bitmap_table_header(pcf_data_t *data)
    481 {
    482         errno_t rc = pcf_seek_table_header(data, &data->bitmap_table);
     480static int pcf_read_bitmap_table_header(pcf_data_t *data)
     481{
     482        int rc = pcf_seek_table_header(data, &data->bitmap_table);
    483483        if (rc != EOK)
    484484                return rc;
     
    498498}
    499499
    500 static errno_t pcf_read_metrics_table_header(pcf_data_t *data)
    501 {
    502         errno_t rc = pcf_seek_table_header(data, &data->metrics_table);
     500static int pcf_read_metrics_table_header(pcf_data_t *data)
     501{
     502        int rc = pcf_seek_table_header(data, &data->metrics_table);
    503503        if (rc != EOK)
    504504                return rc;
     
    531531}
    532532
    533 static errno_t pcf_read_encodings_table_header(pcf_data_t *data)
    534 {
    535         errno_t rc = pcf_seek_table_header(data, &data->encodings_table);
     533static int pcf_read_encodings_table_header(pcf_data_t *data)
     534{
     535        int rc = pcf_seek_table_header(data, &data->encodings_table);
    536536        if (rc != EOK)
    537537                return rc;
     
    558558}
    559559
    560 static errno_t pcf_read_accelerators_table(pcf_data_t *data)
    561 {
    562         errno_t rc = pcf_seek_table_header(data, &data->accelerators_table);
     560static int pcf_read_accelerators_table(pcf_data_t *data)
     561{
     562        int rc = pcf_seek_table_header(data, &data->accelerators_table);
    563563        if (rc != EOK)
    564564                return rc;
     
    579579}
    580580
    581 errno_t pcf_font_create(font_t **font, char *filename, uint16_t points)
    582 {
    583         errno_t rc;
     581int pcf_font_create(font_t **font, char *filename, uint16_t points)
     582{
     583        int rc;
    584584        pcf_data_t *data = malloc(sizeof(pcf_data_t));
    585585        if (data == NULL)
Note: See TracChangeset for help on using the changeset viewer.