Changes in uspace/lib/congfx/src/console.c [0d62c10:afcf704] in mainline

File:

• uspace/lib/congfx/src/console.c (modified) (4 diffs)

uspace/lib/congfx/src/console.c

@@ -207 +207 @@
 
         /* Check that we support all requested flags */
-        if ((params->flags & ~(bmpf_color_key | bmpf_colorize)) != 0)
+        if ((params->flags & ~bmpf_color_key) != 0)
                 return ENOTSUP;
 
@@ -296 +296 @@
 
         if ((cbm->flags & bmpf_color_key) == 0) {
-                /* Simple copy */
                 for (y = crect.p0.y; y < crect.p1.y; y++) {
                         console_set_pos(cbm->cgc->con, crect.p0.x, y);
@@ -313 +312 @@
                         }
                 }
-        } else if ((cbm->flags & bmpf_colorize) == 0) {
-                /* Color key */
+        } else {
                 for (y = crect.p0.y; y < crect.p1.y; y++) {
                         for (x = crect.p0.x; x < crect.p1.x; x++) {
@@ -334 +332 @@
                         }
                 }
-        } else {
-                /* Color key & colorize */
-                console_set_rgb_color(cbm->cgc->con, cbm->cgc->clr,
-                    cbm->cgc->clr);
-
-                for (y = crect.p0.y; y < crect.p1.y; y++) {
-                        for (x = crect.p0.x; x < crect.p1.x; x++) {
-
-                                clr = pixelmap_get_pixel(&pixelmap,
-                                    x - offs.x - cbm->rect.p0.x,
-                                    y - offs.y - cbm->rect.p0.y);
-
-                                if (clr != cbm->key_color) {
-                                        console_set_pos(cbm->cgc->con, x, y);
-                                        rv = fputc('X', cbm->cgc->fout);
-                                        if (rv < 0)
-                                                return EIO;
-
-                                        console_flush(cbm->cgc->con);
-                                }
-
-                        }
-                }
         }