--- xmil/common/bmpdata.c 2004/08/01 05:31:29 1.1 +++ xmil/common/bmpdata.c 2008/06/02 20:07:30 1.3 @@ -70,11 +70,9 @@ UINT bmpdata_setinfo(BMPINFO *bi, const STOREINTELDWORD(bi->biHeight, inf->height); STOREINTELWORD(bi->biPlanes, 1); STOREINTELWORD(bi->biBitCount, inf->bpp); -// STOREINTELDWORD(bi->biCompression, BI_RGB); +/* STOREINTELDWORD(bi->biCompression, BI_RGB); */ ret = bmpdata_getdatasize(bi); STOREINTELDWORD(bi->biSizeImage, ret); -// STOREINTELDWORD(bi->biXPelsPerMeter, 0); -// STOREINTELDWORD(bi->biYPelsPerMeter, 0); if (inf->bpp <= 8) { tmp = 1 << inf->bpp; STOREINTELDWORD(bi->biClrUsed, tmp); @@ -85,7 +83,7 @@ bdsi_exit: return(ret); } -BOOL bmpdata_getinfo(const BMPINFO *bi, BMPDATA *inf) { +BRESULT bmpdata_getinfo(const BMPINFO *bi, BMPDATA *inf) { UINT tmp; int width; @@ -121,12 +119,12 @@ bdgi_err: return(FAILURE); } -BYTE *bmpdata_lzx(int level, int dstsize, const BYTE *dat) { +UINT8 *bmpdata_lzx(int level, int dstsize, const UINT8 *dat) { - BYTE *ret; - BYTE *ptr; - BYTE ctrl; - BYTE bit; + UINT8 *ret; + UINT8 *ptr; + UINT8 ctrl; + UINT8 bit; UINT mask; UINT tmp; int pos; @@ -136,7 +134,7 @@ BYTE *bmpdata_lzx(int level, int dstsize if (dat == NULL) { return(NULL); } - ret = (BYTE *)_MALLOC(dstsize, "res"); + ret = (UINT8 *)_MALLOC(dstsize, "res"); if (ret == NULL) { goto lxz_err; } @@ -174,7 +172,7 @@ lxz_err: return(ret); } -BYTE *bmpdata_solvedata(const BYTE *dat) { +UINT8 *bmpdata_solvedata(const UINT8 *dat) { int dstsize;