Changeset 1822545 in mainline

Timestamp:

2019-10-21T00:17:28Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7b882c1f

Parents:

d18f3b7

Message:

Add typedef for scalar coordinate

Because today I feel like adding it

Location:

uspace

Files:

• app/gfxdemo/gfxdemo.c (modified) (4 diffs)
• lib/congfx/src/console.c (modified) (3 diffs)
• lib/gfx/include/types/gfx/coord.h (modified) (1 diff)
• lib/guigfx/src/canvas.c (modified) (2 diffs)
• srv/hid/display/output.c (modified) (1 diff)

uspace/app/gfxdemo/gfxdemo.c

@@ -54 +54 @@
  * @param h Height
  */
-static errno_t demo_rects(gfx_context_t *gc, int w, int h)
+static errno_t demo_rects(gfx_context_t *gc, gfx_coord_t w, gfx_coord_t h)
 {
         gfx_color_t *color = NULL;
@@ -96 +96 @@
  * @param h Height
  */
-static errno_t demo_bitmap(gfx_context_t *gc, int w, int h)
+static errno_t demo_bitmap(gfx_context_t *gc, gfx_coord_t w, gfx_coord_t h)
 {
         gfx_bitmap_t *bitmap;
@@ -160 +160 @@
  * @param h Height
  */
-static errno_t demo_loop(gfx_context_t *gc, int w, int h)
+static errno_t demo_loop(gfx_context_t *gc, gfx_coord_t w, gfx_coord_t h)
 {
         errno_t rc;
@@ -215 +215 @@
         surface_t *surface = NULL;
         canvas_t *canvas = NULL;
-        int vw, vh;
+        gfx_coord_t vw, vh;
         errno_t rc;
 

uspace/lib/congfx/src/console.c

@@ -92 +92 @@
         console_gc_t *cgc = (console_gc_t *) arg;
         int rv;
-        int x, y;
+        gfx_coord_t x, y;
 
         // XXX We should handle p0.x > p1.x and p0.y > p1.y
@@ -191 +191 @@
         console_gc_t *cgc = (console_gc_t *) arg;
         console_gc_bitmap_t *cbm = NULL;
-        int w, h;
+        gfx_coord_t w, h;
         errno_t rc;
 
@@ -250 +250 @@
 {
         console_gc_bitmap_t *cbm = (console_gc_bitmap_t *)bm;
-        int x, y;
+        gfx_coord_t x, y;
         int rv;
         pixel_t clr;

uspace/lib/gfx/include/types/gfx/coord.h

@@ -40 +40 @@
 #include <stdint.h>
 
+typedef int gfx_coord_t;
+
 typedef struct {
-        int x;
-        int y;
+        gfx_coord_t x;
+        gfx_coord_t y;
 } gfx_coord2_t;
 

uspace/lib/guigfx/src/canvas.c

@@ -95 +95 @@
 {
         canvas_gc_t *cgc = (canvas_gc_t *) arg;
-        int x, y;
+        gfx_coord_t x, y;
 
         // XXX We should handle p0.x > p1.x and p0.y > p1.y
@@ -188 +188 @@
         canvas_gc_t *cgc = (canvas_gc_t *) arg;
         canvas_gc_bitmap_t *cbm = NULL;
-        int w, h;
+        gfx_coord_t w, h;
         errno_t rc;
 

uspace/srv/hid/display/output.c

@@ -49 +49 @@
         surface_t *surface = NULL;
         canvas_t *canvas = NULL;
-        int vw, vh;
+        gfx_coord_t vw, vh;
         errno_t rc;