Changeset a3f63ac in mainline for uspace/lib/guigfx/src/canvas.c

Timestamp:

2019-09-24T11:13:18Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

aac5069

Parents:

00e8290

git-author:

Jiri Svoboda <jiri@…> (2019-08-23 17:43:11)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-24 11:13:18)

Message:

Move canvas GC and console GC out of libgfx

We need libgfx not to have any dependencies, it's just a protocol/API

File:

• uspace/lib/guigfx/src/canvas.c (moved) (moved from uspace/lib/gfx/src/backend/canvas.c ) (3 diffs)

uspace/lib/guigfx/src/canvas.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libgfx
+/** @addtogroup libguigfx
  * @{
  */
@@ -37 +37 @@
  */
 
-#include <gfx/backend/canvas.h>
+#include <gfx/color.h>
 #include <gfx/context.h>
 #include <gfx/render.h>
+#include <guigfx/canvas.h>
 #include <io/pixel.h>
 #include <stdlib.h>
-#include "../../private/backend/canvas.h"
-#include "../../private/color.h"
+#include "../private/canvas.h"
+//#include "../../private/color.h"
 
 static errno_t canvas_gc_set_color(void *, gfx_color_t *);
@@ -65 +66 @@
 {
         canvas_gc_t *cgc = (canvas_gc_t *) arg;
+        uint16_t r, g, b;
 
-        cgc->color = PIXEL(0, color->r >> 8, color->g >> 8, color->b >> 8);
+        gfx_color_get_rgb_i16(color, &r, &g, &b);
+        cgc->color = PIXEL(0, r >> 8, g >> 8, b >> 8);
         return EOK;
 }