Revision: 56557
http://sourceforge.net/p/brlcad/code/56557
Author: brlcad
Date: 2013-08-05 04:36:08 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
more dead code elimination
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/ebm/ebm.c
brlcad/trunk/src/librt/primitives/ehy/ehy.c
brlcad/trunk/src/librt/primitives/ell/ell.c
Modified: brlcad/trunk/src/librt/primitives/ebm/ebm.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ebm/ebm.c 2013-08-05 04:22:12 UTC (rev
56556)
+++ brlcad/trunk/src/librt/primitives/ebm/ebm.c 2013-08-05 04:36:08 UTC (rev
56557)
@@ -370,20 +370,6 @@
rp->r_pt[Y]) * invdir[Y];
delta[Y] = ebmp->ebm_cellsize[Y] * fabs(invdir[Y]);
}
-#if 0
- /* Z setup */
- if (ZERO(rp->r_dir[Z])) {
- t[Z] = INFINITY;
- } else {
- /* Consider igrid[Z] to be either 0 or 1 */
- if (rp->r_dir[Z] < 0) {
- t[Z] = (ebmp->ebm_origin[Z] + ebmp->ebm_cellsize[Z] -
- rp->r_pt[Z]) * invdir[Z];
- } else {
- t[Z] = (ebmp->ebm_origin[Z] - rp->r_pt[Z]) * invdir[Z];
- }
- }
-#endif
/* The delta[] elements *must* be positive, as t must increase */
if (RT_G_DEBUG&DEBUG_EBM)bu_log("t[X] = %g, delta[X] = %g\n", t[X],
delta[X]);
Modified: brlcad/trunk/src/librt/primitives/ehy/ehy.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ehy/ehy.c 2013-08-05 04:22:12 UTC (rev
56556)
+++ brlcad/trunk/src/librt/primitives/ehy/ehy.c 2013-08-05 04:36:08 UTC (rev
56557)
@@ -263,10 +263,6 @@
struct ehy_specific *ehy;
fastf_t magsq_h;
-#if 0
- /* unused compile error */
- fastf_t mag_a;
-#endif
fastf_t mag_h;
fastf_t c, r1, r2;
mat_t R;
@@ -281,10 +277,6 @@
return -2;
}
-#if 0
- /* unused compile error */
- mag_a = MAGSQ(xip->ehy_Au); /* a is unit vector, so |A|^2 == |A| */
-#endif
magsq_h = MAGSQ(xip->ehy_H);
mag_h = sqrt(magsq_h);
r1 = xip->ehy_r1;
@@ -1190,10 +1182,6 @@
int
rt_ehy_tess(struct nmgregion **r, struct model *m, struct rt_db_internal *ip,
const struct rt_tess_tol *ttol, const struct bn_tol *tol)
{
-#if 0
- /* unused compile error */
- fastf_t mag_a;
-#endif
fastf_t c, dtol, mag_h, ntol, r1, r2, cprime;
fastf_t **ellipses, theta_prev, theta_new;
int *pts_dbl, face, i, j, nseg;
@@ -1223,10 +1211,6 @@
return 1;
}
-#if 0
- /* unused compile error */
- mag_a = MAGSQ(xip->ehy_Au); /* a is unit vector, so |A|^2 == |A| */
-#endif
mag_h = MAGNITUDE(xip->ehy_H);
c = xip->ehy_c;
cprime = c / mag_h;
Modified: brlcad/trunk/src/librt/primitives/ell/ell.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ell/ell.c 2013-08-05 04:22:12 UTC (rev
56556)
+++ brlcad/trunk/src/librt/primitives/ell/ell.c 2013-08-05 04:36:08 UTC (rev
56557)
@@ -1829,33 +1829,7 @@
int
rt_ell_params(struct pc_pc_set *UNUSED(pcs), const struct rt_db_internal
*UNUSED(ip))
{
-#if 0
- struct rt_ell_internal *eip;
- eip = (struct rt_ell_internal *)ip->idb_ptr;
-
- if (!pcs) return 0;
-
- pcs->ps = bu_calloc(pcs->n_params, sizeof (struct pc_param), "pc_param");
- pcs->cs = bu_calloc(pcs->n_constraints, sizeof (struct pc_constrnt),
"pc_constrnt");
-
- bu_vls_strcpy(&(pcs->ps[0].name), "V");
- pcs->ps[0].ptype = pc_point;
- pcs->ps[0].pval.pointp = (pointp_t) &(eip->v);
-
- bu_vls_strcpy(&(pcs->ps[1].name), "A");
- pcs->ps[1].ptype = pc_vector;
- pcs->ps[1].pval.vectorp = (vectp_t) &(eip->a);
-
- bu_vls_strcpy(&(pcs->ps[2].name), "B");
- pcs->ps[2].ptype = pc_vector;
- pcs->ps[2].pval.vectorp = (vectp_t) &(eip->b);
-
- bu_vls_strcpy(&(pcs->ps[3].name), "C");
- pcs->ps[3].ptype = pc_value;
- pcs->ps[3].pval.vectorp = (vectp_t) &(eip->c);
-#endif
-
- return 0; /* OK */
+ return -1; /* FAIL */
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
