Changeset ea459d4 in mainline for uspace/lib/gfxfont/src/typeface.c

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

File:

• uspace/lib/gfxfont/src/typeface.c (modified) (4 diffs)

uspace/lib/gfxfont/src/typeface.c

@@ -38 +38 @@
 #include <errno.h>
 #include <gfx/bitmap.h>
+#include <gfx/font.h>
 #include <gfx/glyph.h>
 #include <gfx/typeface.h>
@@ -78 +79 @@
 void gfx_typeface_destroy(gfx_typeface_t *tface)
 {
+        gfx_font_info_t *finfo;
+
+        if (tface->riffr != NULL)
+                (void) riff_rclose(tface->riffr);
+
+        finfo = gfx_typeface_first_font(tface);
+        while (finfo != NULL) {
+                if (finfo->font != NULL)
+                        gfx_font_close(finfo->font);
+                list_remove(&finfo->lfonts);
+                free(finfo);
+
+                finfo = gfx_typeface_first_font(tface);
+        }
+
         free(tface);
 }
@@ -111 +127 @@
 
         return list_get_instance(link, gfx_font_info_t, lfonts);
+}
+
+/** Open typeface from a TPF file.
+ *
+ * @param gc Graphic context
+ * @param fname File name
+ * @param rtface Place to store pointer to open typeface
+ * @return EOK on success or an error code
+ */
+errno_t gfx_typeface_open(gfx_context_t *gc, const char *fname,
+    gfx_typeface_t **rtface)
+{
+        riffr_t *riffr = NULL;
+        gfx_typeface_t *tface = NULL;
+        errno_t rc;
+        riff_rchunk_t riffck;
+        uint32_t format;
+
+        rc = gfx_typeface_create(gc, &tface);
+        if (rc != EOK)
+                goto error;
+
+        rc = riff_ropen(fname, &riffck, &riffr);
+        if (rc != EOK)
+                goto error;
+
+        rc = riff_read_uint32(&riffck, &format);
+        if (rc != EOK)
+                goto error;
+
+        if (format != FORM_TPFC) {
+                rc = ENOTSUP;
+                goto error;
+        }
+
+        while (true) {
+                rc = gfx_font_info_load(tface, &riffck);
+                if (rc == ENOENT)
+                        break;
+
+                if (rc != EOK)
+                        goto error;
+        }
+
+        rc = riff_rchunk_end(&riffck);
+        if (rc != EOK)
+                goto error;
+
+        tface->riffr = riffr;
+        *rtface = tface;
+        return EOK;
+error:
+        if (riffr != NULL)
+                riff_rclose(riffr);
+        if (tface != NULL)
+                gfx_typeface_destroy(tface);
+        return rc;
+}
+
+/** Make sure all typeface fonts are loaded.
+ *
+ * @param tface Typeface
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_typeface_loadin(gfx_typeface_t *tface)
+{
+        gfx_font_t *font;
+        gfx_font_info_t *finfo;
+        errno_t rc;
+
+        finfo = gfx_typeface_first_font(tface);
+        while (finfo != NULL) {
+                /* Open font to make sure it is loaded */
+                rc = gfx_font_open(finfo, &font);
+                if (rc != EOK)
+                        return rc;
+
+                /* Don't need this anymore */
+                (void)font;
+
+                finfo = gfx_typeface_next_font(finfo);
+        }
+
+        return EOK;
 }
 
@@ -125 +225 @@
         gfx_font_info_t *finfo;
         riff_wchunk_t riffck;
+
+        /*
+         * Make sure all fonts are loaded before writing (in case
+         * we are writing into our original backing file).
+         */
+        rc = gfx_typeface_loadin(tface);
+        if (rc != EOK)
+                return rc;
 
         rc = riff_wopen(fname, &riffw);