Revision: 69990
http://sourceforge.net/p/brlcad/code/69990
Author: starseeker
Date: 2017-07-24 18:34:19 +0000 (Mon, 24 Jul 2017)
Log Message:
-----------
rename invert in a few files to avoid conflicts
Modified Paths:
--------------
brlcad/trunk/src/libgcv/bottess.c
brlcad/trunk/src/libicv/rot.c
Modified: brlcad/trunk/src/libgcv/bottess.c
===================================================================
--- brlcad/trunk/src/libgcv/bottess.c 2017-07-24 16:47:23 UTC (rev 69989)
+++ brlcad/trunk/src/libgcv/bottess.c 2017-07-24 18:34:19 UTC (rev 69990)
@@ -301,7 +301,7 @@
union tree *
-invert(union tree *tree)
+_tree_invert(union tree *tree)
{
struct soup_s *s;
unsigned long int i;
@@ -468,7 +468,7 @@
case OP_INTERSECT:
return compose(tr->tr_b.tb_left, tr->tr_b.tb_right, INSIDE, SAME,
INSIDE);
case OP_SUBTRACT:
- return invert(compose(tr->tr_b.tb_left, invert(tr->tr_b.tb_right),
OUTSIDE, OPPOSITE, INSIDE));
+ return _tree_invert(compose(tr->tr_b.tb_left,
_tree_invert(tr->tr_b.tb_right), OUTSIDE, OPPOSITE, INSIDE));
default:
bu_bomb("bottess evaluate(): bad op (second pass, CSG)\n");
}
Modified: brlcad/trunk/src/libicv/rot.c
===================================================================
--- brlcad/trunk/src/libicv/rot.c 2017-07-24 16:47:23 UTC (rev 69989)
+++ brlcad/trunk/src/libicv/rot.c 2017-07-24 18:34:19 UTC (rev 69990)
@@ -49,6 +49,7 @@
#include "bu/malloc.h"
#include "bn.h"
+/* TODO: Yuck... why are we using globals for all this?? */
ssize_t buflines, scanbytes;
ssize_t firsty = -1; /* first "y" scanline in buffer */
@@ -59,7 +60,7 @@
ssize_t nxin = 512;
ssize_t nyin = 512;
ssize_t yin, xout, yout;
-int plus90, minus90, reverse, invert;
+int plus90, minus90, reverse, rot_invert;
size_t pixbytes = 1;
@@ -86,7 +87,7 @@
reverse++;
break;
case 'i':
- invert++;
+ rot_invert++;
break;
case '#':
pixbytes = atoi(bu_optarg);
@@ -397,7 +398,7 @@
}
outplace += buflines*pixbytes;
}
- } else if (invert) {
+ } else if (rot_invert) {
for (y = lasty+1; (ssize_t)y > firsty; y--) {
yout = (nyin - 1) - y + 1;
outbyte = yout * scanbytes;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
