summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2013-09-04 19:29:46 (GMT)
committerjoye <joye>2013-09-04 19:29:46 (GMT)
commit13eb4e5c85ae7b9c1480253aaa81ac4c85ce561a (patch)
tree3526f6e03ab048b59f7ebfe73801bbd5d77b99d6
parent4b38ca7df5b658d6b24afb68cf1d506055636e95 (diff)
downloadblt-13eb4e5c85ae7b9c1480253aaa81ac4c85ce561a.zip
blt-13eb4e5c85ae7b9c1480253aaa81ac4c85ce561a.tar.gz
blt-13eb4e5c85ae7b9c1480253aaa81ac4c85ce561a.tar.bz2
*** empty log message ***
-rw-r--r--src/bltGrAxis.C2
-rw-r--r--src/bltGrElemBar.C6
-rw-r--r--src/bltGrElemOp.C4
-rw-r--r--src/bltGrLegd.C1
-rw-r--r--src/bltGrMarker.C4
-rw-r--r--src/bltGrMisc.C14
6 files changed, 5 insertions, 26 deletions
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 07b7fa2..c55b00f 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -2022,7 +2022,7 @@ DestroyAxis(Axis *axisPtr)
Blt_Chain_DeleteLink(axisPtr->chain, axisPtr->link);
}
if (axisPtr->obj.name != NULL) {
- free(axisPtr->obj.name);
+ free((void*)(axisPtr->obj.name));
}
if (axisPtr->hashPtr != NULL) {
Blt_DeleteHashEntry(&graphPtr->axes.table, axisPtr->hashPtr);
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index 00ed1dc..7b7efaf 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -420,12 +420,6 @@ static ElementToPostScriptProc NormalBarToPostScriptProc;
static ElementSymbolToPostScriptProc SymbolToPostScriptProc;
static ElementMapProc MapBarProc;
-INLINE static int
-Round(double x)
-{
- return (int) (x + ((x < 0.0) ? -0.5 : 0.5));
-}
-
/*
*---------------------------------------------------------------------------
* Custom option parse and print procedures
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index 1aefb6a..1571217 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -1267,10 +1267,10 @@ DestroyElement(Element *elemPtr)
Blt_DeleteHashEntry(&graphPtr->elements.table, elemPtr->hashPtr);
}
if (elemPtr->obj.name != NULL) {
- free(elemPtr->obj.name);
+ free((void*)(elemPtr->obj.name));
}
if (elemPtr->label != NULL) {
- free(elemPtr->label);
+ free((void*)(elemPtr->label));
}
free(elemPtr);
}
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index 88c6c8b..04c24aa 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -1965,7 +1965,6 @@ GetElementFromObj(Graph *graphPtr, Tcl_Obj *objPtr, Element **elemPtrPtr)
char c;
const char *string;
int last;
- int index;
legendPtr = graphPtr->legend;
interp = graphPtr->interp;
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 02a94ef..11c6480 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -1836,7 +1836,7 @@ DestroyMarker(Marker *markerPtr)
Blt_Chain_DeleteLink(graphPtr->markers.displayList, markerPtr->link);
}
if (markerPtr->obj.name != NULL) {
- free(markerPtr->obj.name);
+ free((void*)(markerPtr->obj.name));
}
free(markerPtr);
}
@@ -4202,7 +4202,7 @@ RenameMarker(Graph *graphPtr, Marker *markerPtr, const char *oldName,
hPtr = Blt_FindHashEntry(&graphPtr->markers.table, oldName);
Blt_DeleteHashEntry(&graphPtr->markers.table, hPtr);
if (oldName != NULL) {
- free(oldName);
+ free((void*)oldName);
}
return TCL_OK;
}
diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C
index 2b51606..377f93f 100644
--- a/src/bltGrMisc.C
+++ b/src/bltGrMisc.C
@@ -1991,20 +1991,6 @@ static Blt_OpSpec arcBallOps[] =
};
static int nArcBallOps = sizeof(arcBallOps) / sizeof(Blt_OpSpec);
-static int
-ArcBallCmd(ClientData clientData, Tcl_Interp *interp, int objc,
- Tcl_Obj *const *objv)
-{
- Tcl_ObjCmdProc *proc;
-
- proc = Blt_GetOpFromObj(interp, nArcBallOps, arcBallOps, BLT_OP_ARG1,
- objc, objv, 0);
- if (proc == NULL) {
- return TCL_ERROR;
- }
- return (*proc) (clientData, interp, objc, objv);
-}
-
#undef Tk_GetPixmap
Pixmap
Blt_GetPixmap(Display *display, Drawable drawable, int w, int h, int depth,