major far fork made~ scroll.exe partially working... wwww

[16.git] / src / lib / bitmap.c

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 81458938c2bb8cbfdf72373e53ea21d3f10f9601..c34e13d04bb83383d0e814e5c5e19f5f241db68c 100644 (file)
--- 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 */\r
     loadPcxStage1(file, &result);
 \r
-    /* allocate the buffer */\r
-       bufSize = (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());\r
+       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.");\r
@@ -115,7 +120,7 @@ bitmapLoadPcx(char *filename) {
                val = count;\r
                count = 1;\r
        }\r
-\r
+
        /* write the pixel the specified number of times */\r
        for(; count && index < bufSize; count--,index++)  {\r
                result.data[index] = val;\r