diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-01-19 19:10:39 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-01-19 19:10:39 +0000 |
| commit | 576f02c0637cdbb641be4b1073b44c64a2c02a94 (patch) | |
| tree | 578cf9053bbb5c2521a1eb1736a0a6944ce401a3 /src | |
| parent | b2290975d4c70e66f58fdc462d0869e9e55cd317 (diff) | |
Fixes from Bill:
- Fluid fixes for menu item numbering and adding of #define stuff to
include file to prevent multiple inclusion.
- Fixed contrast function (again).
- Fixed fractals demo (not using glutMainLoop()...
git-svn-id: file:///fltk/svn/fltk/trunk@232 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/fl_color.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fl_color.cxx b/src/fl_color.cxx index 7acf7ec1e..2c1544a18 100644 --- a/src/fl_color.cxx +++ b/src/fl_color.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_color.cxx,v 1.10 1999/01/13 15:56:22 mike Exp $" +// "$Id: fl_color.cxx,v 1.11 1999/01/19 19:10:39 mike Exp $" // // Color functions for the Fast Light Tool Kit (FLTK). // @@ -340,14 +340,14 @@ Fl_Color inactive(Fl_Color c) { Fl_Color contrast(Fl_Color fg, Fl_Color bg) { int c1 = int(fl_cmap[fg]); int c2 = int(fl_cmap[bg]); - if (((c1|(c1<<1)&0x800000)^(c2|(c2<<1)&0x800000))&0x80808000) + if ((c1^c2)&0x80800000) return fg; - else if (c2&0x80c00000) + else if (c2&0x80800000) return FL_GRAY_RAMP; // black from gray ramp else return (Fl_Color)(FL_COLOR_CUBE-1); // white from gray ramp } // -// End of "$Id: fl_color.cxx,v 1.10 1999/01/13 15:56:22 mike Exp $". +// End of "$Id: fl_color.cxx,v 1.11 1999/01/19 19:10:39 mike Exp $". // |