Changeset 7e38970d in mainline for uspace/lib/gfx/include

Timestamp:

2020-12-07T00:08:37Z (5 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

Location:

uspace/lib/gfx/include

Files:

• gfx/coord.h (modified) (2 diffs)
• types/gfx/bitmap.h (modified) (1 diff)

uspace/lib/gfx/include/gfx/coord.h

@@ -40 +40 @@
 #include <types/gfx/coord.h>
 
+extern gfx_coord_t gfx_coord_div_rneg(gfx_coord_t, gfx_coord_t);
 extern void gfx_coord2_add(gfx_coord2_t *, gfx_coord2_t *, gfx_coord2_t *);
 extern void gfx_coord2_subtract(gfx_coord2_t *, gfx_coord2_t *, gfx_coord2_t *);
@@ -51 +52 @@
 extern void gfx_rect_envelope(gfx_rect_t *, gfx_rect_t *, gfx_rect_t *);
 extern void gfx_rect_clip(gfx_rect_t *, gfx_rect_t *, gfx_rect_t *);
+extern void gfx_rect_ctr_on_rect(gfx_rect_t *, gfx_rect_t *, gfx_rect_t *);
 extern void gfx_rect_points_sort(gfx_rect_t *, gfx_rect_t *);
 extern void gfx_rect_dims(gfx_rect_t *, gfx_coord2_t *);

uspace/lib/gfx/include/types/gfx/bitmap.h

@@ -47 +47 @@
 /** Bitmap flags */
 typedef enum {
+        /** Directly map GC output into this bitmap */
+        bmpf_direct_output = 0x1,
         /** Enable color key */
-        bmpf_color_key = 0x1,
-        /** Directly map GC output into this bitmap */
-        bmpf_direct_output = 0x2
+        bmpf_color_key = 0x2,
+        /** Paint non-background pixels with current drawing color */
+        bmpf_colorize = 0x4
 } gfx_bitmap_flags_t;