X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbitmap.c;h=c34e13d04bb83383d0e814e5c5e19f5f241db68c;hb=e0822f1d126fdc00b5fb8e1de1b84ef0f8f75a4a;hp=3777c3d125b54ead3bb82498682b399db3715c2a;hpb=8b92f32b6e6a8ab7be52ced02208cc789364a014;p=16.git diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c index 3777c3d1..c34e13d0 100644 --- a/src/lib/bitmap.c +++ b/src/lib/bitmap.c @@ -88,14 +88,19 @@ bitmapLoadPcx(char *filename) { /* load the first part of the pcx file */ loadPcxStage1(file, &result); - /* allocate the buffer */ - bufSize = ((dword)result.width * result.height); - result.data = malloc((bufSize)); - /*0000printf("Size of block is %u bytes\n", _msize(result.data)); - printf("Size of bufSize is %lu bytes\n", bufSize); - printf("Size of result.width is %lu \n", result.width); - printf("Size of result.height is %lu \n", result.height); - printf("Dimensions of result is %lu\n", result.width*result.height);*/ + /* allocate the buffer */ + //printf("%zu\n", _memmax()); + bufSize = (/*(dword)*/result.width * result.height); + result.data = malloc(bufSize); +// result.data = (byte far *)_fmalloc(bufSize); +// result.data = (byte __huge *)halloc(bufSize, sizeof(byte)); + /*printf("&bufSize=%p\n", &bufSize); + printf("&result.data=%p\n", result.data); + printf("Size of block is %zu bytes\n", _msize(result.data)); + printf("Size of bufSize is %zu bytes\n", bufSize); + printf("Size of result.width is %zu \n", result.width); + printf("Size of result.height is %zu \n", result.height); + printf("Dimensions of result is %lu\n", (dword)result.width*result.height);*/ //exit(0); if(!result.data) { fprintf(stderr, "Could not allocate memory for bitmap data."); @@ -115,7 +120,7 @@ bitmapLoadPcx(char *filename) { val = count; count = 1; } - + /* write the pixel the specified number of times */ for(; count && index < bufSize; count--,index++) { result.data[index] = val;