Changeset 7e38970d in mainline for uspace/lib/memgfx/src/memgc.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/lib/memgfx/src/memgc.c (modified) (4 diffs)

uspace/lib/memgfx/src/memgc.c

@@ -225 +225 @@
 
         /* Check that we support all requested flags */
-        if ((params->flags & ~(bmpf_color_key | bmpf_direct_output)) != 0)
+        if ((params->flags & ~(bmpf_color_key | bmpf_colorize |
+            bmpf_direct_output)) != 0)
                 return ENOTSUP;
 
@@ -367 +368 @@
                 /* Nothing to do */
         } else if ((mbm->flags & bmpf_color_key) == 0) {
+                /* Simple copy */
                 for (y = drect.p0.y; y < drect.p1.y; y++) {
                         for (x = drect.p0.x; x < drect.p1.x; x++) {
@@ -375 +377 @@
                         }
                 }
-        } else {
+        } else if ((mbm->flags & bmpf_colorize) == 0) {
+                /* Color key */
                 for (y = drect.p0.y; y < drect.p1.y; y++) {
                         for (x = drect.p0.x; x < drect.p1.x; x++) {
@@ -385 +388 @@
                         }
                 }
+        } else {
+                /* Color key & colorization */
+                for (y = drect.p0.y; y < drect.p1.y; y++) {
+                        for (x = drect.p0.x; x < drect.p1.x; x++) {
+                                pixel = pixelmap_get_pixel(&smap,
+                                    x - mbm->rect.p0.x - offs.x,
+                                    y - mbm->rect.p0.y - offs.y);
+                                if (pixel != mbm->key_color)
+                                        pixelmap_put_pixel(&dmap, x, y,
+                                            mbm->mgc->color);
+                        }
+                }
         }