Changeset ba733e83 in mainline

Timestamp:

2012-11-23T10:08:02Z (11 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

563573b

Parents:

7dba813

Message:

Improved safety of the optimized pixel transfers.

Location:

uspace/lib

Files:

• c/include/io/pixelmap.h (modified) (1 diff)
• draw/surface.c (modified) (1 diff)
• gui/terminal.c (modified) (1 diff)

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

@@ -52 +52 @@
     sysarg_t y)
 {
-        size_t offset = y * pixelmap->width + x;
-        pixel_t *pixel = pixelmap->data + offset;
-        return pixel;
+        if (x < pixelmap->width && y < pixelmap->height) {
+                size_t offset = y * pixelmap->width + x;
+                pixel_t *pixel = pixelmap->data + offset;
+                return pixel;
+        } else {
+                return NULL;
+        }
 }
 

uspace/lib/draw/surface.c

@@ -171 +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);
 }
 

uspace/lib/gui/terminal.c

@@ -199 +199 @@
                 pixel_t *dst = pixelmap_pixel_at(
                     surface_pixmap_access(surface), bx, by + y);
+                pixel_t *dst_max = pixelmap_pixel_at(
+                    surface_pixmap_access(surface), bx + FONT_WIDTH - 1, by + y);
+                if (!dst || !dst_max) continue;
                 int count = FONT_WIDTH;
                 while (count-- != 0) {