summaryrefslogtreecommitdiffstats
path: root/generic/tkCanvLine.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-10-25 21:06:25 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-10-25 21:06:25 (GMT)
commit0d5336db012f45753abace489f18f0ca299c6961 (patch)
treeb1bf3280a9046df99226158978502eeb26f5b0a3 /generic/tkCanvLine.c
parente97381a6d921de403516d5b761539a450f4af83c (diff)
parent1320b8a2a9c1269a345d44d673a7a35707fbbe9c (diff)
downloadtk-core-tip-626.zip
tk-core-tip-626.tar.gz
tk-core-tip-626.tar.bz2
Merge 9.0core-tip-626
Diffstat (limited to 'generic/tkCanvLine.c')
-rw-r--r--generic/tkCanvLine.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index d03d364..0b04353 100644
--- a/generic/tkCanvLine.c
+++ b/generic/tkCanvLine.c
@@ -187,7 +187,7 @@ static const Tk_ConfigSpec configSpecs[] = {
NULL, offsetof(LineItem, outline.dash),
TK_CONFIG_NULL_OK, &dashOption},
{TK_CONFIG_PIXELS, "-dashoffset", NULL, NULL,
- "0", offsetof(LineItem, outline.offset), TK_CONFIG_DONT_SET_DEFAULT, NULL},
+ "0", offsetof(LineItem, outline.offsetObj), TK_CONFIG_OBJS, NULL},
{TK_CONFIG_CUSTOM, "-disableddash", NULL, NULL,
NULL, offsetof(LineItem, outline.disabledDash),
TK_CONFIG_NULL_OK, &dashOption},
@@ -704,10 +704,10 @@ ComputeLineBbox(
width = 1.0;
}
if (linePtr->arrow != ARROWS_NONE) {
- if (linePtr->arrow != ARROWS_LAST) {
+ if (linePtr->arrow != ARROWS_LAST && linePtr->firstArrowPtr) {
TkIncludePoint((Tk_Item *) linePtr, linePtr->firstArrowPtr);
}
- if (linePtr->arrow != ARROWS_FIRST) {
+ if (linePtr->arrow != ARROWS_FIRST && linePtr->lastArrowPtr) {
TkIncludePoint((Tk_Item *) linePtr, linePtr->lastArrowPtr);
}
}
@@ -1018,7 +1018,7 @@ LineInsert(
newCoordPtr[i+objc] = linePtr->coordPtr[i];
}
if (linePtr->coordPtr) {
- ckfree(linePtr->coordPtr);
+ ckfree(linePtr->coordPtr);
}
linePtr->coordPtr = newCoordPtr;
length += objc ;