diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-03-17 07:40:05 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-03-17 07:40:05 (GMT) |
commit | 3e686781c3efcb821075da81e14c1ce366f88447 (patch) | |
tree | 26b2ba1b24ef9e28e45eb5b743759631e25f56e1 | |
parent | b65b33796f21432b49507efd59385268d77045f4 (diff) | |
download | tk-3e686781c3efcb821075da81e14c1ce366f88447.zip tk-3e686781c3efcb821075da81e14c1ce366f88447.tar.gz tk-3e686781c3efcb821075da81e14c1ce366f88447.tar.bz2 |
Missing past ChangeLog entry, and unbreak debug-build.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | generic/tkCanvUtil.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -5,6 +5,12 @@ Backported from TEA, but kept all original platform code which was removed from TEA. +2011-03-14 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tkBind.c: Eliminate some more unneeded write-only + * generic/tkCanvUtil.c: variables (discovered by gcc-4.6) + * generic/tkFocus.c: + 2011-03-12 Donal K. Fellows <dkf@users.sf.net> Remove casts from uses of ckalloc/ckfree/... now that Tcl declares diff --git a/generic/tkCanvUtil.c b/generic/tkCanvUtil.c index 60f06c7..a49e3f6 100644 --- a/generic/tkCanvUtil.c +++ b/generic/tkCanvUtil.c @@ -1770,7 +1770,7 @@ TkCanvTranslatePath( b[numOutput*2] = -yN; b[numOutput*2 + 1] = xClip; numOutput++; - assert(numOutput <= maxOutput); + assert(numOutput <= numVertex*3); priorY = yN; inside = 0; } else if (i == 0) { @@ -1809,14 +1809,14 @@ TkCanvTranslatePath( b[numOutput*2] = -yN; b[numOutput*2 + 1] = xClip; numOutput++; - assert(numOutput <= maxOutput); + assert(numOutput <= numVertex*3); } inside = 1; } b[numOutput*2] = -y; b[numOutput*2 + 1] = x; numOutput++; - assert(numOutput <= maxOutput); + assert(numOutput <= numVertex*3); } } |