git » fp-git.git » commit 1328338

prepearing for the release

author ecalot
2006-06-06 01:22:50 UTC
committer ecalot
2006-06-06 01:22:50 UTC
parent cd2ae28ec1ee9921fe01f7339192143481d4994c

prepearing for the release

PR/src/Makefile +1 -1
PR/src/include/common.h +2 -2
PR/src/lib/object/palette/pop1_16c.c +1 -1
PR/src/lib/object/palette/pop2_256c.c +1 -1

diff --git a/PR/src/Makefile b/PR/src/Makefile
index e14b4fe..579c96a 100644
--- a/PR/src/Makefile
+++ b/PR/src/Makefile
@@ -48,7 +48,7 @@ ifeq ($(TYPE),Debug)
   RELEASE       = -g -Wall -pedantic
   LINKERRELEASE =
 else
-  RELEASE       = -O2 
+  RELEASE       = -O3 
   LINKERRELEASE = -s
 endif
 
diff --git a/PR/src/include/common.h b/PR/src/include/common.h
index 7bfcaa6..a5f6383 100644
--- a/PR/src/include/common.h
+++ b/PR/src/include/common.h
@@ -65,7 +65,7 @@ common.h: Princed Resources : Defines and prototypes common to all PR code
 \***************************************************************/
 
 #define PR_URL                    "http://www.princed.com.ar"
-#define PR_VERSION                "v1.2-beta-BlackChar"
+#define PR_VERSION                "v1.2-beta-BlackChar-2"
 #define PR_COPY                   "(c) Copyright 2003-2006 Princed Development Team"
 
 /***************************************************************\
@@ -236,6 +236,6 @@ PARSING_OPTRAW\
 #define PR_RESULT_WAV_UNSUPPORTED_SAMPLERATE -29
 #define PR_RESULT_WAV_UNSUPPORTED_STEREO -30
 #define PR_RESULT_ERR_BMP_BITRATE_DIFFERS -31
-#define PR_WRONG_PALETTE_COLOR_COUNT -32 /*TODO: use RESULT_PAL_UNSUPPORTED */
+#define RESULT_PAL_UNSUPPORTED -32
 
 #endif
diff --git a/PR/src/lib/object/palette/pop1_16c.c b/PR/src/lib/object/palette/pop1_16c.c
index 6bcadcb..02341cc 100644
--- a/PR/src/lib/object/palette/pop1_16c.c
+++ b/PR/src/lib/object/palette/pop1_16c.c
@@ -256,7 +256,7 @@ void* objPop1Palette4bitsRead(const char* file,int *result) {
 	*result=readPal(file,&colorArray,&colors);
 
 	if (*result==PR_RESULT_SUCCESS && colors!=16) {
-		*result=PR_WRONG_PALETTE_COLOR_COUNT;
+		*result=RESULT_PAL_UNSUPPORTED;
 		free(colorArray);
 		return NULL;
 	}
diff --git a/PR/src/lib/object/palette/pop2_256c.c b/PR/src/lib/object/palette/pop2_256c.c
index 42b84e1..8cf3580 100644
--- a/PR/src/lib/object/palette/pop2_256c.c
+++ b/PR/src/lib/object/palette/pop2_256c.c
@@ -93,7 +93,7 @@ void* objPop2PaletteNColorsRead(const char* file,int *result) {
 	*result=readPal(file,&r->colorArray,&r->size);
 
 	if (*result==PR_RESULT_SUCCESS && !(r->size==256 || r->size==320)) {
-		*result=PR_WRONG_PALETTE_COLOR_COUNT;
+		*result=RESULT_PAL_UNSUPPORTED;
 		free(r->colorArray);
 		free(r);
 		return NULL;