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

Windows Port: 

- Fix compiling issues. (Regression from r5198.)
This commit is contained in:
rogerman 2015-06-10 04:58:59 +00:00
parent 70cb9375cc
commit d2a0307431
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desmume/src/common.cpp
View File

@ -420,12 +420,12 @@ static int WritePNGChunk(FILE *fp, uint32 size, const char *type, const uint8 *d
return 1;
}
int NDS_WritePNG(const char *fname, u8 *data)
int NDS_WritePNG(const char *fname, u16 *data)
{
int x, y;
int width=256;
int height=192*2;
u16 * bmp = (u16 *)data;
u16 * bmp = data;
FILE *pp=NULL;
uint8 *compmem = NULL;
uLongf compmemsize = (uLongf)( (height * (width + 1) * 3 * 1.001 + 1) + 12 );
@ -545,13 +545,13 @@ typedef struct
} bmpfileheader_struct;
#include "PACKED_END.h"
int NDS_WriteBMP(const char *filename, u8 *data)
int NDS_WriteBMP(const char *filename, u16 *data)
{
bmpfileheader_struct fileheader;
bmpimgheader_struct imageheader;
FILE *file;
int i,j;
u16 * bmp = (u16 *)data;
u16 * bmp = data;
size_t elems_written = 0;
memset(&fileheader, 0, sizeof(fileheader));

4
desmume/src/common.h
View File

@ -87,8 +87,8 @@ struct MAKER
std::string getDeveloperNameByID(u16 id);
extern int NDS_WritePNG(const char *fname, u8 *data);
extern int NDS_WriteBMP(const char *filename, u8 *data);
extern int NDS_WritePNG(const char *fname, u16 *data);
extern int NDS_WriteBMP(const char *filename, u16 *data);
extern int NDS_WriteBMP_32bppBuffer(int width, int height, const void* buf, const char *filename);
#endif

2
desmume/src/windows/mapView.cpp
View File

@ -62,7 +62,7 @@ struct mapview_struct
for(u32 i = 0; i < gpu.BGSize[map][1]; ++i)
{
gpu.currDst = (u8 *)bitmap + i*gpu.BGSize[map][0]*2;
gpu.currDst = bitmap + i*gpu.BGSize[map][0];
gpu.currLine = i;
gpu.modeRender<false>(map);
}