diff options
| author | Bill Spitzak <spitzak@gmail.com> | 1999-10-19 04:50:34 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 1999-10-19 04:50:34 +0000 |
| commit | 06ea565dbae6fdb6a5f55f61b50f925540c5f1af (patch) | |
| tree | baa435e7a71b590a407b83f6139905254c2b62d0 | |
| parent | 2e58f174f70543d4e8da74c5f04371fd06f051b2 (diff) | |
Fixed configure uversion for Irix 6.5
Fix (untested) xparsecolor emulation on Win32 for #x where x != 6 digits
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@789 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | src/Fl_get_system_colors.cxx | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 80072ca40..4540ecd8e 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl# -*- sh -*- dnl# the "configure" script is made from this by running GNU "autoconf" dnl# -dnl# "$Id: configure.in,v 1.33.2.5 1999/08/09 13:35:04 mike Exp $" +dnl# "$Id: configure.in,v 1.33.2.6 1999/10/19 04:50:32 bill Exp $" dnl# dnl# Configuration script for the Fast Light Tool Kit (FLTK). dnl# @@ -41,7 +41,8 @@ DSONAME="" dnl# Get the operating system and version number... uname=`uname` -uversion=`uname -r | sed -e '1,$s/[[-.A-Za-z]]//g'` +uversion=`uname -r | sed -e 's/-.*$//g;s/\.//g'` +dnl# uversion=`uname -r | sed -e '1,$s/[[-.A-Za-z]]//g'` if test "$uname" = "IRIX64"; then uname="IRIX" fi @@ -247,5 +248,5 @@ AC_CONFIG_HEADER(config.h:configh.in) AC_OUTPUT(makeinclude) dnl# -dnl# End of "$Id: configure.in,v 1.33.2.5 1999/08/09 13:35:04 mike Exp $". +dnl# End of "$Id: configure.in,v 1.33.2.6 1999/10/19 04:50:32 bill Exp $". dnl# diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx index 4f3f898b2..3cae6e9a9 100644 --- a/src/Fl_get_system_colors.cxx +++ b/src/Fl_get_system_colors.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_get_system_colors.cxx,v 1.6 1999/01/13 15:57:38 mike Exp $" +// "$Id: Fl_get_system_colors.cxx,v 1.6.2.1 1999/10/19 04:50:34 bill Exp $" // // System color support for the Fast Light Tool Kit (FLTK). // @@ -75,6 +75,11 @@ int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b) { default: return 0; } int R,G,B; if (sscanf(p,pattern,&R,&G,&B) != 3) return 0; + switch(m) { + case 1: R *= 0x11; G *= 0x11; B *= 0x11; break; + case 3: R >>= 4; G >>= 4; B >>= 4; break; + case 4: R >>= 8; G >>= 8; B >>= 8; break; + } r = R; g = G; b = B; return 1; } @@ -127,5 +132,5 @@ void Fl::get_system_colors() #endif // -// End of "$Id: Fl_get_system_colors.cxx,v 1.6 1999/01/13 15:57:38 mike Exp $". +// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.1 1999/10/19 04:50:34 bill Exp $". // |