Changeset 7358f5b in mainline

Timestamp:

2020-09-30T19:13:31Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

38a4b6d

Parents:

57d923e1

Message:

gfx_glyph_transfer is copying too much

We were using the entire destination bitmap rectangle as destination
instead of just the glyph rectangle.

File:

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

uspace/lib/gfxfont/src/glyph.c

@@ -274 +274 @@
  * @param glyph Glyph
  * @param offs Offset in new font bitmap
- * @param dest New font bitmap
- * @param drect Bounding rectangle for @a dest
+ * @param dbmp New font bitmap
+ * @param dbrect Bounding rectangle for @a dbmp
  *
  * @return EOK on success or an error code
  */
 errno_t gfx_glyph_transfer(gfx_glyph_t *glyph, gfx_coord_t offs,
-    gfx_bitmap_t *dest, gfx_rect_t *drect)
+    gfx_bitmap_t *dbmp, gfx_rect_t *dbrect)
 {
         pixelmap_t smap;
@@ -286 +286 @@
         gfx_bitmap_alloc_t salloc;
         gfx_bitmap_alloc_t dalloc;
+        gfx_rect_t drect;
         gfx_coord_t x, y;
+        gfx_coord2_t off2;
         pixel_t pixel;
         errno_t rc;
@@ -294 +296 @@
                 return rc;
 
-        rc = gfx_bitmap_get_alloc(dest, &dalloc);
+        rc = gfx_bitmap_get_alloc(dbmp, &dalloc);
         if (rc != EOK)
                 return rc;
@@ -302 +304 @@
         smap.data = salloc.pixels;
 
-        dmap.width = drect->p1.x;
-        dmap.height = drect->p1.y;
+        dmap.width = dbrect->p1.x;
+        dmap.height = dbrect->p1.y;
         dmap.data = dalloc.pixels;
 
-        for (y = drect->p0.y; y < drect->p1.y; y++) {
-                for (x = drect->p0.x; x < drect->p1.x; x++) {
+        /* Compute destination rectangle */
+        off2.x = offs;
+        off2.y = 0;
+        gfx_rect_translate(&off2, &glyph->rect, &drect);
+        assert(gfx_rect_is_inside(&drect, dbrect));
+
+        for (y = drect.p0.y; y < drect.p1.y; y++) {
+                for (x = drect.p0.x; x < drect.p1.x; x++) {
                         pixel = pixelmap_get_pixel(&smap, x, y);
                         pixelmap_put_pixel(&dmap, x + offs, y, pixel);