diff options
author | fvogel <fvogel@noemail.net> | 2015-11-28 21:39:01 (GMT) |
---|---|---|
committer | fvogel <fvogel@noemail.net> | 2015-11-28 21:39:01 (GMT) |
commit | 6d3ba7e74093ae7b3b348e4ff84126fe6d3d2e86 (patch) | |
tree | d4b7a8e4a8aecf0df7555c16042cbdf7f405413c /generic | |
parent | d6581f54b2345c448066cf922fbbb41c6bf28209 (diff) | |
parent | a55ffed8e161cc27ada6ab5618acc81d98a65153 (diff) | |
download | tk-6d3ba7e74093ae7b3b348e4ff84126fe6d3d2e86.zip tk-6d3ba7e74093ae7b3b348e4ff84126fe6d3d2e86.tar.gz tk-6d3ba7e74093ae7b3b348e4ff84126fe6d3d2e86.tar.bz2 |
Merged core-8-5branch
FossilOrigin-Name: ff1b18fe04cf7352426eeb6bc8cac27dbc8c11b0
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkImgPhoto.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 780b0c2..47aa523 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -2454,7 +2454,11 @@ ImgPhotoGet( } XFree((char *) visInfoPtr); - sprintf(buf, ((mono) ? "%d": "%d/%d/%d"), nRed, nGreen, nBlue); + if (mono) { + sprintf(buf, "%d", nRed); + } else { + sprintf(buf, "%d/%d/%d", nRed, nGreen, nBlue); + } instancePtr->defaultPalette = Tk_GetUid(buf); /* |