e5606b4f483bd08425af83b289ab4c3937b333da kate Thu Sep 20 13:11:03 2018 -0700 Finishing touches on geneHancer track. Includes tool to fix incorrect ranges. refs #22048 diff --git src/lib/memgfx.c src/lib/memgfx.c index 1a48dca..55e79e0 100644 --- src/lib/memgfx.c +++ src/lib/memgfx.c @@ -113,47 +113,52 @@ #ifdef MEMGFX_BIGENDIAN *ptr = 0xffffff00; #else *ptr = 0x00ffffff; // transparent white #endif } Color mgFindColor(struct memGfx *mg, unsigned char r, unsigned char g, unsigned char b) /* Returns closest color in color map to rgb values. If it doesn't * already exist in color map and there's room, it will create * exact color in map. */ { return MAKECOLOR_32(r,g,b); } - -struct rgbColor mgColorIxToRgb(struct memGfx *mg, int colorIx) +struct rgbColor colorIxToRgb(int colorIx) /* Return rgb value at color index. */ { static struct rgbColor rgb; #ifdef MEMGFX_BIGENDIAN rgb.r = (colorIx >> 24) & 0xff; rgb.g = (colorIx >> 16) & 0xff; rgb.b = (colorIx >> 8) & 0xff; #else rgb.r = (colorIx >> 0) & 0xff; rgb.g = (colorIx >> 8) & 0xff; rgb.b = (colorIx >> 16) & 0xff; #endif return rgb; } +struct rgbColor mgColorIxToRgb(struct memGfx *mg, int colorIx) +/* Return rgb value at color index. */ +{ +return colorIxToRgb(colorIx); +} + Color mgClosestColor(struct memGfx *mg, unsigned char r, unsigned char g, unsigned char b) /* Returns closest color in color map to r,g,b */ { return MAKECOLOR_32(r,g,b); } Color mgAddColor(struct memGfx *mg, unsigned char r, unsigned char g, unsigned char b) /* Adds color to end of color map if there's room. */ { return MAKECOLOR_32(r,g,b); } int mgColorsFree(struct memGfx *mg) /* Returns # of unused colors in color map. */