X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbitmap.c;h=19af31f5386846af026278b88df3d0ca94e697b6;hb=29050ce6a22ce3d6c47183d6946e81ea25b6b5c7;hp=5e65195e9ec0391bbb8cf1cbcc856d26918868ea;hpb=d9e8696a3a67052729b1b783f0f3f1b0d20d9e9a;p=16.git
diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
old mode 100644
new mode 100755
index 5e65195e..19af31f5
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -1,138 +1,141 @@
-/* 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.
- *
- */
-
+/* 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"
+#ifndef PCXHEADER_H
+#define PCXHEADER_H
static struct pcxHeader {
- byte id;
- byte version;
- byte encoding;
- byte bpp;
- word xmin;
- word ymin;
- word xmax;
- word ymax;
- word hres;
- word vres;
- byte pal16[48];
- byte res1;
- word bpplane;
- word palType;
- word hScreenSize;
- word vScreenSize;
- byte padding[54];
+ byte id;
+ byte version;
+ byte encoding;
+ byte bpp;
+ word xmin;
+ word ymin;
+ word xmax;
+ word ymax;
+ word hres;
+ word vres;
+ byte pal16[48];
+ byte res1;
+ word bpplane;
+ word palType;
+ word hScreenSize;
+ word vScreenSize;
+ byte padding[54];
} head;
+#endif /*PCXHEADER_H*/
static void loadPcxStage1(FILE *file, bitmap_t *result) {
- long bufSize;
- int index;
- byte count, val;
- long int pos;
+ long bufSize;
+ int index;
+ byte count, val;
+ long int pos;
- /* read the header */
- fread(&head, sizeof(char), sizeof(struct pcxHeader), file);
+ /* read the header */
+ fread(&head, sizeof(char), sizeof(struct pcxHeader), file);
- /* get the width and height */
- result->width = head.xmax - head.xmin + 1;
- result->height = head.ymax - head.ymin + 1;
+ /* get the width and height */
+ result->width = head.xmax - head.xmin + 1;
+ result->height = head.ymax - head.ymin + 1;
- /* make sure this is 8bpp */
- if(head.bpp != 8) {
+ /* make sure this is 8bpp */
+ if(head.bpp != 8) {
printf("I only know how to handle 8bpp pcx files!\n");
fclose(file);
exit(-2);
- }
+ }
}
static void loadPcxPalette(FILE *file, bitmap_t *result) {
- byte val;
- int index;
-
- /* handle the palette */
- fseek(file, -769, SEEK_END);
- val = fgetc(file);
- result->palette = modexNewPal();
- if(head.version == 5 && val == 12) {
+ byte val;
+ int index;
+
+ /* handle the palette */
+ fseek(file, -769, SEEK_END);
+ val = fgetc(file);
+ result->palette = modexNewPal();
+ if(head.version == 5 && val == 12) {
/* use the vga palette */
for(index=0; !feof(file) && index < PAL_SIZE; index++) {
- val = fgetc(file);
- result->palette[index] = val >> 2;
+ val = fgetc(file);
+ result->palette[index] = val >> 2;
}
- } else {
+ } else {
/* use the 16 color palette */
for(index=0; index<48; index++) {
- result->palette[index] = head.pal16[index];
+ result->palette[index] = head.pal16[index];
+ }
}
- }
}
bitmap_t
bitmapLoadPcx(char *filename) {
- FILE *file;
- bitmap_t result;
- dword bufSize;
- int index;
- byte count, val;
-
- /* open the PCX file for reading */
- file = fopen(filename, "rb");
- if(!file) {
+ FILE *file;
+ bitmap_t result;
+ dword bufSize;
+ int index;
+ byte count, val;
+
+ /* open the PCX file for reading */
+ file = fopen(filename, "rb");
+ if(!file) {
printf("Could not open %s for reading.\n", filename);
exit(-2);
- }
+ }
- /* load the first part of the pcx file */
- loadPcxStage1(file, &result);
+ /* load the first part of the pcx file */
+ loadPcxStage1(file, &result);
- /* allocate the buffer */
+ /* 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) {
+ 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);
}
- /* read the buffer in */
- index = 0;
- do {
+ /* read the buffer in */
+ index = 0;
+ do {
/* get the run length and the value */
count = fgetc(file);
if(0xC0 == (count & 0xC0)) { /* this is the run count */
@@ -142,43 +145,43 @@ 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;
}
- } while(index < bufSize);
+ } while(index < bufSize);
- loadPcxPalette(file, &result);
+ loadPcxPalette(file, &result);
- fclose(file);
+ fclose(file);
- return result;
+ return result;
}
-//update!!
+//TODO: update!!
tileset_t
bitmapLoadPcxTiles(char *filename, word twidth, word theight) {
- tileset_t ts;
- FILE *file;
- bitmap_t result;
- int i;
+ tileset_t ts;
+ FILE *file;
+ bitmap_t result;
+ int i;
- /* open the PCX file for reading */
- file = fopen(filename, "rb");
+ /* open the PCX file for reading */
+ file = fopen(filename, "rb");
if(!file) {
printf("Could not open %s for reading.\n", filename);
exit(-2);
}
- /* load the first part of the pcx file */
- loadPcxStage1(file, &result);
+ /* load the first part of the pcx file */
+ loadPcxStage1(file, &result);
- /* get the number of tiles and set up the result structure */
- ts.twidth = twidth;
- ts.theight = theight;
- ts.ntiles = (result.width/twidth) * (result.height/theight);
- ts.palette = result.palette;
+ /* get the number of tiles and set up the result structure */
+ ts.twidth = twidth;
+ ts.theight = theight;
+ ts.ntiles = (result.width/twidth) * (result.height/theight);
+ ts.palette = result.palette;
/* allocate the pixel storage for the tiles */
ts.data = malloc(sizeof(byte*) * ts.ntiles);
@@ -187,10 +190,10 @@ bitmapLoadPcxTiles(char *filename, word twidth, word theight) {
ts.data[i] = ts.data[i-1] + twidth * theight;
}
- /* finish off the file */
- loadPcxPalette(file, &result);
+ /* finish off the file */
+ loadPcxPalette(file, &result);
- fclose(file);
+ fclose(file);
- return ts;
+ return ts;
}