Changeset a8eed5f in mainline for uspace/lib/gfx

Timestamp:

2020-02-28T16:03:20Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7bb45e3

Parents:

0e6e77f

git-author:

Jiri Svoboda <jiri@…> (2020-02-27 18:02:55)

git-committer:

Jiri Svoboda <jiri@…> (2020-02-28 16:03:20)

Message:

Future-proof gfx_bitmap_params_t with initialization function

Location:

uspace/lib/gfx

Files:

• include/gfx/bitmap.h (modified) (1 diff)
• src/bitmap.c (modified) (1 diff)
• test/bitmap.c (modified) (3 diffs)
• test/coord.c (modified) (1 diff)

uspace/lib/gfx/include/gfx/bitmap.h

@@ -42 +42 @@
 #include <types/gfx/bitmap.h>
 
+extern void gfx_bitmap_params_init(gfx_bitmap_params_t *);
 extern errno_t gfx_bitmap_create(gfx_context_t *, gfx_bitmap_params_t *,
     gfx_bitmap_alloc_t *, gfx_bitmap_t **);

uspace/lib/gfx/src/bitmap.c

@@ -35 +35 @@
 
 #include <gfx/bitmap.h>
+#include <mem.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include "../private/bitmap.h"
 #include "../private/context.h"
+
+/** Initialize bitmap parameters structure.
+ *
+ * Bitmap parameters structure must always be initialized using this function
+ * first.
+ *
+ * @param params Bitmap parameters structure
+ */
+void gfx_bitmap_params_init(gfx_bitmap_params_t *params)
+{
+        memset(params, 0, sizeof(gfx_bitmap_params_t));
+}
 
 /** Allocate bitmap in a graphics context.

uspace/lib/gfx/test/bitmap.c

@@ -84 +84 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
+        gfx_bitmap_params_init(&params);
         params.rect.p0.x = 1;
         params.rect.p0.y = 2;
@@ -120 +121 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
+        gfx_bitmap_params_init(&params);
+
         rc = gfx_bitmap_create(gc, &params, NULL, &bitmap);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
@@ -159 +162 @@
         rc = gfx_context_new(&ops, &tgc, &gc);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gfx_bitmap_params_init(&params);
 
         rc = gfx_bitmap_create(gc, &params, NULL, &bitmap);

uspace/lib/gfx/test/coord.c

@@ -598 +598 @@
 
 /** Rectangle dimensions for reversed rectangle are computed correctly */
-PCUT_TEST(rect_dims_straight)
+PCUT_TEST(rect_dims_reversed)
 {
         gfx_rect_t rect;