diff options
author | dgp <dgp@users.sourceforge.net> | 2015-11-30 21:21:48 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2015-11-30 21:21:48 (GMT) |
commit | a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a (patch) | |
tree | 24ccb2318d04412685b1a4262df7c33df0864d34 /generic/tkImgPhoto.c | |
parent | ddb9e825e0b85f216d172f8b537257c8d58b0de9 (diff) | |
parent | b8bfd3505b511a3cc94297df7f04c55505d6df2c (diff) | |
download | tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.zip tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.tar.gz tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.tar.bz2 |
merge 8.5
Diffstat (limited to 'generic/tkImgPhoto.c')
-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); /* |