diff options
| -rw-r--r-- | src/bltGrElemLineSpline.C | 4 | ||||
| -rw-r--r-- | src/bltGrMisc.C | 1 | ||||
| -rw-r--r-- | src/bltGrText.C | 4 | ||||
| -rw-r--r-- | src/bltGraph.C | 2 | ||||
| -rw-r--r-- | src/bltSwitch.C | 5 | ||||
| -rw-r--r-- | src/bltVecCmd.C | 2 | ||||
| -rw-r--r-- | src/bltVector.C | 3 |
7 files changed, 3 insertions, 18 deletions
diff --git a/src/bltGrElemLineSpline.C b/src/bltGrElemLineSpline.C index c0b1bcf..fda5bf5 100644 --- a/src/bltGrElemLineSpline.C +++ b/src/bltGrElemLineSpline.C @@ -28,11 +28,10 @@ * */ -extern "C" { -#include <assert.h> #include <float.h> #include <math.h> +extern "C" { #include "bltInt.h" #include "bltSpline.h" #include "bltOp.h" @@ -1274,7 +1273,6 @@ Blt_CatromParametricSpline(Point2d *points, int nPoints, Point2d *intpPts, for (i = 0; i < nIntpPts; i++) { interval = (int)intpPts[i].x; t = intpPts[i].y; - assert(interval < nPoints); CatromCoeffs(origPts + interval, &a, &b, &c, &d); intpPts[i].x = (d.x + t * (c.x + t * (b.x + t * a.x))) / 2.0; intpPts[i].y = (d.y + t * (c.y + t * (b.y + t * a.y))) / 2.0; diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C index 11002de..c01f2db 100644 --- a/src/bltGrMisc.C +++ b/src/bltGrMisc.C @@ -27,7 +27,6 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <assert.h> #include <stdarg.h> #include <X11/Xlib.h> diff --git a/src/bltGrText.C b/src/bltGrText.C index e78ac6c..1f3f0e5 100644 --- a/src/bltGrText.C +++ b/src/bltGrText.C @@ -27,12 +27,10 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -extern "C" { -#include <assert.h> - #include <X11/Xlib.h> #include <X11/Xutil.h> +extern "C" { #include <tk.h> #include <tkPort.h> #include <tkInt.h> diff --git a/src/bltGraph.C b/src/bltGraph.C index 80d221e..6150e93 100644 --- a/src/bltGraph.C +++ b/src/bltGraph.C @@ -995,11 +995,9 @@ void Blt_GraphTags(Blt_BindTable table, ClientData object, ClientData context, tagProc = Blt_MakeMarkerTag; break; case CID_NONE: - Blt_Panic("unknown object type"); tagProc = NULL; break; default: - Blt_Panic("bogus object type"); tagProc = NULL; break; } diff --git a/src/bltSwitch.C b/src/bltSwitch.C index 801dc6e..323a761 100644 --- a/src/bltSwitch.C +++ b/src/bltSwitch.C @@ -27,10 +27,9 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -extern "C" { -#include <assert.h> #include <stdarg.h> +extern "C" { #include "bltInt.h" #include "bltSwitch.h" }; @@ -229,7 +228,6 @@ static int DoSwitch(Tcl_Interp* interp, Blt_SwitchSpec *sp, break; case BLT_SWITCH_CUSTOM: - assert(sp->customPtr != NULL); if ((*sp->customPtr->parseProc)(sp->customPtr->clientData, interp, sp->switchName, objPtr, (char *)record, sp->offset, sp->flags) != TCL_OK) { @@ -348,7 +346,6 @@ void Blt_FreeSwitches(Blt_SwitchSpec *specs, void *record, int needFlags) break; case BLT_SWITCH_CUSTOM: - assert(sp->customPtr != NULL); if ((*(char **)ptr != NULL) && (sp->customPtr->freeProc != NULL)) { (*sp->customPtr->freeProc)((char *)record, sp->offset, diff --git a/src/bltVecCmd.C b/src/bltVecCmd.C index beb70f1..f9303d0 100644 --- a/src/bltVecCmd.C +++ b/src/bltVecCmd.C @@ -46,7 +46,6 @@ * x notify reorder #1 #2 */ -#include <assert.h> #include <math.h> #include <float.h> @@ -1031,7 +1030,6 @@ PopulateOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) } count++; *valuePtr = vPtr->valueArr[i]; - assert(count == v2Ptr->length); if (!isNew) { if (v2Ptr->flush) { Blt_Vec_FlushCache(v2Ptr); diff --git a/src/bltVector.C b/src/bltVector.C index 23dee15..7d4764a 100644 --- a/src/bltVector.C +++ b/src/bltVector.C @@ -43,7 +43,6 @@ * x notify reorder #1 #2 */ -#include <assert.h> #include <float.h> #include <math.h> #include <time.h> @@ -881,8 +880,6 @@ Blt_Vec_SetSize( } } - assert(vPtr->valueArr != NULL); - /* * We're not using the old storage anymore, so free it if it's not * TCL_STATIC. It's static because the user previously reset the |