Merge pull request #45 from resset/master

SSD1289 SSD2119: fixed warning messages
ugfx_release_2.6
Tectu 2013-03-20 14:35:41 -07:00
commit a309a1d19f
2 changed files with 8 additions and 8 deletions

View File

@ -429,7 +429,7 @@ void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) {
abslines = lines < 0 ? -lines : lines; abslines = lines < 0 ? -lines : lines;
acquire_bus(); acquire_bus();
if (abslines >= cy) { if ((coord_t)abslines >= cy) {
abslines = cy; abslines = cy;
gap = 0; gap = 0;
} else { } 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); set_viewport(x, row0, cx, 1);
stream_start(); stream_start();
j = read_data(); // dummy read j = read_data(); // dummy read
for (j = 0; j < cx; j++) for (j = 0; (coord_t)j < cx; j++)
buf[j] = read_data(); buf[j] = read_data();
stream_stop(); stream_stop();
set_viewport(x, row1, cx, 1); set_viewport(x, row1, cx, 1);
stream_start(); stream_start();
for (j = 0; j < cx; j++) for (j = 0; (coord_t)j < cx; j++)
write_data(buf[j]); write_data(buf[j]);
stream_stop(); stream_stop();
} }
} }
/* fill the remaining gap */ /* 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(); stream_start();
gap = cx*abslines; gap = cx*abslines;
for(i = 0; i < gap; i++) write_data(bgcolor); for(i = 0; i < gap; i++) write_data(bgcolor);

View File

@ -472,7 +472,7 @@ void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) {
abslines = lines < 0 ? -lines : lines; abslines = lines < 0 ? -lines : lines;
acquire_bus(); acquire_bus();
if (abslines >= cy) { if ((coord_t)abslines >= cy) {
abslines = cy; abslines = cy;
gap = 0; gap = 0;
} else { } 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); set_viewport(x, row0, cx, 1);
stream_start(); stream_start();
j = read_data(); // dummy read j = read_data(); // dummy read
for (j = 0; j < cx; j++) for (j = 0; (coord_t)j < cx; j++)
buf[j] = read_data(); buf[j] = read_data();
stream_stop(); stream_stop();
set_viewport(x, row1, cx, 1); set_viewport(x, row1, cx, 1);
stream_start(); stream_start();
for (j = 0; j < cx; j++) for (j = 0; (coord_t)j < cx; j++)
write_data(buf[j]); write_data(buf[j]);
stream_stop(); stream_stop();
} }
} }
/* fill the remaining gap */ /* 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(); stream_start();
gap = cx*abslines; gap = cx*abslines;
for(i = 0; i < gap; i++) write_data(bgcolor); for(i = 0; i < gap; i++) write_data(bgcolor);