diff --git a/desmume/src/softrender.cpp b/desmume/src/softrender.cpp index 214986cc4..ca22e6492 100644 --- a/desmume/src/softrender.cpp +++ b/desmume/src/softrender.cpp @@ -92,7 +92,7 @@ image::image(int xres, int yres) void image::delete_data() { - delete[] data; + delete[] (char *)data; } image::~image() @@ -748,4 +748,4 @@ bool Trender51::GetColor(int c, int &r, int &g, int &b) } -} //end namespace \ No newline at end of file +} //end namespace diff --git a/desmume/src/softrender_desmumefont.h b/desmume/src/softrender_desmumefont.h index 0cc28b5da..953db7132 100644 --- a/desmume/src/softrender_desmumefont.h +++ b/desmume/src/softrender_desmumefont.h @@ -32,11 +32,11 @@ namespace softrender { class DesmumeFont { public: - static const int height() { return OSD_FONT_HEIGHT; } - static const int width(char c) { return OSD_FONT_WIDTH; } - static const bool valid(char c) { return true; } + static int height() { return OSD_FONT_HEIGHT; } + static int width(char c) { return OSD_FONT_WIDTH; } + 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] = { @@ -306,4 +306,4 @@ namespace softrender { } //namespace -#endif \ No newline at end of file +#endif