X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fbitmap.c;h=85f85b1ba9f6bc9502f28dfede0b7f4c8ce5918d;hb=539ebb44044e22fc0cd200a091c55370419fd88f;hp=81458938c2bb8cbfdf72373e53ea21d3f10f9601;hpb=03a770d033676d87f693ff7108415c08a85427b0;p=16.git
diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
old mode 100644
new mode 100755
index 81458938..85f85b1b
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -1,6 +1,28 @@
+/* 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
+#include
+#include
#include "src/lib/bitmap.h"
#include "src/lib/modex16.h"
@@ -76,7 +98,7 @@ bitmapLoadPcx(char *filename) {
bitmap_t result;
dword bufSize;
int index;
- byte count, val;
+ byte count, val;
/* open the PCX file for reading */
file = fopen(filename, "rb");
@@ -86,18 +108,23 @@ 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);*/
- //exit(0);
- if(!result.data) {
+ loadPcxStage1(file, &result);
+
+ /* 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.");
fclose(file);
exit(-1);