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 8d73860762a01ac6cb9ff2a41dbea8ab37de9edb..c34e13d04bb83383d0e814e5c5e19f5f241db68c 100644 (file)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -75,7 +75,7 @@ bitmapLoadPcx(char *filename) {
     FILE *file;\r
     bitmap_t result;\r
     dword bufSize;\r
-    dword index;\r
+    int index;\r
     byte count, val;
 \r
     /* open the PCX file for reading */\r
@@ -91,16 +91,16 @@ bitmapLoadPcx(char *filename) {
        /* allocate the buffer */
        //printf("%zu\n", _memmax());\r
        bufSize = (/*(dword)*/result.width * result.height);
-       result.data = (byte __near *)malloc(bufSize);
+       result.data = malloc(bufSize);
 //     result.data = (byte far *)_fmalloc(bufSize);
 //     result.data = (byte __huge *)halloc(bufSize, sizeof(byte));
-       printf("&bufSize=%p\n", &bufSize);
+       /*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);
+       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