Changeset d53af3c8 in mainline for uspace/lib/gfxfont/src/glyph.c

Timestamp:

2020-09-18T23:00:44Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0ee3157

Parents:

7bef2d8

Message:

Save typeface to (RIFF) TPF file using newly introduced libriff

Originally I planned introducing libriff for better RIFF WAVE support.
It could be used for this purpose in the future (as well as for WebP
and other RIFF-based formats).

File:

• uspace/lib/gfxfont/src/glyph.c (modified) (2 diffs)

uspace/lib/gfxfont/src/glyph.c

@@ -44 +44 @@
 #include "../private/font.h"
 #include "../private/glyph.h"
+#include "../private/tpf_file.h"
 
 /** Initialize glyph metrics structure.
@@ -314 +315 @@
 }
 
+/** Save glyph metrics to RIFF TPF file.
+ *
+ * @param metrics Glyph metrics
+ * @param riffw RIFF writer
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_glyph_metrics_save(gfx_glyph_metrics_t *metrics,
+    riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t mtrck;
+
+        rc = riff_wchunk_start(riffw, CKID_gmtr, &mtrck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_write(riffw, (void *) metrics, sizeof(*metrics));
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_end(riffw, &mtrck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Save glyph patterns to RIFF TPF file.
+ *
+ * @param glyph Glyph
+ * @param riffw RIFF writer
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_glyph_patterns_save(gfx_glyph_t *glyph, riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t patck;
+        gfx_glyph_pattern_t *pat;
+        const char *str;
+
+        rc = riff_wchunk_start(riffw, CKID_gpat, &patck);
+        if (rc != EOK)
+                return rc;
+
+        pat = gfx_glyph_first_pattern(glyph);
+        while (pat != NULL) {
+                str = gfx_glyph_pattern_str(pat);
+
+                rc = riff_wchunk_write(riffw, (void *) str, 1 + str_size(str));
+                if (rc != EOK)
+                        return rc;
+
+                pat = gfx_glyph_next_pattern(pat);
+        }
+
+        rc = riff_wchunk_end(riffw, &patck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Save glyph rectangle/origin to RIFF TPF file.
+ *
+ * @param glyph Glyph
+ * @param riffw RIFF writer
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_glyph_rectangle_origin_save(gfx_glyph_t *glyph,
+    riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t rorck;
+
+        rc = riff_wchunk_start(riffw, CKID_gror, &rorck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_write(riffw, (void *) &glyph->rect,
+            sizeof(glyph->rect));
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_write(riffw, (void *) &glyph->origin,
+            sizeof(glyph->origin));
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_end(riffw, &rorck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Save glyph into RIFF TPF file.
+ *
+ * @param glyph Glyph
+ * @param riffw RIFF writer
+ */
+errno_t gfx_glyph_save(gfx_glyph_t *glyph, riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t glyphck;
+
+        rc = riff_wchunk_start(riffw, CKID_LIST, &glyphck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_write_uint32(riffw, LTYPE_glph);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_glyph_metrics_save(&glyph->metrics, riffw);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_glyph_patterns_save(glyph, riffw);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_glyph_rectangle_origin_save(glyph, riffw);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_end(riffw, &glyphck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 /** @}
  */