Changeset dd65f4f7 in mainline for uspace/lib/gfxfont/test/glyph_bmp.c

Timestamp:

2020-09-27T09:26:41Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8cdaf1b

Parents:

efca2e4

Message:

Only save minimum used rectangle of glyph bitmap

When the image becomes smaller (clearing pixels), we don't want to keep
saving zero pixels.

File:

• uspace/lib/gfxfont/test/glyph_bmp.c (modified) (2 diffs)

uspace/lib/gfxfont/test/glyph_bmp.c

@@ -33 +33 @@
 #include <gfx/typeface.h>
 #include <pcut/pcut.h>
+#include "../private/glyph_bmp.h"
 
 PCUT_INIT;
@@ -477 +478 @@
         pix = gfx_glyph_bmp_getpix(bmp, 1, 1);
         PCUT_ASSERT_INT_EQUALS(0, pix);
+
+        gfx_glyph_bmp_close(bmp);
+
+        gfx_glyph_destroy(glyph);
+
+        gfx_font_close(font);
+        gfx_typeface_destroy(tface);
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Test glyph_bmp_find_used_rect() find minimum used rectangle */
+PCUT_TEST(find_used_rect)
+{
+        gfx_font_props_t fprops;
+        gfx_font_metrics_t fmetrics;
+        gfx_typeface_t *tface;
+        gfx_font_t *font;
+        gfx_glyph_metrics_t gmetrics;
+        gfx_glyph_t *glyph;
+        gfx_context_t *gc;
+        gfx_glyph_bmp_t *bmp;
+        gfx_rect_t rect;
+        test_gc_t tgc;
+        errno_t rc;
+
+        rc = gfx_context_new(&test_ops, (void *) &tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_typeface_create(gc, &tface);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gfx_font_props_init(&fprops);
+        gfx_font_metrics_init(&fmetrics);
+        rc = gfx_font_create(tface, &fprops, &fmetrics, &font);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gfx_glyph_metrics_init(&gmetrics);
+        gmetrics.advance = 1;
+
+        rc = gfx_glyph_create(font, &gmetrics, &glyph);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        bmp = NULL;
+
+        rc = gfx_glyph_bmp_open(glyph, &bmp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(bmp);
+
+        /* Check used rectangle */
+
+        gfx_glyph_bmp_find_used_rect(bmp, &rect);
+        PCUT_ASSERT_INT_EQUALS(0, rect.p0.x);
+        PCUT_ASSERT_INT_EQUALS(0, rect.p0.y);
+        PCUT_ASSERT_INT_EQUALS(0, rect.p1.x);
+        PCUT_ASSERT_INT_EQUALS(0, rect.p1.y);
+
+        /* Set some pixels */
+
+        rc = gfx_glyph_bmp_setpix(bmp, -4, -5, 1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_glyph_bmp_setpix(bmp, -2, -1, 1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_glyph_bmp_setpix(bmp, 3, 4, 1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_glyph_bmp_setpix(bmp, 7, 6, 1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        /* Check used rectangle */
+
+        gfx_glyph_bmp_find_used_rect(bmp, &rect);
+        PCUT_ASSERT_INT_EQUALS(-4, rect.p0.x);
+        PCUT_ASSERT_INT_EQUALS(-5, rect.p0.y);
+        PCUT_ASSERT_INT_EQUALS(8, rect.p1.x);
+        PCUT_ASSERT_INT_EQUALS(7, rect.p1.y);
+
+        /* Clear the corner pixels */
+
+        rc = gfx_glyph_bmp_setpix(bmp, -4, -5, 0);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_glyph_bmp_setpix(bmp, 7, 6, 0);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        /* Check used rectangle got smaller */
+
+        gfx_glyph_bmp_find_used_rect(bmp, &rect);
+        PCUT_ASSERT_INT_EQUALS(-2, rect.p0.x);
+        PCUT_ASSERT_INT_EQUALS(-1, rect.p0.y);
+        PCUT_ASSERT_INT_EQUALS(4, rect.p1.x);
+        PCUT_ASSERT_INT_EQUALS(5, rect.p1.y);
 
         gfx_glyph_bmp_close(bmp);