Changeset 5a6cc679 in mainline for uspace/lib/draw/font.h

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/lib/draw/font.h (modified) (2 diffs)

uspace/lib/draw/font.h

@@ -91 +91 @@
 
 typedef struct {
-        int (*get_font_metrics)(void *, font_metrics_t *);
-        int (*resolve_glyph)(void *, wchar_t, glyph_id_t *);
-        int (*get_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
-        int (*render_glyph)(void *, drawctx_t *, source_t *, sysarg_t,
+        errno_t (*get_font_metrics)(void *, font_metrics_t *);
+        errno_t (*resolve_glyph)(void *, wchar_t, glyph_id_t *);
+        errno_t (*get_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
+        errno_t (*render_glyph)(void *, drawctx_t *, source_t *, sysarg_t,
             sysarg_t, glyph_id_t);
         void (*release)(void *);
@@ -105 +105 @@
 
 extern font_t *font_create(font_backend_t *, void *);
-extern int font_get_metrics(font_t *, font_metrics_t *);
-extern int font_resolve_glyph(font_t *, wchar_t, glyph_id_t *);
-extern int font_get_glyph_metrics(font_t *, glyph_id_t, glyph_metrics_t *);
-extern int font_render_glyph(font_t *, drawctx_t *, source_t *,
+extern errno_t font_get_metrics(font_t *, font_metrics_t *);
+extern errno_t font_resolve_glyph(font_t *, wchar_t, glyph_id_t *);
+extern errno_t font_get_glyph_metrics(font_t *, glyph_id_t, glyph_metrics_t *);
+extern errno_t font_render_glyph(font_t *, drawctx_t *, source_t *,
     sysarg_t, sysarg_t, glyph_id_t);
 extern void font_release(font_t *);
 
-extern int font_get_box(font_t *, char *, sysarg_t *, sysarg_t *);
-extern int font_draw_text(font_t *, drawctx_t *, source_t *, const char *,
+extern errno_t font_get_box(font_t *, char *, sysarg_t *, sysarg_t *);
+extern errno_t font_draw_text(font_t *, drawctx_t *, source_t *, const char *,
     sysarg_t, sysarg_t);