Changeset 850235d in mainline for uspace/lib/draw/surface.c

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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 mainline changes

File:

• uspace/lib/draw/surface.c (modified) (2 diffs)

uspace/lib/draw/surface.c

@@ -143 +143 @@
 }
 
+void surface_add_damaged_region(surface_t *surface, surface_coord_t x, surface_coord_t y,
+    surface_coord_t width, surface_coord_t height)
+{
+        surface->dirty_x_lo = surface->dirty_x_lo > x ? x : surface->dirty_x_lo;
+        surface->dirty_y_lo = surface->dirty_y_lo > y ? y : surface->dirty_y_lo;
+
+        surface_coord_t x_hi = x + width - 1;
+        surface_coord_t y_hi = y + height - 1;
+
+        surface->dirty_x_hi = surface->dirty_x_hi < x_hi ? x_hi : surface->dirty_x_hi;
+        surface->dirty_y_hi = surface->dirty_y_hi < y_hi ? y_hi : surface->dirty_y_hi;
+}
+
 void surface_reset_damaged_region(surface_t *surface)
 {
@@ -158 +171 @@
         surface->dirty_y_hi = surface->dirty_y_hi < y ? y : surface->dirty_y_hi;
 
-        if (x < surface->pixmap.width && y < surface->pixmap.height) {
-                pixelmap_put_pixel(&surface->pixmap, x, y, pixel);
-        }
+        pixelmap_put_pixel(&surface->pixmap, x, y, pixel);
 }
 
 pixel_t surface_get_pixel(surface_t *surface, surface_coord_t x, surface_coord_t y)
 {
-        if (x < surface->pixmap.width && y < surface->pixmap.height) {
-                return pixelmap_get_pixel(&surface->pixmap, x, y);
-        } else {
-                return 0;
-        }
+        return pixelmap_get_pixel(&surface->pixmap, x, y);
 }