More warnings fixes by riccardom (patch 2157019)
This commit is contained in:
parent
f91cf5adf3
commit
cc8298291d
|
@ -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()
|
||||||
|
|
|
@ -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] =
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue