Changeset 453f203b in mainline for uspace/lib/gfxfont/src/font.c

Timestamp:

2020-09-25T14:31:27Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

16357ec

Parents:

120031a5

git-author:

Jiri Svoboda <jiri@…> (2020-09-24 18:30:07)

git-committer:

Jiri Svoboda <jiri@…> (2020-09-25 14:31:27)

Message:

Cannot just write structures to TPF file

This would compromise portability of TPF files. What was I thinking?
Endianness and type widths must be fixed.

File:

• uspace/lib/gfxfont/src/font.c (modified) (15 diffs)

uspace/lib/gfxfont/src/font.c

@@ -36 +36 @@
 #include <adt/list.h>
 #include <assert.h>
+#include <byteorder.h>
 #include <errno.h>
 #include <gfx/bitmap.h>
@@ -403 +404 @@
         errno_t rc;
         riff_rchunk_t propsck;
+        tpf_font_props_t tprops;
         size_t nread;
 
@@ -409 +411 @@
                 return rc;
 
-        rc = riff_read(&propsck, (void *) props, sizeof(*props), &nread);
-        if (rc != EOK || nread != sizeof(*props))
+        rc = riff_read(&propsck, (void *) &tprops, sizeof(tprops), &nread);
+        if (rc != EOK || nread != sizeof(tprops))
                 return EIO;
 
@@ -416 +418 @@
         if (rc != EOK)
                 return rc;
+
+        props->size = uint16_t_le2host(tprops.size);
+        props->flags = uint16_t_le2host(tprops.flags);
 
         return EOK;
@@ -430 +435 @@
         errno_t rc;
         riff_wchunk_t propsck;
+        tpf_font_props_t tprops;
+
+        tprops.size = host2uint16_t_le(props->size);
+        tprops.flags = host2uint16_t_le(props->flags);
 
         rc = riff_wchunk_start(riffw, CKID_fprp, &propsck);
@@ -435 +444 @@
                 return rc;
 
-        rc = riff_write(riffw, (void *) props, sizeof(*props));
+        rc = riff_write(riffw, (void *) &tprops, sizeof(tprops));
         if (rc != EOK)
                 return rc;
@@ -457 +466 @@
         errno_t rc;
         riff_rchunk_t mtrck;
+        tpf_font_metrics_t tmetrics;
         size_t nread;
 
@@ -463 +473 @@
                 return rc;
 
-        rc = riff_read(&mtrck, (void *) metrics, sizeof(*metrics), &nread);
-        if (rc != EOK || nread != sizeof(*metrics))
+        rc = riff_read(&mtrck, (void *) &tmetrics, sizeof(tmetrics), &nread);
+        if (rc != EOK || nread != sizeof(tmetrics))
                 return EIO;
 
@@ -471 +481 @@
                 return rc;
 
+        metrics->ascent = uint16_t_le2host(tmetrics.ascent);
+        metrics->descent = uint16_t_le2host(tmetrics.descent);
+        metrics->leading = uint16_t_le2host(tmetrics.leading);
         return EOK;
 }
@@ -484 +497 @@
 {
         errno_t rc;
+        tpf_font_metrics_t tmetrics;
         riff_wchunk_t mtrck;
 
+        tmetrics.ascent = host2uint16_t_le(metrics->ascent);
+        tmetrics.descent = host2uint16_t_le(metrics->descent);
+        tmetrics.leading = host2uint16_t_le(metrics->leading);
+
         rc = riff_wchunk_start(riffw, CKID_fmtr, &mtrck);
         if (rc != EOK)
                 return rc;
 
-        rc = riff_write(riffw, (void *) metrics, sizeof(*metrics));
+        rc = riff_write(riffw, (void *) &tmetrics, sizeof(tmetrics));
         if (rc != EOK)
                 return rc;
@@ -511 +529 @@
         errno_t rc;
         riff_rchunk_t bmpck;
+        tpf_font_bmp_hdr_t thdr;
         gfx_bitmap_params_t params;
         gfx_bitmap_alloc_t alloc;
@@ -516 +535 @@
         uint32_t width;
         uint32_t height;
-        uint32_t depth;
+        uint16_t fmt;
+        uint16_t depth;
         size_t nread;
 
@@ -523 +543 @@
                 goto error;
 
-        rc = riff_read_uint32(&bmpck, &width);
-        if (rc != EOK)
-                goto error;
-
-        rc = riff_read_uint32(&bmpck, &height);
-        if (rc != EOK)
-                goto error;
-
-        rc = riff_read_uint32(&bmpck, &depth);
-        if (rc != EOK)
-                goto error;
-
-        if (depth != 8 * sizeof(uint32_t)) {
+        rc = riff_read(&bmpck, &thdr, sizeof(thdr), &nread);
+        if (rc != EOK || nread != sizeof(thdr))
+                goto error;
+
+        width = uint32_t_le2host(thdr.width);
+        height = uint32_t_le2host(thdr.height);
+        fmt = uint16_t_le2host(thdr.fmt);
+        depth = uint16_t_le2host(thdr.depth);
+
+        if (fmt != 0 || depth != 8 * sizeof(uint32_t)) {
                 rc = ENOTSUP;
                 goto error;
@@ -587 +604 @@
 {
         errno_t rc;
+        tpf_font_bmp_hdr_t thdr;
         riff_wchunk_t bmpck;
         gfx_bitmap_alloc_t alloc;
 
+        thdr.width = host2uint32_t_le(font->rect.p1.x);
+        thdr.height = host2uint32_t_le(font->rect.p1.y);
+        thdr.fmt = 0;
+        thdr.depth = host2uint16_t_le(8 * sizeof(uint32_t));
+
         rc = gfx_bitmap_get_alloc(font->bitmap, &alloc);
         if (rc != EOK)
@@ -598 +621 @@
                 return rc;
 
-        rc = riff_write_uint32(riffw, font->rect.p1.x);
-        if (rc != EOK)
-                return rc;
-
-        rc = riff_write_uint32(riffw, font->rect.p1.y);
-        if (rc != EOK)
-                return rc;
-
-        rc = riff_write_uint32(riffw, 8 * sizeof(uint32_t));
+        rc = riff_write(riffw, &thdr, sizeof(thdr));
         if (rc != EOK)
                 return rc;