Changeset 7e38970d in mainline for uspace/drv/fb/kfb/port.c

Timestamp:

2020-12-07T00:08:37Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jxsvoboda-gfx' into master

File:

• uspace/drv/fb/kfb/port.c (modified) (4 diffs)

uspace/drv/fb/kfb/port.c

@@ -50 +50 @@
 #include <gfx/color.h>
 #include <gfx/coord.h>
-#include <io/mode.h>
 #include <io/pixelmap.h>
 #include <ipcgfx/server.h>
@@ -200 +199 @@
 
         /* Check that we support all required flags */
-        if ((params->flags & ~bmpf_color_key) != 0)
+        if ((params->flags & ~(bmpf_color_key | bmpf_colorize)) != 0)
                 return ENOTSUP;
 
@@ -307 +306 @@
 
         if ((kfbbm->flags & bmpf_color_key) != 0) {
+                /* Simple copy */
                 for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
                         for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {
@@ -319 +319 @@
                         }
                 }
+        } else if ((kfbbm->flags & bmpf_colorize) != 0) {
+                /* Color key */
+                for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
+                        for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {
+                                gfx_coord2_subtract(&pos, &kfbbm->rect.p0, &sp);
+                                gfx_coord2_add(&pos, &offs, &dp);
+
+                                color = pixelmap_get_pixel(&pbm, sp.x, sp.y);
+                                kfb->pixel2visual(kfb->addr +
+                                    FB_POS(kfb, dp.x, dp.y), color);
+                        }
+                }
         } else {
+                /* Color key & colorize */
                 for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
                         for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {