X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fbitmap.c;h=5e65195e9ec0391bbb8cf1cbcc856d26918868ea;hb=3b3f3b4bc62245426ea4dec22cbfaa7cfbf13645;hp=81458938c2bb8cbfdf72373e53ea21d3f10f9601;hpb=03a770d033676d87f693ff7108415c08a85427b0;p=16.git
diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 81458938..5e65195e 100644
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -1,3 +1,25 @@
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see , or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
#include
#include
#include
@@ -88,14 +110,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", _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 +142,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;