Changeset 6560960 in mainline for uspace/lib/draw/surface.c

Timestamp:

2012-08-20T22:46:13Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

077dad2

Parents:

971f50e7 (diff), dd13349 (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) (5 diffs)

uspace/lib/draw/surface.c

@@ -44 +44 @@
         surface_flags_t flags;
 
-        sysarg_t dirty_x_lo;
-        sysarg_t dirty_x_hi;
-        sysarg_t dirty_y_lo;
-        sysarg_t dirty_y_hi;
+        surface_coord_t dirty_x_lo;
+        surface_coord_t dirty_x_hi;
+        surface_coord_t dirty_y_lo;
+        surface_coord_t dirty_y_hi;
 
         pixelmap_t pixmap;
 };
 
-surface_t *surface_create(
-    sysarg_t width, sysarg_t height, pixel_t *pixbuf, surface_flags_t flags)
+surface_t *surface_create(surface_coord_t width, surface_coord_t height,
+    pixel_t *pixbuf, surface_flags_t flags)
 {
         surface_t *surface = (surface_t *) malloc(sizeof(surface_t));
@@ -118 +118 @@
 }
 
-void surface_get_resolution(surface_t *surface, sysarg_t *width, sysarg_t *height)
+void surface_get_resolution(surface_t *surface, surface_coord_t *width, surface_coord_t *height)
 {
         assert(width);
@@ -127 +127 @@
 }
 
-void surface_get_damaged_region(surface_t *surface, sysarg_t *x, sysarg_t *y,
-    sysarg_t *width, sysarg_t *height)
+void surface_get_damaged_region(surface_t *surface, surface_coord_t *x, surface_coord_t *y,
+    surface_coord_t *width, surface_coord_t *height)
 {
         assert(x);
@@ -151 +151 @@
 }
 
-void surface_put_pixel(surface_t *surface, sysarg_t x, sysarg_t y, pixel_t pixel)
+void surface_put_pixel(surface_t *surface, surface_coord_t x, surface_coord_t y, pixel_t pixel)
 {
         surface->dirty_x_lo = surface->dirty_x_lo > x ? x : surface->dirty_x_lo;
@@ -163 +163 @@
 }
 
-pixel_t surface_get_pixel(surface_t *surface, sysarg_t x, sysarg_t y)
+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) {