X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=video.c;h=1b0298e2ba811f218ba34a26bbc3e093db8ff553;hp=5ab1bc9e1996abd8074ecd5bcb3536196234d88e;hb=937bf65b1c80e9394547e5f105664bd26f3671de;hpb=c62d28102c77e19c291c78bf6bf7f0a81abd54b9 diff --git a/video.c b/video.c index 5ab1bc9..1b0298e 100644 --- a/video.c +++ b/video.c @@ -46,17 +46,17 @@ int InitVirtualVideo(void) uint32 m; if(!XBuf) /* Some driver code may allocate XBuf externally. */ - if(!(XBuf = (uint8*) (FCEU_malloc((256+16) * 240 + 8)))) + if(!(XBuf = (uint8*) (FCEU_malloc(320 * 240)))) return 0; - +/* if(sizeof(uint8*)==4) { m=(uint32) XBuf; m+=8;m&=0xFFFFFFF8; - (uint32)XBuf=m; - } - - memset(XBuf,128,272*240); + XBuf=(uint8 *)m; + } +*/ + memset(XBuf,128,320*240); return 1; } @@ -116,7 +116,7 @@ int SaveSnapshot(void) fputc(b,pp); } fclose(pp); - + return u+1; } @@ -145,7 +145,7 @@ static int WritePNGChunk(FILE *fp, uint32 size, char *type, uint8 *data) if(fwrite(data,1,size,fp)!=size) return 0; - crc=CalcCRC32(0,type,4); + crc=CalcCRC32(0,(uint8 *)type,4); if(size) crc=CalcCRC32(crc,data,size); @@ -207,9 +207,12 @@ int SaveSnapshot(void) { char pdata[256*3]; + + //void FCEUD_GetPalette(uint8 i,uint8 *r, unsigned char *g, unsigned char *b); for(x=0;x<256;x++) - FCEUD_GetPalette(x,pdata+x*3,pdata+x*3+1,pdata+x*3+2); - if(!WritePNGChunk(pp,256*3,"PLTE",pdata)) + FCEUD_GetPalette(x,(uint8*)(pdata+x*3),(unsigned char*)(pdata+x*3+1),(unsigned char*)(pdata+x*3+2)); + // static int WritePNGChunk(FILE *fp, uint32 size, char *type, uint8 *data) + if(!WritePNGChunk(pp,256*3,"PLTE",(uint8 *)pdata)) goto PNGerr; } @@ -228,7 +231,7 @@ int SaveSnapshot(void) *dest=0; // No filter. dest++; for(x=256;x;x--,tmp++,dest++) - *dest=*tmp; + *dest=*tmp; tmp+=16; }