Changeset dcc4cb31 in mainline for uspace/lib/gfx/src/bitmap.c

Timestamp:

2019-10-17T23:20:18Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e0545de

Parents:

78a71936

Message:

Refine bitmap ops and add tests

File:

• uspace/lib/gfx/src/bitmap.c (modified) (4 diffs)

uspace/lib/gfx/src/bitmap.c

@@ -55 +55 @@
     gfx_bitmap_alloc_t *alloc, gfx_bitmap_t **rbitmap)
 {
-        return gc->ops->bitmap_create(gc->arg, params, alloc, rbitmap);
+        void *bm_priv;
+        gfx_bitmap_t *bitmap;
+        errno_t rc;
+
+        bitmap = calloc(1, sizeof(gfx_bitmap_t));
+        if (bitmap == NULL)
+                return ENOMEM;
+
+        rc = gc->ops->bitmap_create(gc->arg, params, alloc, &bm_priv);
+        if (rc != EOK)
+                return rc;
+
+        bitmap->gc = gc;
+        bitmap->gc_priv = bm_priv;
+        *rbitmap = bitmap;
+        return EOK;
 }
 
-/** Delete bitmap from graphics context.
+/** Destroy bitmap from graphics context.
  *
  * @param bitmap Bitmap
@@ -64 +79 @@
  * @return EOK on success, EIO if grahic device connection was lost
  */
-errno_t gfx_bitmap_delete(gfx_bitmap_t *bitmap)
+errno_t gfx_bitmap_destroy(gfx_bitmap_t *bitmap)
 {
-        return bitmap->gc->ops->bitmap_delete(bitmap->gc->arg, bitmap);
+        errno_t rc;
+
+        rc = bitmap->gc->ops->bitmap_destroy(bitmap->gc_priv);
+        if (rc != EOK)
+                return rc;
+
+        free(bitmap);
+        return EOK;
 }
 
@@ -80 +102 @@
     gfx_coord2_t *offs)
 {
-        return bitmap->gc->ops->bitmap_render(bitmap->gc->arg, bitmap,
-            srect, offs);
+        return bitmap->gc->ops->bitmap_render(bitmap->gc_priv, srect, offs);
 }
 
@@ -93 +114 @@
 errno_t gfx_bitmap_get_alloc(gfx_bitmap_t *bitmap, gfx_bitmap_alloc_t *alloc)
 {
-        return bitmap->gc->ops->bitmap_get_alloc(bitmap->gc->arg, bitmap,
-            alloc);
+        return bitmap->gc->ops->bitmap_get_alloc(bitmap->gc_priv, alloc);
 }