summaryrefslogtreecommitdiffstats
path: root/generic/tkCanvas.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-07-30 13:45:21 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-07-30 13:45:21 (GMT)
commit0bc5aa8a4426d81a3e4419b0e9b2f6cb3261dff2 (patch)
tree382d7656e7df451a5bcf9d85cc4d3b5764f5be83 /generic/tkCanvas.c
parent3c99c05460738cfe089b15839984f9d09112bd86 (diff)
parent1ab87b68045ba6b3538301fd0d976bf4fbdd5d46 (diff)
downloadtk-0bc5aa8a4426d81a3e4419b0e9b2f6cb3261dff2.zip
tk-0bc5aa8a4426d81a3e4419b0e9b2f6cb3261dff2.tar.gz
tk-0bc5aa8a4426d81a3e4419b0e9b2f6cb3261dff2.tar.bz2
Merge 8.6. Use TCL_INDEX_NONE in a few more places, now that we have it.
Diffstat (limited to 'generic/tkCanvas.c')
-rw-r--r--generic/tkCanvas.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 9a310d0..1c70055 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -613,7 +613,7 @@ DefaultRotateImplementation(
if (ItemCoords(canvasPtr, itemPtr, 0, NULL) == TCL_OK &&
Tcl_ListObjGetElements(NULL, Tcl_GetObjResult(interp),
&objc, &objv) == TCL_OK) {
- coordv = (double *) Tcl_Alloc(sizeof(double) * objc);
+ coordv = (double *) ckalloc(sizeof(double) * objc);
for (i=0 ; i<objc ; i++) {
if (Tcl_GetDoubleFromObj(NULL, objv[i], &coordv[i]) != TCL_OK) {
ok = 0;
@@ -639,7 +639,7 @@ DefaultRotateImplementation(
* Write the coordinates back into the item.
*/
- newObjv = (Tcl_Obj **) Tcl_Alloc(sizeof(Tcl_Obj *) * objc);
+ newObjv = (Tcl_Obj **) ckalloc(sizeof(Tcl_Obj *) * objc);
for (i=0 ; i<objc ; i++) {
newObjv[i] = Tcl_NewDoubleObj(coordv[i]);
Tcl_IncrRefCount(newObjv[i]);
@@ -648,9 +648,9 @@ DefaultRotateImplementation(
for (i=0 ; i<objc ; i++) {
Tcl_DecrRefCount(newObjv[i]);
}
- Tcl_Free((char *) newObjv);
+ ckfree((char *) newObjv);
}
- Tcl_Free((char *) coordv);
+ ckfree((char *) coordv);
}
/*