diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | generic/tkColor.c | 16 |
2 files changed, 1 insertions, 17 deletions
@@ -1,4 +1,4 @@ -2012-02-?? Jan Nijtmans <nijtmans@users.sf.net> +2012-02-15 Jan Nijtmans <nijtmans@users.sf.net> * xlib/xcolors.c: [Bug 3486474]: Inconsistent color scaling * generic/tkColor.c: new internal function TkParseColor diff --git a/generic/tkColor.c b/generic/tkColor.c index d130ed6..8893dfe 100644 --- a/generic/tkColor.c +++ b/generic/tkColor.c @@ -375,22 +375,6 @@ Tk_NameOfColor(colorPtr) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); sprintf(tsdPtr->rgbString, "#%04x%04x%04x", colorPtr->red, colorPtr->green, colorPtr->blue); - /* If the string has the form #RSRSTUTUVWVW (where equal - * letters denote equal hexdigits) then this is - * equivalent to #RSTUVW. Then output the shorter form - * !!!! Only to be merged to Tcl 8.6, not earlier versions!!! */ - if ((tsdPtr->rgbString[1] == tsdPtr->rgbString[3]) - && (tsdPtr->rgbString[2] == tsdPtr->rgbString[4]) - && (tsdPtr->rgbString[5] == tsdPtr->rgbString[7]) - && (tsdPtr->rgbString[6] == tsdPtr->rgbString[8]) - && (tsdPtr->rgbString[9] == tsdPtr->rgbString[11]) - && (tsdPtr->rgbString[10] == tsdPtr->rgbString[12])) { - tsdPtr->rgbString[3] = tsdPtr->rgbString[5]; - tsdPtr->rgbString[4] = tsdPtr->rgbString[6]; - tsdPtr->rgbString[5] = tsdPtr->rgbString[9]; - tsdPtr->rgbString[6] = tsdPtr->rgbString[10]; - tsdPtr->rgbString[7] = '\0'; - } return tsdPtr->rgbString; } } |