git » fp-git.git » commit 39752ba

diff --git a/PR/src/Makefile b/PR/src/Makefile
index 31b7ec0..e07bf95 100644
--- a/PR/src/Makefile
+++ b/PR/src/Makefile
@@ -159,7 +159,7 @@ $(XMLFILE): xml/resources.xml
 	$(INFO) Compiling level_common.class module...
 	$(CC) $(OPTIONS) -c lib/object/level/level_common.c -o $@
 
-.sound_common.o: lib/object/sound/sound_common.c include/binary.h include/common.h include/wav.h include/dat.h include/types.h
+.sound_common.o: lib/object/sound/sound_common.c include/binary.h include/common.h include/wav.h include/dat.h include/types.h include/sound.h
 	$(INFO) Compiling common functions for sound type class...
 	$(CC) $(OPTIONS) -c lib/object/sound/sound_common.c -o $@
 
@@ -243,7 +243,7 @@ $(XMLFILE): xml/resources.xml
 	$(INFO) Compiling unknown string format parsing feature...
 	$(CC) $(OPTIONS) -c lib/layers/stringformat.c -o $@
 
-.stringflag.o: lib/layers/stringflag.c include/translate.h include/stringflag.h
+.stringflag.o: lib/layers/stringflag.c include/stringflag.h include/stringformat.h
 	$(INFO) Compiling unknown string flag parsing feature...
 	$(CC) $(OPTIONS) -c lib/layers/stringflag.c -o $@
 
diff --git a/PR/src/include/bitmap.h b/PR/src/include/bitmap.h
index a219920..264d1d3 100644
--- a/PR/src/include/bitmap.h
+++ b/PR/src/include/bitmap.h
@@ -37,12 +37,12 @@ bitmap.h: Princed Resources : BMP/PNG support common headers
 #define _PR_BITMAP_H_
 
 #ifdef _PR_USE_PNG_
-
+/*
 #define mFormatExportBitmap(data,vFileext,size,image,optionflag,backupExtension) \
         mFormatExportPng(data,vFileext,size,image,optionflag,backupExtension)
 #define mFormatImportBitmap(res) \
         mFormatImportPng(res)
-
+*/
 #define mWriteBitmap(file,data,w,h,bits,colors,colorArray,lineWidth,optionflag,backupExtension) \
         mWritePng(file,data,w,h,bits,colors,colorArray,lineWidth,optionflag,backupExtension)
 #define readBitmap(file,data,ph,pw,pbits,pcolors,colorArray,plineWidth) \
@@ -51,12 +51,12 @@ bitmap.h: Princed Resources : BMP/PNG support common headers
 #include "png.h"
 
 #else
-
+/*
 #define mFormatExportBitmap(data,vFileext,size,image,optionflag,backupExtension) \
         mFormatExportBmp(data,vFileext,size,image,optionflag,backupExtension)
 #define mFormatImportBitmap(res) \
         mFormatImportBmp(res)
-
+*/
 #define mWriteBitmap(file,data,w,h,bits,colors,colorArray,lineWidth,optionflag,backupExtension) \
         mWriteBmp(file,data,w,h,bits,colors,colorArray,lineWidth,optionflag,backupExtension)
 #define readBitmap(file,data,ph,pw,pbits,pcolors,colorArray,plineWidth) \
diff --git a/PR/src/include/bmp.h b/PR/src/include/bmp.h
index 6d58211..3719697 100644
--- a/PR/src/include/bmp.h
+++ b/PR/src/include/bmp.h
@@ -38,10 +38,7 @@ bmp.h: Princed Resources : BMP file support headers
 #include "types.h" /* tResource */
 #include "image.h" /* tImage */
 
-int mFormatExportBmp(const unsigned char* data, const char *vFileext,unsigned long int size,tImage image,int optionflag,const char* backupExtension);
-int mFormatImportBmp(tResource *res);
-
-int mWriteBmp(const char* file,const unsigned char* data, int w, int h, int bits, int colors, tColor* colorArray, int lineWidth, int optionflag, const char* backupExtension);
+int mWriteBmp(const char* file,const unsigned char* data, int w, int h, int bits, int colors, const tColor* colorArray, int lineWidth, int optionflag, const char* backupExtension);
 int readBmp(const char* file, unsigned char** data, int *ph, int *pw,  int *pbits, int *pcolors, tColor** colorArray, int *plineWidth);
 
 #endif
diff --git a/PR/src/include/png.h b/PR/src/include/png.h
index 0a9a35f..24481cc 100644
--- a/PR/src/include/png.h
+++ b/PR/src/include/png.h
@@ -38,10 +38,12 @@ png.h: Princed Resources : PNG file support headers
 #include "types.h" /* tResource */
 #include "image.h" /* tImage */
 
+/*
 int mFormatExportPng(const unsigned char* data, const char *vFileext,unsigned long int size,tImage image,int optionflag,const char* backupExtension);
 int mFormatImportPng(tResource *res);
+*/
 
