From 3e686781c3efcb821075da81e14c1ce366f88447 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 17 Mar 2011 07:40:05 +0000 Subject: Missing past ChangeLog entry, and unbreak debug-build. --- ChangeLog | 6 ++++++ generic/tkCanvUtil.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0f6821..2bf565d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ Backported from TEA, but kept all original platform code which was removed from TEA. +2011-03-14 Jan Nijtmans + + * 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 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); } } -- cgit v0.12