diff options
| author | Tectu <joel@unormal.org> | 2013-03-20 14:35:41 -0700 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2013-03-20 14:35:41 -0700 |
| commit | a309a1d19f4e16d1c646b9750a7c9d754ddcf1e8 (patch) | |
| tree | 813106ad3024e4dcba05dc1ceabfc86581ce70cc | |
| parent | 5aed05bbcfc5762d18f41bd29c972d8ae3ae7a5a (diff) | |
| parent | 15d76cb5fc61de83f5ff2e2d86911d18c6735507 (diff) | |
| download | uGFX-a309a1d19f4e16d1c646b9750a7c9d754ddcf1e8.tar.gz uGFX-a309a1d19f4e16d1c646b9750a7c9d754ddcf1e8.tar.bz2 uGFX-a309a1d19f4e16d1c646b9750a7c9d754ddcf1e8.zip | |
Merge pull request #45 from resset/master
SSD1289 SSD2119: fixed warning messages
| -rw-r--r-- | drivers/gdisp/SSD1289/gdisp_lld.c | 8 | ||||
| -rw-r--r-- | drivers/gdisp/SSD2119/gdisp_lld.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c index e2dd79e0..f6531f2c 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld.c +++ b/drivers/gdisp/SSD1289/gdisp_lld.c @@ -429,7 +429,7 @@ void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) { abslines = lines < 0 ? -lines : lines; acquire_bus(); - if (abslines >= cy) { + if ((coord_t)abslines >= cy) { abslines = cy; gap = 0; } else { @@ -447,20 +447,20 @@ void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) { set_viewport(x, row0, cx, 1); stream_start(); j = read_data(); // dummy read - for (j = 0; j < cx; j++) + for (j = 0; (coord_t)j < cx; j++) buf[j] = read_data(); stream_stop(); set_viewport(x, row1, cx, 1); stream_start(); - for (j = 0; j < cx; j++) + for (j = 0; (coord_t)j < cx; j++) write_data(buf[j]); stream_stop(); } } /* fill the remaining gap */ - set_viewport(x, lines > 0 ? (y+gap) : y, cx, abslines); + set_viewport(x, lines > 0 ? (y+(coord_t)gap) : y, cx, abslines); stream_start(); gap = cx*abslines; for(i = 0; i < gap; i++) write_data(bgcolor); diff --git a/drivers/gdisp/SSD2119/gdisp_lld.c b/drivers/gdisp/SSD2119/gdisp_lld.c index b8884e0f..a7ad7b1a 100644 --- a/drivers/gdisp/SSD2119/gdisp_lld.c +++ b/drivers/gdisp/SSD2119/gdisp_lld.c @@ -472,7 +472,7 @@ void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) { abslines = lines < 0 ? -lines : lines; acquire_bus(); - if (abslines >= cy) { + if ((coord_t)abslines >= cy) { abslines = cy; gap = 0; } else { @@ -490,20 +490,20 @@ void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) { set_viewport(x, row0, cx, 1); stream_start(); j = read_data(); // dummy read - for (j = 0; j < cx; j++) + for (j = 0; (coord_t)j < cx; j++) buf[j] = read_data(); stream_stop(); set_viewport(x, row1, cx, 1); stream_start(); - for (j = 0; j < cx; j++) + for (j = 0; (coord_t)j < cx; j++) write_data(buf[j]); stream_stop(); } } /* fill the remaining gap */ - set_viewport(x, lines > 0 ? (y+gap) : y, cx, abslines); + set_viewport(x, lines > 0 ? (y+(coord_t)gap) : y, cx, abslines); stream_start(); gap = cx*abslines; for(i = 0; i < gap; i++) write_data(bgcolor); |