X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fbitmap.c;h=5e65195e9ec0391bbb8cf1cbcc856d26918868ea;hb=729ec301fbc67f06250456eecf5e2be7e66f3d02;hp=cdec73bd85a11893ae1fd0cba43f6b6c5abeb086;hpb=f8aa708d074bbb922c6bdc481f9909c2ffd6274a;p=16.git
diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index cdec73bd..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
@@ -75,7 +97,7 @@ bitmapLoadPcx(char *filename) {
FILE *file;
bitmap_t result;
dword bufSize;
- dword index;
+ int index;
byte count, val;
/* open the PCX file for reading */
@@ -91,16 +113,16 @@ bitmapLoadPcx(char *filename) {
/* 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 = 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", _fmsize(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.");