So, here's a patch. It's in the style used for Linux work.
For those not familiar with this:
cd tuxpaint-source-directory
patch -p1 -E -s < this-email-perhaps-including-headers
Hopefully somebody can apply this soon. It does:
1. add some warning flags to the Makefile
2. adjusts the colors (fixing bug #1053065)
3. fixes the purple tint for some tools
4. fixes audio on a Mac running Linux
5. increases MAX_STAMPS to 512
diff -Naurd old/Makefile wip/Makefile
--- old/Makefile 2004-10-24 17:02:51.000000000 -0400
+++ wip/Makefile 2004-11-20 21:42:56.000000000 -0500
@@ -93,7 +93,11 @@
# The entire set of CFLAGS:
-CFLAGS=-O2 -Wall
+CFLAGS=-O2 -Wall -fno-common -ffast-math \
+ -W -Wall -Wcast-align -Wredundant-decls \
+ -Wbad-function-cast -Wwrite-strings -Waggregate-return \
+ -Wstrict-prototypes -Wmissing-prototypes
+
DEFS=-DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \
-DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\"
diff -Naurd old/src/colors.h wip/src/colors.h
--- old/src/colors.h 2004-02-09 23:48:42.000000000 -0500
+++ wip/src/colors.h 2004-11-20 21:34:47.000000000 -0500
@@ -17,20 +17,22 @@
enum {
COLOR_BLACK,
+ COLOR_GREY,
+ COLOR_SILVER,
COLOR_WHITE,
COLOR_RED,
COLOR_PINK,
COLOR_ORANGE,
COLOR_YELLOW,
- COLOR_LIME,
+ COLOR_NEON,
COLOR_GREEN,
- COLOR_CYAN,
+ COLOR_SKYBLUE,
COLOR_BLUE,
COLOR_PURPLE,
- COLOR_FUCHSIA, /* ... */
+ COLOR_MAGENTA,
COLOR_BROWN,
- COLOR_GREY,
- COLOR_SILVER, /* ... */
+ COLOR_TAN,
+ COLOR_BEIGE,
NUM_COLORS
};
@@ -39,20 +41,22 @@
int color_hexes[NUM_COLORS][3] = {
{0, 0, 0}, /* Black */
+ {128, 128, 128}, /* Gray */
+ {192, 192, 192}, /* Silver */
{255, 255, 255}, /* White */
{255, 0, 0}, /* Red */
- {255, 128, 160}, /* Pink */
+ {255, 165, 211}, /* Pink */
{255, 128, 0}, /* Orange */
{255, 255, 0}, /* Yellow */
- { 0, 255, 0}, /* Lime */
- { 0, 132, 64}, /* Green */
- { 0, 255, 255}, /* Cyan */
+ {140, 255, 0}, /* Neon */
+ { 33, 148, 33}, /* Green */
+ {138, 168, 205}, /* Sky blue */
{ 0, 0, 255}, /* Blue */
{ 96, 0, 128}, /* Purple */
- {255, 0, 255}, /* Fuchsia */
+ {255, 0, 255}, /* Magenta */
{128, 96, 0}, /* Brown */
- {128, 128, 128}, /* Gray */
- {192, 192, 192} /* Silver */
+ {226, 189, 166}, /* Tan */
+ {247, 228, 219}, /* Beige */
};
@@ -60,18 +64,20 @@
char * color_names[NUM_COLORS] = {
gettext_noop("Black!"),
+ gettext_noop("Gray!"),
+ gettext_noop("Silver!"),
gettext_noop("White!"),
gettext_noop("Red!"),
gettext_noop("Pink!"),
gettext_noop("Orange!"),
gettext_noop("Yellow!"),
- gettext_noop("Lime!"),
+ gettext_noop("Neon green!"),
gettext_noop("Green!"),
- gettext_noop("Cyan!"),
+ gettext_noop("Sky blue!"),
gettext_noop("Blue!"),
gettext_noop("Purple!"),
- gettext_noop("Fuchsia!"),
+ gettext_noop("Magenta!"),
gettext_noop("Brown!"),
- gettext_noop("Gray!"),
- gettext_noop("Silver!")
+ gettext_noop("Tan!"),
+ gettext_noop("Beige!"),
};
diff -Naurd old/src/tuxpaint.c wip/src/tuxpaint.c
--- old/src/tuxpaint.c 2004-10-24 17:25:17.000000000 -0400
+++ wip/src/tuxpaint.c 2004-11-20 21:39:06.000000000 -0500
@@ -28,6 +28,10 @@
#define VER_VERSION "0.9.15"
#define VER_DATE "2004-10-24"
+#define VIDEO_BPP 15 // saves memory
+//#define VIDEO_BPP 16 // causes purple discoloration
+//#define VIDEO_BPP 24 // compromise
+//#define VIDEO_BPP 32 // might be the fastest, if conversion functions removed
/* #define DEBUG */
/* #define LOW_QUALITY_THUMBNAILS */
@@ -506,7 +510,7 @@
SDL_Surface * img_title_names[NUM_TITLES];
SDL_Surface * img_tools[NUM_TOOLS], * img_tool_names[NUM_TOOLS];
-#define MAX_STAMPS 256
+#define MAX_STAMPS 512
#define MAX_BRUSHES 64
#define MAX_FONTS 64
int num_brushes, num_stamps;
@@ -4997,7 +5001,7 @@
else
{
#ifndef WIN32
- if (Mix_OpenAudio(44100, AUDIO_S16, 2, 1024) < 0)
+ if (Mix_OpenAudio(44100, AUDIO_S16SYS, 2, 1024) < 0)
#else
if (Mix_OpenAudio(44100, AUDIO_S16, 2, 2048) < 0)
#endif
@@ -5043,10 +5047,10 @@
{
#ifdef USE_HWSURFACE
screen = SDL_SetVideoMode(WINDOW_WIDTH, WINDOW_HEIGHT,
- 16, SDL_FULLSCREEN | SDL_HWSURFACE);
+ VIDEO_BPP, SDL_FULLSCREEN | SDL_HWSURFACE);
#else
screen = SDL_SetVideoMode(WINDOW_WIDTH, WINDOW_HEIGHT,
- 16, SDL_FULLSCREEN | SDL_SWSURFACE);
+ VIDEO_BPP, SDL_FULLSCREEN | SDL_SWSURFACE);
#endif
if (screen == NULL)
@@ -5064,9 +5068,9 @@
if (!fullscreen)
{
#ifdef USE_HWSURFACE
- screen = SDL_SetVideoMode(WINDOW_WIDTH, WINDOW_HEIGHT, 16,
SDL_HWSURFACE);
+ screen = SDL_SetVideoMode(WINDOW_WIDTH, WINDOW_HEIGHT, VIDEO_BPP,
SDL_HWSURFACE);
#else
- screen = SDL_SetVideoMode(WINDOW_WIDTH, WINDOW_HEIGHT, 16,
SDL_SWSURFACE);
+ screen = SDL_SetVideoMode(WINDOW_WIDTH, WINDOW_HEIGHT, VIDEO_BPP,
SDL_SWSURFACE);
#endif
}
_______________________________________________
Tuxpaint-dev mailing list
[EMAIL PROTECTED]
http://tux4kids.net/mailman/listinfo/tuxpaint-dev
