Changeset 43ffecf in mainline

Timestamp:

2021-05-06T17:26:49Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1167ad34

Parents:

fe333f8e

Message:

Fix bitmap clipping in memory GC

File:

• uspace/lib/memgfx/src/memgc.c (modified) (6 diffs)

uspace/lib/memgfx/src/memgc.c

@@ -372 +372 @@
         gfx_rect_t srect;
         gfx_rect_t drect;
+        gfx_rect_t crect;
         gfx_coord2_t offs;
         gfx_coord_t x, y;
@@ -393 +394 @@
         gfx_rect_translate(&offs, &srect, &drect);
 
-        /* XXX Clip destination rectangle?! */
+        /* Clip destination rectangle */
+        gfx_rect_clip(&drect, &mbm->mgc->clip_rect, &crect);
 
         assert(mbm->alloc.pitch == (mbm->rect.p1.x - mbm->rect.p0.x) *
@@ -412 +414 @@
         } 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++) {
+                for (y = crect.p0.y; y < crect.p1.y; y++) {
+                        for (x = crect.p0.x; x < crect.p1.x; x++) {
                                 pixel = pixelmap_get_pixel(&smap,
                                     x - mbm->rect.p0.x - offs.x,
@@ -422 +424 @@
         } 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++) {
+                for (y = crect.p0.y; y < crect.p1.y; y++) {
+                        for (x = crect.p0.x; x < crect.p1.x; x++) {
                                 pixel = pixelmap_get_pixel(&smap,
                                     x - mbm->rect.p0.x - offs.x,
@@ -433 +435 @@
         } else {
                 /* Color key & colorization */
-                for (y = drect.p0.y; y < drect.p1.y; y++) {
-                        for (x = drect.p0.x; x < drect.p1.x; x++) {
+                for (y = crect.p0.y; y < crect.p1.y; y++) {
+                        for (x = crect.p0.x; x < crect.p1.x; x++) {
                                 pixel = pixelmap_get_pixel(&smap,
                                     x - mbm->rect.p0.x - offs.x,
@@ -445 +447 @@
         }
 
-        mem_gc_invalidate_rect(mbm->mgc, &drect);
+        mem_gc_invalidate_rect(mbm->mgc, &crect);
         return EOK;
 }