ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More warnings fixes by riccardom (patch 2157019)

This commit is contained in:
yabause 2008-10-17 09:23:46 +00:00
parent f91cf5adf3
commit cc8298291d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/softrender.cpp
View File

@ -92,7 +92,7 @@ image::image(int xres, int yres)
void image::delete_data() void image::delete_data()
{ {
delete[] data; delete[] (char *)data;
} }
image::~image() image::~image()
@ -748,4 +748,4 @@ bool Trender51::GetColor(int c, int &r, int &g, int &b)
} }
} //end namespace } //end namespace

10
desmume/src/softrender_desmumefont.h
View File

@ -32,11 +32,11 @@ namespace softrender {
class DesmumeFont { class DesmumeFont {
public: public:
static const int height() { return OSD_FONT_HEIGHT; } static int height() { return OSD_FONT_HEIGHT; }
static const int width(char c) { return OSD_FONT_WIDTH; } static int width(char c) { return OSD_FONT_WIDTH; }
static const bool valid(char c) { return true; } static bool valid(char c) { return true; }
static const int pixel(char c, int x, int y) { static int pixel(char c, int x, int y) {
static const unsigned char font_eng[256*OSD_FONT_HEIGHT] = static const unsigned char font_eng[256*OSD_FONT_HEIGHT] =
{ {
@ -306,4 +306,4 @@ namespace softrender {
} //namespace } //namespace
#endif #endif