diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-13 14:51:58 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-13 14:51:58 (GMT) |
commit | 40b76dbd4f4479294a9cd461da0400e31734ac2b (patch) | |
tree | 0b9c811cef1183d76e05a6ac238b5652de5bb12d /generic/tkCanvImg.c | |
parent | ad423a347178d6279b112f7031e683c7e15d798a (diff) | |
parent | 75aab96f3ddb340be5aecbb880f1af2a07d9ec25 (diff) | |
download | tk-40b76dbd4f4479294a9cd461da0400e31734ac2b.zip tk-40b76dbd4f4479294a9cd461da0400e31734ac2b.tar.gz tk-40b76dbd4f4479294a9cd461da0400e31734ac2b.tar.bz2 |
Merge 8.7
Diffstat (limited to 'generic/tkCanvImg.c')
-rw-r--r-- | generic/tkCanvImg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkCanvImg.c b/generic/tkCanvImg.c index 0d4aa9d..76b3689 100644 --- a/generic/tkCanvImg.c +++ b/generic/tkCanvImg.c @@ -449,7 +449,7 @@ ComputeImageBbox( x = (int) (imgPtr->x + ((imgPtr->x >= 0) ? 0.5 : - 0.5)); y = (int) (imgPtr->y + ((imgPtr->y >= 0) ? 0.5 : - 0.5)); - if ((state == TK_STATE_HIDDEN) || (image == None)) { + if ((state == TK_STATE_HIDDEN) || (image == NULL)) { imgPtr->header.x1 = imgPtr->header.x2 = x; imgPtr->header.y1 = imgPtr->header.y2 = y; return; |