Changeset d2100e2 in mainline for uspace/lib/gfxfont/src/glyph_bmp.c

Timestamp:

2020-08-09T18:40:28Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

06b8383

Parents:

5592c56

Message:

Finish glyph bitmap operations and tests

Setting/getting pixel, opening/saving glyph bitmap.

File:

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

uspace/lib/gfxfont/src/glyph_bmp.c

@@ -35 +35 @@
 
 #include <errno.h>
+#include <gfx/bitmap.h>
 #include <gfx/coord.h>
+#include <gfx/font.h>
 #include <gfx/glyph_bmp.h>
+#include <io/pixelmap.h>
 #include <stdlib.h>
+#include "../private/font.h"
+#include "../private/glyph.h"
 #include "../private/glyph_bmp.h"
 
@@ -50 +55 @@
 errno_t gfx_glyph_bmp_open(gfx_glyph_t *glyph, gfx_glyph_bmp_t **rbmp)
 {
+        gfx_font_t *font = glyph->font;
         gfx_glyph_bmp_t *bmp;
+        pixelmap_t pmap;
+        gfx_bitmap_alloc_t alloc;
+        gfx_coord_t x, y;
+        pixel_t pixel;
+        errno_t rc;
 
         bmp = calloc(1, sizeof(gfx_glyph_bmp_t));
@@ -58 +69 @@
         bmp->rect.p0.x = 0;
         bmp->rect.p0.y = 0;
-        bmp->rect.p1.x = 0;
-        bmp->rect.p1.y = 0;
-        bmp->pixels = NULL;
+        bmp->rect.p1.x = glyph->rect.p1.x - glyph->rect.p0.x;
+        bmp->rect.p1.y = glyph->rect.p1.y - glyph->rect.p0.y;
+
+        bmp->pixels = calloc(bmp->rect.p1.x * bmp->rect.p1.y, sizeof(int));
+        if (bmp->pixels == NULL) {
+                free(bmp);
+                return ENOMEM;
+        }
+
+        rc = gfx_bitmap_get_alloc(font->bitmap, &alloc);
+        if (rc != EOK) {
+                free(bmp->pixels);
+                free(bmp);
+                return rc;
+        }
+
+        assert(font->rect.p0.x == 0);
+        assert(font->rect.p0.y == 0);
+        pmap.width = font->rect.p1.x;
+        pmap.height = font->rect.p1.y;
+        pmap.data = alloc.pixels;
+
+        /* Copy pixels from font bitmap */
+
+        for (y = 0; y < bmp->rect.p1.y; y++) {
+                for (x = 0; x < bmp->rect.p1.x; x++) {
+                        pixel = pixelmap_get_pixel(&pmap, glyph->rect.p0.x + x,
+                            glyph->rect.p0.y + y);
+                        bmp->pixels[y * bmp->rect.p1.x + x] =
+                            (pixel != 0) ? 1 : 0;
+                }
+        }
 
         bmp->glyph = glyph;
@@ -74 +114 @@
 errno_t gfx_glyph_bmp_save(gfx_glyph_bmp_t *bmp)
 {
+        gfx_glyph_t *glyph = bmp->glyph;
+        gfx_font_t *font = glyph->font;
+        gfx_coord_t x, y;
+        pixel_t pixel;
+        pixelmap_t pmap;
+        gfx_bitmap_alloc_t alloc;
+        errno_t rc;
+
+        /*
+         * Replace glyph with empty space in the font bitmap, the width
+         * of the empty equal to new glyph bitmap width. The glyph width
+         * is adjusted.
+         */
+        rc = gfx_font_splice_at_glyph(font, glyph,
+            bmp->rect.p1.x - bmp->rect.p0.x, bmp->rect.p1.y - bmp->rect.p0.y);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_bitmap_get_alloc(font->bitmap, &alloc);
+        if (rc != EOK)
+                return rc;
+
+        assert(font->rect.p0.x == 0);
+        assert(font->rect.p0.y == 0);
+        pmap.width = font->rect.p1.x;
+        pmap.height = font->rect.p1.y;
+        pmap.data = alloc.pixels;
+
+        /* Copy pixels to font bitmap */
+
+        for (y = 0; y < bmp->rect.p1.y; y++) {
+                for (x = 0; x < bmp->rect.p1.x; x++) {
+                        pixel = bmp->pixels[y * bmp->rect.p1.x + x] ?
+                            PIXEL(255, 255, 255, 255) : PIXEL(0, 0, 0, 0);
+                        pixelmap_put_pixel(&pmap, glyph->rect.p0.x + x,
+                            glyph->rect.p0.y + y, pixel);
+                }
+        }
+
         return EOK;
 }