-int mWritePng(const char* file,const unsigned char* data, int w, int h, int bits, int colors, tColor* colorArray, int lineWidth, int optionflag, const char* backupExtension);
+int mWritePng(const char* file,const unsigned char* data, int w, int h, int bits, int colors, const tColor* colorArray, int lineWidth, int optionflag, const char* backupExtension);
 int readPng(const char* file, unsigned char** data, int *ph, int *pw,  int *pbits, int *pcolors, tColor** colorArray, int *plineWidth);
 
 #endif
diff --git a/PR/src/lib/formats/bmp.c b/PR/src/lib/formats/bmp.c
index c28625a..f790e46 100644
--- a/PR/src/lib/formats/bmp.c
+++ b/PR/src/lib/formats/bmp.c
@@ -43,7 +43,7 @@ bmp.c: Princed Resources : BMP file support
 #include <stdlib.h>
 #include <string.h>
 
-int mWriteBmp(const char* file,const unsigned char* data, int w, int h, int bits, int colors, tColor* colorArray, int lineWidth, int optionflag, const char* backupExtension) {
+int mWriteBmp(const char* file,const unsigned char* data, int w, int h, int bits, int colors, const tColor* colorArray, int lineWidth, int optionflag, const char* backupExtension) {
 
 	/* declare variables */
 	int a;
diff --git a/PR/src/lib/object/image/image16.c b/PR/src/lib/object/image/image16.c
index 2b411f2..8098bc2 100644
--- a/PR/src/lib/object/image/image16.c
+++ b/PR/src/lib/object/image/image16.c
@@ -34,15 +34,15 @@ image16.c: Princed Resources : Image Compression Library
 
 #include <stdio.h>
 #include <string.h>
-#include "compress.h"
 #include "common.h"
+#include "compress.h"
+#include "dat.h"
+#include "disk.h" /* array2short */
 #include "image.h"
 #include "memory.h"
-#include "disk.h" /* array2short */
-#include "dat.h"
 #include "object.h" /* paletteGet* */
 
-#include "palette.h" /* getColorArrayByColors */
+#include "palette.h" /* SAMPLE_PAL16 */
 
 #include "bitmap.h"
 
diff --git a/PR/src/lib/object/image/image2.c b/PR/src/lib/object/image/image2.c
index 67fd155..4a8979d 100644
--- a/PR/src/lib/object/image/image2.c
+++ b/PR/src/lib/object/image/image2.c
@@ -34,12 +34,12 @@ image2.c: Princed Resources : Image Compression Library
 
 #include <stdio.h>
 #include <string.h>
-#include "compress.h"
 #include "common.h"
+#include "compress.h"
+#include "dat.h"
+#include "disk.h" /* array2short */
 #include "image.h"
 #include "memory.h"
-#include "disk.h" /* array2short */
-#include "dat.h"
 #include "object.h" /* paletteGet* */
 
 #include "palette.h" /* getColorArrayByColors */
diff --git a/PR/src/lib/object/image/image256.c b/PR/src/lib/object/image/image256.c
index 641cf42..a167e6f 100644
--- a/PR/src/lib/object/image/image256.c
+++ b/PR/src/lib/object/image/image256.c
@@ -19,7 +19,7 @@
 */
 
 /*
-image256.c: Princed Resources : Image Compression Library
+image256.c: Princed Resources : POP2 image with N colors class implementation
 \xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf
  Copyright 2003, 2004, 2005, 2006 Princed Development Team
   Created: 24 Aug 2003
@@ -34,12 +34,12 @@ image256.c: Princed Resources : Image Compression Library
 
 #include <stdio.h>
 #include <string.h>
-#include "compress.h"
 #include "common.h"
+#include "compress.h"
+#include "dat.h"
+#include "disk.h"    /* array2short */
 #include "image.h"
 #include "memory.h"
-#include "disk.h"    /* array2short */
-#include "dat.h"
 #include "object.h"  /* paletteGet* */
 
 #include "palette.h" /* getColorArrayByColors */
diff --git a/PR/src/lib/object/image/image_common.c b/PR/src/lib/object/image/image_common.c
index 57658d2..a8a28f7 100644
--- a/PR/src/lib/object/image/image_common.c
+++ b/PR/src/lib/object/image/image_common.c
@@ -34,17 +34,11 @@ image16.c: Princed Resources : Image Compression Library
 
 #include <stdio.h>
 #include <string.h>
-#include "compress.h"
 #include "common.h"
-#include "image.h"
-#include "memory.h"
+#include "compress.h"
 #include "disk.h" /* array2short */
-#include "dat.h"
-#include "object.h" /* paletteGet* */
-
-#include "palette.h" /* getColorArrayByColors */
-
-#include "bitmap.h"
+#include "image.h" /* tImage */
+#include "memory.h"
 
 /* Compression level explanation:
  *