diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-20 06:03:12 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-20 06:03:12 (GMT) |
commit | d20cd9d967caa52f959837fce8d531c9319231d4 (patch) | |
tree | b0550f678028544c4bc88c308e065ffb6ac677f9 /xlib | |
parent | 77e0c5e9fb76f2aa4dd4f3d9545f3bf22b77cdc4 (diff) | |
parent | 63b6554668963fa5a4b94cd64931e556ad154fcb (diff) | |
download | tk-d20cd9d967caa52f959837fce8d531c9319231d4.zip tk-d20cd9d967caa52f959837fce8d531c9319231d4.tar.gz tk-d20cd9d967caa52f959837fce8d531c9319231d4.tar.bz2 |
Merge core-8-6-branch (merge-mark and eol-spacing)
Diffstat (limited to 'xlib')
-rw-r--r-- | xlib/xcolors.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xlib/xcolors.c b/xlib/xcolors.c index 36dc67c..78fd44b 100644 --- a/xlib/xcolors.c +++ b/xlib/xcolors.c @@ -350,11 +350,11 @@ XParseColor( * digits in the spec. Ergo, it is not a vailid color string. * (Bug f0188aca9e) */ - + if (*p != '\0') { return 0; } - + switch ((int)(p-spec)) { case 3: colorPtr->red = US(((value >> 8) & 0xf) * 0x1111); |