Changeset 313ac8e in mainline for uspace/lib/gfxfont/test

Timestamp:

2020-09-17T15:28:03Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7bef2d8

Parents:

414020d9

Message:

Make negative quadrants actually work

Location:

uspace/lib/gfxfont/test

Files:

• font.c (modified) (2 diffs)
• glyph_bmp.c (modified) (1 diff)

uspace/lib/gfxfont/test/font.c

@@ -332 +332 @@
         gfx_glyph_t *glyph;
         gfx_context_t *gc;
+        gfx_rect_t nrect;
         test_gc_t tgc;
         errno_t rc;
@@ -350 +351 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = gfx_font_splice_at_glyph(font, glyph, 10, 10);
+        nrect.p0.x = -5;
+        nrect.p0.y = -5;
+        nrect.p1.x = 5;
+        nrect.p1.y = 5;
+        rc = gfx_font_splice_at_glyph(font, glyph, &nrect);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 

uspace/lib/gfxfont/test/glyph_bmp.c

@@ -185 +185 @@
         PCUT_ASSERT_INT_EQUALS(0, pix);
 
-        gfx_glyph_bmp_close(bmp);
+        /* ... */
+
+        rc = gfx_glyph_bmp_setpix(bmp, 1, -1, 1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_glyph_bmp_save(bmp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gfx_glyph_bmp_close(bmp);
+
+        /* Once again */
+
+        rc = gfx_glyph_bmp_open(glyph, &bmp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(bmp);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 0, 0);
+        PCUT_ASSERT_INT_EQUALS(1, pix);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 1, 1);
+        PCUT_ASSERT_INT_EQUALS(1, pix);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 1, 0);
+        PCUT_ASSERT_INT_EQUALS(0, pix);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 0, 1);
+        PCUT_ASSERT_INT_EQUALS(0, pix);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 1, -1);
+        PCUT_ASSERT_INT_EQUALS(1, pix);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 0, -1);
+        PCUT_ASSERT_INT_EQUALS(0, pix);
+
         gfx_glyph_destroy(glyph);