Changeset ea459d4 in mainline for uspace/lib/gfxfont/private

Timestamp:

2020-09-24T14:25:21Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

120031a5

Parents:

aaf962e6

git-author:

Jiri Svoboda <jiri@…> (2020-09-22 17:25:10)

git-committer:

Jiri Svoboda <jiri@…> (2020-09-24 14:25:21)

Message:

Reading typeface from TPF file

Location:

uspace/lib/gfxfont/private

Files:

• font.h (modified) (2 diffs)
• glyph.h (modified) (1 diff)
• typeface.h (modified) (2 diffs)

uspace/lib/gfxfont/private/font.h

@@ -59 +59 @@
         /** Containing typeface */
         struct gfx_typeface *typeface;
+        /** Containing font info */
+        struct gfx_font_info *finfo;
         /** Font metrics */
         gfx_font_metrics_t metrics;
@@ -82 +84 @@
         /** Font or @c NULL if font is not present in memory */
         struct gfx_font *font;
+        /** Font chunk from which font can be read */
+        riff_rchunk_t fontck;
 };
 
 extern errno_t gfx_font_splice_at_glyph(gfx_font_t *, gfx_glyph_t *,
     gfx_rect_t *);
+extern errno_t gfx_font_info_load(gfx_typeface_t *, riff_rchunk_t *);
+extern errno_t gfx_font_load(gfx_font_info_t *);
 extern errno_t gfx_font_save(gfx_font_info_t *, riffw_t *);
 

uspace/lib/gfxfont/private/glyph.h

@@ -77 +77 @@
 extern errno_t gfx_glyph_transfer(gfx_glyph_t *, gfx_coord_t, gfx_bitmap_t *,
     gfx_rect_t *);
+extern errno_t gfx_glyph_load(gfx_font_t *, riff_rchunk_t *);
 extern errno_t gfx_glyph_save(gfx_glyph_t *, riffw_t *);
 

uspace/lib/gfxfont/private/typeface.h

@@ -40 +40 @@
 #include <adt/list.h>
 #include <errno.h>
+#include <riff/chunk.h>
 #include <types/gfx/bitmap.h>
 #include <types/gfx/context.h>
@@ -57 +58 @@
         /** Fonts (of gfx_font_info_t) */
         list_t fonts;
+        /** RIFF reader of the open typeface file or @c NULL */
+        riffr_t *riffr;
 };