Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Revision 11:9bb71766cafc, committed 2013-02-19
- Comitter:
- dreschpe
- Date:
- Tue Feb 19 21:49:55 2013 +0000
- Parent:
- 10:071ae6e02fcf
- Child:
- 12:9de056a58793
- Child:
- 13:2c91cb947161
- Commit message:
- fix warnings
Changed in this revision
--- a/GraphicsDisplay.cpp Sun Feb 03 18:18:43 2013 +0000
+++ b/GraphicsDisplay.cpp Tue Feb 19 21:49:55 2013 +0000
@@ -113,7 +113,7 @@
blitbit(column * 8, row * 8, 8, 8, (char*)&(FONT8x8[value - 0x1F][0]));
}
-void GraphicsDisplay::window(int x, int y, int w, int h) {
+void GraphicsDisplay::window(unsigned int x,unsigned int y,unsigned int w,unsigned int h) {
// current pixel location
_x = x;
_y = y;
--- a/GraphicsDisplay.h Sun Feb 03 18:18:43 2013 +0000
+++ b/GraphicsDisplay.h Tue Feb 19 21:49:55 2013 +0000
@@ -26,7 +26,7 @@
virtual int width() = 0;
virtual int height() = 0;
- virtual void window(int x, int y, int w, int h);
+ virtual void window(unsigned int x,unsigned int y,unsigned int w,unsigned int h);
virtual void putp(int colour);
virtual void cls();
--- a/SPI_TFT.cpp Sun Feb 03 18:18:43 2013 +0000
+++ b/SPI_TFT.cpp Tue Feb 19 21:49:55 2013 +0000
@@ -526,7 +526,7 @@
void SPI_TFT::hline(int x0, int x1, int y, int color)
{
- int w,i;
+ int w;
w = x1 - x0 + 1;
window(x0,y,w,1);
wr_cmd(0x22);
@@ -568,6 +568,7 @@
} while ((LPC_SSP1->SR & 0x10) == 0x10); // SPI FIFO not empty
}
#else
+ int i;
for (i=0; i<w; i++) {
_spi.write(color);
}
--- a/SPI_TFT.h Sun Feb 03 18:18:43 2013 +0000
+++ b/SPI_TFT.h Tue Feb 19 21:49:55 2013 +0000
@@ -335,7 +335,7 @@
* @param w window width in pixel
* @param h window height in pixels
*/
- void window (unsigned int x, unsigned int y, unsigned int w, unsigned int h);
+ virtual void window (unsigned int x,unsigned int y, unsigned int w, unsigned int h);