X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbitmap.c;h=cdec73bd85a11893ae1fd0cba43f6b6c5abeb086;hb=f8aa708d074bbb922c6bdc481f9909c2ffd6274a;hp=81458938c2bb8cbfdf72373e53ea21d3f10f9601;hpb=03a770d033676d87f693ff7108415c08a85427b0;p=16.git

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 81458938..cdec73bd 100644
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -75,7 +75,7 @@ bitmapLoadPcx(char *filename) {
     FILE *file;
     bitmap_t result;
     dword bufSize;
-    int index;
+    dword index;
     byte count, val;
 
     /* open the PCX file for reading */
@@ -88,14 +88,19 @@ bitmapLoadPcx(char *filename) {
     /* load the first part of the pcx file */
     loadPcxStage1(file, &result);
 
-    /* allocate the buffer */
-	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());
+	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", _fmsize(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;