Revision: 56531
http://sourceforge.net/p/brlcad/code/56531
Author: brlcad
Date: 2013-08-04 20:50:33 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
remove dead code
Modified Paths:
--------------
brlcad/trunk/src/libfb/if_X.c
brlcad/trunk/src/liboptical/sh_gauss.c
brlcad/trunk/src/liboptical/sh_grass.c
brlcad/trunk/src/liboptical/sh_light.c
brlcad/trunk/src/liboptical/sh_text.c
Modified: brlcad/trunk/src/libfb/if_X.c
===================================================================
--- brlcad/trunk/src/libfb/if_X.c 2013-08-04 20:37:35 UTC (rev 56530)
+++ brlcad/trunk/src/libfb/if_X.c 2013-08-04 20:50:33 UTC (rev 56531)
@@ -1532,11 +1532,7 @@
register unsigned char *mbuffer, mvalue; /* monochrome bitmap buffer */
register unsigned char *mpbuffer; /* monochrome byte buffer */
register int row, col, bit;
-#if 1
static unsigned char MSB[8] = { 0x80, 0x40, 0x20, 0x10, 8, 4, 2, 1 };
-#else
- static unsigned char LSB[8] = { 1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80 };
-#endif
register unsigned char *bits = MSB; /*XXX - for RT, Sun, etc. */
error1 = (int *)malloc((unsigned)(width+1) * sizeof(int));
Modified: brlcad/trunk/src/liboptical/sh_gauss.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_gauss.c 2013-08-04 20:37:35 UTC (rev
56530)
+++ brlcad/trunk/src/liboptical/sh_gauss.c 2013-08-04 20:50:33 UTC (rev
56531)
@@ -461,17 +461,13 @@
span, step_dist, steps);
}
-#if 1
+
for (dist=seg_p->seg_in.hit_dist; dist < seg_p->seg_out.hit_dist; dist +=
step_dist) {
VJOIN1(pt, ap->a_ray.r_pt, dist, ap->a_ray.r_dir);
optical_density += gauss_eval(pt, ell_p->v, dbint->one_sigma);
}
-
return optical_density;
-#else
- return gauss_eval(ell_p->v, ell_p->v, dbint->one_sigma);
-#endif
}
Modified: brlcad/trunk/src/liboptical/sh_grass.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_grass.c 2013-08-04 20:37:35 UTC (rev
56530)
+++ brlcad/trunk/src/liboptical/sh_grass.c 2013-08-04 20:50:33 UTC (rev
56531)
@@ -419,17 +419,10 @@
/* pick a length for the blade */
tmp = (double)seg / (double)BLADE_SEGS_MAX;
+ /* magic */
+ grass_sp->proto.b[blade].leaf[seg].len = seg_len * .25 + tmp *
(seg_len*1.75);
+ grass_sp->proto.b[blade].tot_len +=
grass_sp->proto.b[blade].leaf[seg].len;
- grass_sp->proto.b[blade].leaf[seg].len =
-#if 1
- seg_len * .25 + tmp * (seg_len*1.75);
-#else
- (grass_sp->t*.8) + seg * (grass_sp->t*.5);
-#endif
- grass_sp->proto.b[blade].tot_len +=
- grass_sp->proto.b[blade].leaf[seg].len;
-
-
VUNITIZE(grass_sp->proto.b[blade].leaf[seg].blade);
VCROSS(left, grass_sp->proto.b[blade].leaf[seg].blade, z_axis);
VUNITIZE(left);
@@ -594,7 +587,6 @@
}
}
-#if 1
/* plot bounding Box */
pl_color(r->fd, 100, 200, 100);
pdv_3move(r->fd, pl->pmin);
@@ -610,7 +602,6 @@
pd_3cont(r->fd, pl->pmin[X], pl->pmax[Y], pl->pmax[Z]);
pd_3cont(r->fd, pl->pmin[X], pl->pmin[Y], pl->pmax[Z]);
-#endif
pl_color(r->fd, 255, 255, 255);
bu_semaphore_release(BU_SEM_SYSCALL);
}
Modified: brlcad/trunk/src/liboptical/sh_light.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_light.c 2013-08-04 20:37:35 UTC (rev
56530)
+++ brlcad/trunk/src/liboptical/sh_light.c 2013-08-04 20:50:33 UTC (rev
56531)
@@ -1095,7 +1095,6 @@
}
/* if the region we hit is a light source be generous */
-#if 1
{
struct light_specific *lspi;
for (BU_LIST_FOR(lspi, light_specific, &(LightHead.l))) {
@@ -1112,7 +1111,7 @@
}
}
}
-#endif
+
/* or something further away than a finite invisible light */
if (lsp->lt_invisible && !(lsp->lt_infinite)) {
vect_t tolight;
Modified: brlcad/trunk/src/liboptical/sh_text.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_text.c 2013-08-04 20:37:35 UTC (rev
56530)
+++ brlcad/trunk/src/liboptical/sh_text.c 2013-08-04 20:50:33 UTC (rev
56531)
@@ -292,7 +292,6 @@
xmin * (tp->tx_w-1), ymin * (tp->tx_n-1),
xmax * (tp->tx_w-1), ymax * (tp->tx_n-1));
-#if 1
dx = (int)(xmax * (tp->tx_w-1)) - (int)(xmin * (tp->tx_w-1));
dy = (int)(ymax * (tp->tx_n-1)) - (int)(ymin * (tp->tx_n-1));
@@ -396,52 +395,7 @@
if (rdebug & RDEBUG_SHADE)
bu_log(" average: %g %g %g\n", r, g, b);
-#else
- x = xmin * (tp->tx_w-1);
- y = ymin * (tp->tx_n-1);
- dx = (xmax - xmin) * (tp->tx_w-1);
- dy = (ymax - ymin) * (tp->tx_n-1);
- if (dx < 1) dx = 1;
- if (dy < 1) dy = 1;
-
- if (rdebug & RDEBUG_SHADE)
- bu_log(" in txt_render(): x=%d y=%d, dx=%d, dy=%d\n", x, y, dx, dy);
-
- r = g = b = 0;
- for (line=0; line<dy; line++) {
- register unsigned char *cp;
- register unsigned char *ep;
-
- if (tp->tx_mp) {
- cp = ((unsigned char *)(tp->tx_mp->buf)) +
- (y+line) * tp->tx_w * 3 + x * 3;
- } else if (tp->tx_binunifp) {
- cp = ((unsigned char *)(tp->tx_binunifp->u.unit8)) +
- (y+line) * tp->tx_w * 3 + x * 3;
- } else {
- /* not reachable */
- bu_bomb("sh_text.c -- Unable to read datasource\n");
- }
-
- ep = cp + 3*dx;
- while (cp < ep) {
- if (rdebug & RDEBUG_SHADE)
- bu_log("\tAdding %d %d %d\n", *cp, *(cp+1), *(cp+2));
- r += *cp++;
- g += *cp++;
- b += *cp++;
- }
- }
- if (rdebug & RDEBUG_SHADE)
- bu_log("Totals: %d %d %d, ", r, g, b);
- r /= (dx*dy);
- g /= (dx*dy);
- b /= (dx*dy);
- if (rdebug & RDEBUG_SHADE)
- bu_log(" average: %d %d %d\n", r, g, b);
-#endif
-
if (!tp->tx_trans_valid) {
opaque:
VSET(swp->sw_color,
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
