Changeset 7e38970d in mainline for uspace/lib/c/include/io/pixelmap.h

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/c/include/io/pixelmap.h (modified) (2 diffs)

uspace/lib/c/include/io/pixelmap.h

@@ -42 +42 @@
 #include <stddef.h>
 #include <io/pixel.h>
-
-/* Defines how a pixel outside of pixmap rectangle shall be treated */
-typedef enum {
-        /* Pixels outside of a pixmap are PIXEL(0, 0, 0, 0) */
-        PIXELMAP_EXTEND_TRANSPARENT_BLACK = 0,
-
-        /* The pixmap is repeated infinetely */
-        PIXELMAP_EXTEND_TILE,
-
-        /* If outside of a pixmap, return closest pixel from the edge */
-        PIXELMAP_EXTEND_SIDES,
-
-        /*
-         * If outside of a pixmap, return closest pixel from the edge,
-         * with alpha = 0
-         */
-        PIXELMAP_EXTEND_TRANSPARENT_SIDES
-} pixelmap_extend_t;
 
 typedef struct {
@@ -106 +88 @@
 }
 
-static inline pixel_t pixelmap_get_extended_pixel(pixelmap_t *pixmap,
-    native_t x, native_t y, pixelmap_extend_t extend)
-{
-        bool transparent = false;
-        if (extend == PIXELMAP_EXTEND_TILE) {
-                x %= pixmap->width;
-                y %= pixmap->height;
-        } else if (extend == PIXELMAP_EXTEND_SIDES ||
-            extend == PIXELMAP_EXTEND_TRANSPARENT_SIDES) {
-                bool transparent_outside =
-                    (extend == PIXELMAP_EXTEND_TRANSPARENT_SIDES);
-                if (x < 0) {
-                        x = 0;
-                        transparent = transparent_outside;
-                } else if (((sysarg_t) x) >= pixmap->width) {
-                        x = pixmap->width - 1;
-                        transparent = transparent_outside;
-                }
-
-                if (y < 0) {
-                        y = 0;
-                        transparent = transparent_outside;
-                } else if (((sysarg_t) y) >= pixmap->height) {
-                        y = pixmap->height - 1;
-                        transparent = transparent_outside;
-                }
-        }
-
-        if (x < 0 || ((sysarg_t) x) >= pixmap->width ||
-            y < 0 || ((sysarg_t) y) >= pixmap->height)
-                return PIXEL(0, 0, 0, 0);
-
-        pixel_t pixel = pixelmap_get_pixel(pixmap, x, y);
-
-        if (transparent)
-                pixel = PIXEL(0, RED(pixel), GREEN(pixel), BLUE(pixel));
-
-        return pixel;
-}
-
 #endif