dc9e7527ce8516efbb098a4f0f8702d49986677b kate Thu Jul 16 09:44:16 2015 -0700 Removing obsolete 8-bit color support. refs #15722 diff --git src/inc/memgfx.h src/inc/memgfx.h index 1eb7b6e..4d2cf50 100644 --- src/inc/memgfx.h +++ src/inc/memgfx.h @@ -3,31 +3,30 @@ * for personal, academic, and non-profit purposes. Commercial use * * permitted only by explicit agreement with Jim Kent (jim_kent@pacbell.net) * *****************************************************************************/ /* Memgfx - stuff to do graphics in memory buffers. * Typically will just write these out as .gif or .png files. * This stuff is byte-a-pixel for simplicity. * It can do 256 colors. */ #ifndef MEMGFX_H #define MEMGFX_H #ifndef GFXPOLY_H #include "gfxPoly.h" #endif -#ifdef COLOR32 typedef unsigned int Color; // BIGENDIAN machines: #if defined(__sgi__) || defined(__sgi) || defined(__powerpc__) || defined(sparc) || defined(__ppc__) || defined(__s390__) || defined(__s390x__) #define MEMGFX_BIGENDIAN 1 #define MG_WHITE 0xffffffff #define MG_BLACK 0x000000ff #define MG_RED 0xff0000ff #define MG_GREEN 0x00ff00ff #define MG_BLUE 0x0000ffff #define MG_CYAN 0x00ffffff #define MG_MAGENTA 0xff00ffff #define MG_YELLOW 0xffff00ff @@ -44,46 +43,30 @@ #define MG_BLACK 0xff000000 #define MG_RED 0xff0000ff #define MG_GREEN 0xff00ff00 #define MG_BLUE 0xffff0000 #define MG_CYAN 0xffffff00 #define MG_MAGENTA 0xffff00ff #define MG_YELLOW 0xff00ffff #define MG_GRAY 0xff808080 #define MAKECOLOR_32(r,g,b) (((unsigned int)0xff<<24) | ((unsigned int)b<<16) | ((unsigned int)g << 8) | (unsigned int)r) #define COLOR_32_RED(c) ((c)&0xff) #define COLOR_32_GREEN(c) (((c)>>8)&0xff) #define COLOR_32_BLUE(c) (((c)>>16)&0xff) #endif -#else /* 8-bit color */ -typedef unsigned char Color; - -#define MG_WHITE 0 -#define MG_BLACK 1 -#define MG_RED 2 -#define MG_GREEN 3 -#define MG_BLUE 4 -#define MG_CYAN 5 -#define MG_MAGENTA 6 -#define MG_YELLOW 7 -#define MG_GRAY 8 -#define MG_FREE_COLORS_START 9 - -#endif /* COLOR32 */ - #define MG_WRITE_MODE_NORMAL 0 #define MG_WRITE_MODE_MULTIPLY (1 << 0) struct rgbColor { unsigned char r, g, b; }; /* HSV and HSL structs can be used for changing lightness, darkness, or * color of RGB colors. Convert RGB->HS[LV], modify hue, saturation, or * value/lightness, then convert back to RGB. * The datatypes were chosen to be fast but also give accurate conversion * back to RGB. * Hue is a float [0,360) degrees 0=red, 120=green, 240=blue * S/V/L are integers [0,1000]