Changeset 453f203b in mainline for uspace/lib/gfxfont/src/glyph.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/glyph.c (modified) (8 diffs)

uspace/lib/gfxfont/src/glyph.c

@@ -35 +35 @@
 
 #include <assert.h>
+#include <byteorder.h>
 #include <errno.h>
 #include <gfx/bitmap.h>
@@ -326 +327 @@
         errno_t rc;
         riff_rchunk_t mtrck;
+        tpf_glyph_metrics_t tmetrics;
         size_t nread;
 
@@ -332 +334 @@
                 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;
 
@@ -340 +342 @@
                 return rc;
 
+        metrics->advance = uint16_t_le2host(tmetrics.advance);
         return EOK;
 }
@@ -353 +356 @@
 {
         errno_t rc;
+        tpf_glyph_metrics_t tmetrics;
         riff_wchunk_t mtrck;
 
+        tmetrics.advance = host2uint16_t_le(metrics->advance);
+
         rc = riff_wchunk_start(riffw, CKID_gmtr, &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;
@@ -466 +472 @@
 {
         errno_t rc;
+        tpf_glyph_ror_t tror;
         riff_rchunk_t rorck;
         size_t nread;
@@ -473 +480 @@
                 return rc;
 
-        rc = riff_read(&rorck, (void *) &glyph->rect, sizeof(glyph->rect),
+        rc = riff_read(&rorck, (void *) &tror, sizeof(tror),
             &nread);
-        if (rc != EOK || nread != sizeof(glyph->rect))
+        if (rc != EOK || nread != sizeof(tror))
                 return EIO;
 
-        rc = riff_read(&rorck, (void *) &glyph->origin, sizeof(glyph->origin),
-            &nread);
-        if (rc != EOK || nread != sizeof(glyph->origin))
-                return EIO;
-
         rc = riff_rchunk_end(&rorck);
         if (rc != EOK)
                 return rc;
 
+        glyph->rect.p0.x = uint32_t_le2host(tror.p0x);
+        glyph->rect.p0.y = uint32_t_le2host(tror.p0y);
+        glyph->rect.p1.x = uint32_t_le2host(tror.p1x);
+        glyph->rect.p1.y = uint32_t_le2host(tror.p1y);
+        glyph->origin.x = uint32_t_le2host(tror.orig_x);
+        glyph->origin.y = uint32_t_le2host(tror.orig_y);
         return EOK;
 }
@@ -500 +508 @@
 {
         errno_t rc;
+        tpf_glyph_ror_t tror;
         riff_wchunk_t rorck;
 
+        tror.p0x = host2uint32_t_le(glyph->rect.p0.x);
+        tror.p0y = host2uint32_t_le(glyph->rect.p0.y);
+        tror.p1x = host2uint32_t_le(glyph->rect.p1.x);
+        tror.p1y = host2uint32_t_le(glyph->rect.p1.y);
+        tror.orig_x = host2uint32_t_le(glyph->origin.x);
+        tror.orig_y = host2uint32_t_le(glyph->origin.y);
+
         rc = riff_wchunk_start(riffw, CKID_gror, &rorck);
         if (rc != EOK)
                 return rc;
 
-        rc = riff_write(riffw, (void *) &glyph->rect, sizeof(glyph->rect));
-        if (rc != EOK)
-                return rc;
-
-        rc = riff_write(riffw, (void *) &glyph->origin, sizeof(glyph->origin));
+        rc = riff_write(riffw, (void *) &tror, sizeof(tror));
         if (rc != EOK)
                 return rc;