modified: 16.exe

[16.git] / src / lib / bitmap.c

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
old mode 100644 (file)
new mode 100755 (executable)
index 5e65195..85f85b1
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -1,28 +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 <http://www.gnu.org/licenses/>, or
- * write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
+/* Project 16 Source Code~\r
+ * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ *\r
+ * This file is part of Project 16.\r
+ *\r
+ * Project 16 is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Project 16 is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or\r
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
+ * Fifth Floor, Boston, MA 02110-1301 USA.\r
+ *\r
+ */\r
+\r
 #include <stdio.h>\r
-#include <stdlib.h>
-#include <malloc.h>
+#include <stdlib.h>\r
+#include <malloc.h>\r
 #include "src/lib/bitmap.h"\r
 #include "src/lib/modex16.h"\r
 \r
@@ -98,7 +98,7 @@ bitmapLoadPcx(char *filename) {
     bitmap_t result;\r
     dword bufSize;\r
     int index;\r
-    byte count, val;
+    byte count, val;\r
 \r
     /* open the PCX file for reading */\r
     file = fopen(filename, "rb");\r
@@ -108,23 +108,23 @@ bitmapLoadPcx(char *filename) {
     }\r
 \r
     /* load the first part of the pcx file */\r
-    loadPcxStage1(file, &result);
+    loadPcxStage1(file, &result);\r
 \r
-       /* allocate the buffer */
+       /* allocate the buffer */\r
        //printf("%zu\n", _memmax());\r
-       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) {
+       bufSize = (/*(dword)*/result.width * result.height);\r
+       result.data = malloc(bufSize);\r
+//     result.data = (byte far *)_fmalloc(bufSize);\r
+//     result.data = (byte __huge *)halloc(bufSize, sizeof(byte));\r
+       /*printf("&bufSize=%p\n", &bufSize);\r
+       printf("&result.data=%p\n", result.data);\r
+       printf("Size of block is %zu bytes\n", _msize(result.data));\r
+       printf("Size of bufSize is %zu bytes\n", bufSize);\r
+       printf("Size of result.width is %zu \n", result.width);\r
+       printf("Size of result.height is %zu \n", result.height);\r
+       printf("Dimensions of result is %lu\n", (dword)result.width*result.height);*/\r
+       //exit(0);\r
+       if(!result.data) {\r
                fprintf(stderr, "Could not allocate memory for bitmap data.");\r
                fclose(file);\r
                exit(-1);\r
@@ -142,7 +142,7 @@ bitmapLoadPcx(char *filename) {
                val = count;\r
                count = 1;\r
        }\r
-
+\r
        /* write the pixel the specified number of times */\r
        for(; count && index < bufSize; count--,index++)  {\r
                result.data[index] = val;\r