Changeset 25eec4e in mainline for uspace/lib/c/include/io/pixelmap.h

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• uspace/lib/c/include/io/pixelmap.h (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;
+        }
 }