Revision: 73091
http://sourceforge.net/p/brlcad/code/73091
Author: brlcad
Date: 2019-05-20 06:20:41 +0000 (Mon, 20 May 2019)
Log Message:
-----------
indent consistency cleanup, make the BN vlist macros require a semicolon
Modified Paths:
--------------
brlcad/trunk/include/bn/vlist.h
brlcad/trunk/src/libbn/clip.c
brlcad/trunk/src/libbn/mat.c
brlcad/trunk/src/libbn/plane.c
brlcad/trunk/src/libbn/plot3.c
brlcad/trunk/src/libbn/str.c
brlcad/trunk/src/libbn/tabdata.c
brlcad/trunk/src/libbn/tests/bntester.c
brlcad/trunk/src/libbn/tests/complex.c
brlcad/trunk/src/libbn/tests/list.c
brlcad/trunk/src/libbn/tests/mat.c
brlcad/trunk/src/libbn/tests/qmath.c
brlcad/trunk/src/libbn/tests/randsph.c
brlcad/trunk/src/libbn/tests/sobolseq.c
brlcad/trunk/src/libbn/tests/tabdata.c
brlcad/trunk/src/libbn/ulp.c
brlcad/trunk/src/libbn/vert_tree.c
brlcad/trunk/src/libbn/vlist.c
brlcad/trunk/src/librt/primitives/annot/annot.c
brlcad/trunk/src/librt/primitives/sketch/sketch.c
Modified: brlcad/trunk/include/bn/vlist.h
===================================================================
--- brlcad/trunk/include/bn/vlist.h 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/include/bn/vlist.h 2019-05-20 06:20:41 UTC (rev 73091)
@@ -100,7 +100,7 @@
*
* Note that BN_GET_VLIST and BN_FREE_VLIST are non-PARALLEL.
*/
-#define BN_GET_VLIST(_free_hd, p) {\
+#define BN_GET_VLIST(_free_hd, p) do {\
(p) = BU_LIST_FIRST(bn_vlist, (_free_hd)); \
if (BU_LIST_IS_HEAD((p), (_free_hd))) { \
BU_ALLOC((p), struct bn_vlist); \
@@ -109,15 +109,15 @@
BU_LIST_DEQUEUE(&((p)->l)); \
} \
(p)->nused = 0; \
- }
+ } while (0)
/** Place an entire chain of bn_vlist structs on the freelist _free_hd */
-#define BN_FREE_VLIST(_free_hd, hd) { \
+#define BN_FREE_VLIST(_free_hd, hd) do { \
BU_CK_LIST_HEAD((hd)); \
BU_LIST_APPEND_LIST((_free_hd), (hd)); \
- }
+ } while (0)
-#define BN_ADD_VLIST(_free_hd, _dest_hd, pnt, draw) { \
+#define BN_ADD_VLIST(_free_hd, _dest_hd, pnt, draw) do { \
struct bn_vlist *_vp; \
BU_CK_LIST_HEAD(_dest_hd); \
_vp = BU_LIST_LAST(bn_vlist, (_dest_hd)); \
@@ -127,10 +127,10 @@
} \
VMOVE(_vp->pt[_vp->nused], (pnt)); \
_vp->cmd[_vp->nused++] = (draw); \
- }
+ } while (0)
/** Change the transformation matrix to display */
-#define BN_VLIST_SET_DISP_MAT(_free_hd, _dest_hd, _ref_pt) { \
+#define BN_VLIST_SET_DISP_MAT(_free_hd, _dest_hd, _ref_pt) do { \
struct bn_vlist *_vp; \
BU_CK_LIST_HEAD(_dest_hd); \
_vp = BU_LIST_LAST(bn_vlist, (_dest_hd)); \
@@ -140,10 +140,10 @@
} \
VMOVE(_vp->pt[_vp->nused], (_ref_pt)); \
_vp->cmd[_vp->nused++] = BN_VLIST_DISPLAY_MAT; \
-}
+ } while (0)
/** Change the transformation matrix to model */
-#define BN_VLIST_SET_MODEL_MAT(_free_hd, _dest_hd) { \
+#define BN_VLIST_SET_MODEL_MAT(_free_hd, _dest_hd) do { \
struct bn_vlist *_vp; \
BU_CK_LIST_HEAD(_dest_hd); \
_vp = BU_LIST_LAST(bn_vlist, (_dest_hd)); \
@@ -152,10 +152,10 @@
BU_LIST_INSERT((_dest_hd), &(_vp->l)); \
} \
_vp->cmd[_vp->nused++] = BN_VLIST_MODEL_MAT; \
-}
+ } while (0)
/** Set a point size to apply to the vlist elements that follow. */
-#define BN_VLIST_SET_POINT_SIZE(_free_hd, _dest_hd, _size) { \
+#define BN_VLIST_SET_POINT_SIZE(_free_hd, _dest_hd, _size) do { \
struct bn_vlist *_vp; \
BU_CK_LIST_HEAD(_dest_hd); \
_vp = BU_LIST_LAST(bn_vlist, (_dest_hd)); \
@@ -165,10 +165,10 @@
} \
_vp->pt[_vp->nused][0] = (_size); \
_vp->cmd[_vp->nused++] = BN_VLIST_POINT_SIZE; \
-}
+ } while (0)
/** Set a line width to apply to the vlist elements that follow. */
-#define BN_VLIST_SET_LINE_WIDTH(_free_hd, _dest_hd, _width) { \
+#define BN_VLIST_SET_LINE_WIDTH(_free_hd, _dest_hd, _width) do { \
struct bn_vlist *_vp; \
BU_CK_LIST_HEAD(_dest_hd); \
_vp = BU_LIST_LAST(bn_vlist, (_dest_hd)); \
@@ -178,7 +178,7 @@
} \
_vp->pt[_vp->nused][0] = (_width); \
_vp->cmd[_vp->nused++] = BN_VLIST_LINE_WIDTH; \
-}
+ } while (0)
BN_EXPORT extern size_t bn_vlist_cmd_cnt(struct bn_vlist *vlist);
Modified: brlcad/trunk/src/libbn/clip.c
===================================================================
--- brlcad/trunk/src/libbn/clip.c 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/src/libbn/clip.c 2019-05-20 06:20:41 UTC (rev 73091)
@@ -43,14 +43,14 @@
cval = 0;
if (x < clip_min)
- cval |= 01;
+ cval |= 01;
else if (x > clip_max)
- cval |= 02;
+ cval |= 02;
if (y < clip_min)
- cval |= 04;
+ cval |= 04;
else if (y > clip_max)
- cval |= 010;
+ cval |= 010;
return cval;
}
@@ -127,41 +127,41 @@
VSUB2(diff, b, a);
for (i = 0; i < 3; i++, pt++, dir++, max_pt++, min_pt++) {
- if (*dir < -EPSILON) {
+ if (*dir < -EPSILON) {
sv = (*min_pt - *pt) / *dir;
- if (sv < 0.0)
- return 0; /* MISS */
+ if (sv < 0.0)
+ return 0; /* MISS */
st = (*max_pt - *pt) / *dir;
V_MAX(mindist, st);
V_MIN(maxdist, sv);
- } else if (*dir > EPSILON) {
+ } else if (*dir > EPSILON) {
st = (*max_pt - *pt) / *dir;
- if (st < 0.0)
- return 0; /* MISS */
+ if (st < 0.0)
+ return 0; /* MISS */
sv = (*min_pt - *pt) / *dir;
V_MAX(mindist, sv);
V_MIN(maxdist, st);
- } else {
- /*
- * If direction component along this axis is NEAR 0,
- * (i.e., this ray is aligned with this axis),
- * merely check against the boundaries.
- */
- if ((*min_pt > *pt) || (*max_pt < *pt))
- return 0; /* MISS */
- }
+ } else {
+ /*
+ * If direction component along this axis is NEAR 0,
+ * (i.e., this ray is aligned with this axis),
+ * merely check against the boundaries.
+ */
+ if ((*min_pt > *pt) || (*max_pt < *pt))
+ return 0; /* MISS */
+ }
}
if (mindist >= maxdist)
- return 0; /* MISS */
+ return 0; /* MISS */
if (mindist > 1 || maxdist < 0)
- return 0; /* MISS */
+ return 0; /* MISS */
if (mindist <= 0 && maxdist >= 1)
- return 1; /* HIT, no clipping needed */
+ return 1; /* HIT, no clipping needed */
/* Don't grow one end of a contained segment */
V_MAX(mindist, 0);
Modified: brlcad/trunk/src/libbn/mat.c
===================================================================
--- brlcad/trunk/src/libbn/mat.c 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/src/libbn/mat.c 2019-05-20 06:20:41 UTC (rev 73091)
@@ -1116,8 +1116,8 @@
register fastf_t sum;
sum = m[0] * (m[5] * m[10] - m[6] * m[9])
- - m[1] * (m[4] * m[10] - m[6] * m[8])
- + m[2] * (m[4] * m[9] - m[5] * m[8]);
+ - m[1] * (m[4] * m[10] - m[6] * m[8])
+ + m[2] * (m[4] * m[9] - m[5] * m[8]);
return sum;
}
@@ -1130,20 +1130,20 @@
fastf_t sum;
det[0] = m[5] * (m[10] * m[15] - m[11] * m[14])
- - m[6] * (m[ 9] * m[15] - m[11] * m[13])
- + m[7] * (m[ 9] * m[14] - m[10] * m[13]);
+ - m[6] * (m[ 9] * m[15] - m[11] * m[13])
+ + m[7] * (m[ 9] * m[14] - m[10] * m[13]);
det[1] = m[4] * (m[10] * m[15] - m[11] * m[14])
- - m[6] * (m[ 8] * m[15] - m[11] * m[12])
- + m[7] * (m[ 8] * m[14] - m[10] * m[12]);
+ - m[6] * (m[ 8] * m[15] - m[11] * m[12])
+ + m[7] * (m[ 8] * m[14] - m[10] * m[12]);
det[2] = m[4] * (m[ 9] * m[15] - m[11] * m[13])
- - m[5] * (m[ 8] * m[15] - m[11] * m[12])
- + m[7] * (m[ 8] * m[13] - m[ 9] * m[12]);
+ - m[5] * (m[ 8] * m[15] - m[11] * m[12])
+ + m[7] * (m[ 8] * m[13] - m[ 9] * m[12]);
det[3] = m[4] * (m[ 9] * m[14] - m[10] * m[13])
- - m[5] * (m[ 8] * m[14] - m[10] * m[12])
- + m[6] * (m[ 8] * m[13] - m[ 9] * m[12]);
+ - m[5] * (m[ 8] * m[14] - m[10] * m[12])
+ + m[6] * (m[ 8] * m[13] - m[ 9] * m[12]);
sum = m[0] * det[0] - m[1] * det[1] + m[2] * det[2] - m[3] * det[3];
@@ -1259,8 +1259,8 @@
point_t sheared_eye;
if (eye[Z] < SMALL) {
- VPRINT("mike_persp_mat(): ERROR, z<0, eye", eye);
- return;
+ VPRINT("mike_persp_mat(): ERROR, z<0, eye", eye);
+ return;
}
/* Shear "eye" to +Z axis */
@@ -1270,8 +1270,8 @@
MAT4X3VEC(sheared_eye, shear, eye);
if (!NEAR_ZERO(sheared_eye[X], .01) || !NEAR_ZERO(sheared_eye[Y], .01)) {
- VPRINT("ERROR sheared_eye", sheared_eye);
- return;
+ VPRINT("ERROR sheared_eye", sheared_eye);
+ return;
}
/* Translate along +Z axis to put sheared_eye at (0, 0, 1). */
@@ -1320,9 +1320,9 @@
*/
void
deering_persp_mat(fastf_t *m, const fastf_t *l, const fastf_t *h, const
fastf_t *eye)
- /* lower left corner of screen */
- /* upper right (high) corner of screen */
- /* eye location. Traditionally at (0, 0, 1) */
+/* lower left corner of screen */
+/* upper right (high) corner of screen */
+/* eye location. Traditionally at (0, 0, 1) */
{
vect_t diff; /* H - L */
vect_t sum; /* H + L */
Modified: brlcad/trunk/src/libbn/plane.c
===================================================================
--- brlcad/trunk/src/libbn/plane.c 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/src/libbn/plane.c 2019-05-20 06:20:41 UTC (rev 73091)
@@ -1849,7 +1849,7 @@
dot = VDOT(AtoP, AtoB);
flip = 1;
}
- if ZERO(dot) {
+ if (ZERO(dot)) {
bu_bomb("bn_distsq_pt3_lseg3_v2(): failed");
}
Modified: brlcad/trunk/src/libbn/plot3.c
===================================================================
--- brlcad/trunk/src/libbn/plot3.c 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/src/libbn/plot3.c 2019-05-20 06:20:41 UTC (rev 73091)
@@ -42,24 +42,24 @@
* letters.
*
* @code
- 2d 3d 2df 3df
-space s S w W
-move m M o O
-cont n N q Q
-point p P x X
-line l L v V
-circle c i
-arc a r
-linmod f
-label t
-erase e
-color C
-flush F
+ 2d 3d 2df 3df
+ space s S w W
+ move m M o O
+ cont n N q Q
+ point p P x X
+ line l L v V
+ circle c i
+ arc a r
+ linmod f
+ label t
+ erase e
+ color C
+ flush F
bd gh jk uyz
-ABDEGHIJKRTUYZ
+ ABDEGHIJKRTUYZ
-@endcode
+ @endcode
*
*/
@@ -429,7 +429,7 @@
void
pd_point(register FILE *plotfp, double x, double y)
{
- pd( plotfp, x, y, 'x'); /* calling common function pd */
+ pd( plotfp, x, y, 'x'); /* calling common function pd */
}
void
@@ -622,7 +622,7 @@
void
pd_3move(register FILE *plotfp, double x, double y, double z)
{
- pd_3(plotfp, x, y, z, 'O'); /* calling common function pd_3 */
+ pd_3(plotfp, x, y, z, 'O'); /* calling common function pd_3 */
}
void
Modified: brlcad/trunk/src/libbn/str.c
===================================================================
--- brlcad/trunk/src/libbn/str.c 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/src/libbn/str.c 2019-05-20 06:20:41 UTC (rev 73091)
@@ -129,16 +129,16 @@
if (clamp) {
bu_vls_printf(vp, "%g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g",
- INTCLAMP(m[0]), INTCLAMP(m[1]), INTCLAMP(m[2]), INTCLAMP(m[3]),
- INTCLAMP(m[4]), INTCLAMP(m[5]), INTCLAMP(m[6]), INTCLAMP(m[7]),
- INTCLAMP(m[8]), INTCLAMP(m[9]), INTCLAMP(m[10]),
INTCLAMP(m[11]),
- INTCLAMP(m[12]), INTCLAMP(m[13]), INTCLAMP(m[14]),
INTCLAMP(m[15]));
+ INTCLAMP(m[0]), INTCLAMP(m[1]), INTCLAMP(m[2]),
INTCLAMP(m[3]),
+ INTCLAMP(m[4]), INTCLAMP(m[5]), INTCLAMP(m[6]),
INTCLAMP(m[7]),
+ INTCLAMP(m[8]), INTCLAMP(m[9]), INTCLAMP(m[10]),
INTCLAMP(m[11]),
+ INTCLAMP(m[12]), INTCLAMP(m[13]), INTCLAMP(m[14]),
INTCLAMP(m[15]));
} else {
bu_vls_printf(vp, "%.15g %.15g %.15g %.15g %.15g %.15g %.15g %.15g
%.15g %.15g %.15g %.15g %.15g %.15g %.15g %.15g",
- m[0],m[1],m[2],m[3],
- m[4],m[5],m[6],m[7],
- m[8],m[9],m[10],m[11],
- m[12],m[13],m[14],m[15]);
+ m[0],m[1],m[2],m[3],
+ m[4],m[5],m[6],m[7],
+ m[8],m[9],m[10],m[11],
+ m[12],m[13],m[14],m[15]);
}
}
Modified: brlcad/trunk/src/libbn/tabdata.c
===================================================================
--- brlcad/trunk/src/libbn/tabdata.c 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/src/libbn/tabdata.c 2019-05-20 06:20:41 UTC (rev 73091)
@@ -545,7 +545,7 @@
if (fract < 0 || fract > 1) bu_bomb("bn_table_lin_interp() assertion2
failed\n");
ret = (1-fract) * samp->y[i] + fract * samp->y[i+1];
if (bu_debug&BU_DEBUG_TABDATA)bu_log("bn_table_lin_interp(%g)=%g in range
%g to %g\n",
- wl, ret, tabp->x[i], tabp->x[i+1]);
+ wl, ret, tabp->x[i], tabp->x[i+1]);
return ret;
}
@@ -651,8 +651,8 @@
* Interpolate for both ends, take average.
*/
newsamp->y[i] = 0.5 * (
- bn_table_lin_interp(olddata, newtable->x[i]) +
- bn_table_lin_interp(olddata, newtable->x[i+1]));
+ bn_table_lin_interp(olddata, newtable->x[i]) +
+ bn_table_lin_interp(olddata, newtable->x[i+1]));
} else {
/*
* Complex case: find average value.
Modified: brlcad/trunk/src/libbn/tests/bntester.c
===================================================================
--- brlcad/trunk/src/libbn/tests/bntester.c 2019-05-20 02:16:41 UTC (rev
73090)
+++ brlcad/trunk/src/libbn/tests/bntester.c 2019-05-20 06:20:41 UTC (rev
73091)
@@ -134,7 +134,7 @@
break;
default:
fprintf(stream, "INTERNAL ERROR: Unknown data type '%c' for
function %lu test case on line %lu, skipping test case.\n",
- fmt_str[idx], u[0], line_num);
+ fmt_str[idx], u[0], line_num);
return EXIT_FAILURE;
break;
} /* End of data format switch */
@@ -365,7 +365,7 @@
u[0] = strtoul(buf_p, &endp, 10);
if (errno) {
fprintf(stream, "Read function number failed, line %lu
error msg: '%s' string '%s'\n",
- line_num, strerror(errno), buf_p);
+ line_num, strerror(errno), buf_p);
valid_function_number = 0;
} else if ((*endp != '\0') || (buf_p == endp) || (strchr(buf_p,
'-') != NULL)) {
fprintf(stream, "Read function number failed, line %lu
string '%s'\n", line_num, buf_p);
@@ -403,7 +403,7 @@
ret = 1;
failed_cnt++;
fprintf(stream, "Failed function %lu
test case on line %lu expected = %.15f result = %.15f\n",
- u[0], line_num, d[9],
result);
+ u[0], line_num, d[9], result);
} else {
success_cnt++;
}
@@ -435,7 +435,7 @@
ret = 1;
failed_cnt++;
fprintf(stream, "Failed function %lu
test case on line %lu expected = %d result = %d\n",
- u[0], line_num, i[0],
result);
+ u[0], line_num, i[0], result);
} else {
success_cnt++;
}
@@ -472,13 +472,13 @@
ret = 1;
failed_cnt++;
fprintf(stream, "Failed function %lu
test case on line %lu expected = %d result = %d\n",
- u[0], line_num, i[0],
result);
+ u[0], line_num, i[0], result);
} else if (result == 0) {
if (!NEAR_EQUAL(t_out, d[0], tol.dist))
{
ret = 1;
failed_cnt++;
fprintf(stream, "Failed function
%lu test case on line %lu result = %d expected t = %.15f result t = %.15f\n",
- u[0], line_num,
result, d[0], t_out);
+ u[0], line_num, result,
d[0], t_out);
} else {
success_cnt++;
}
@@ -487,11 +487,11 @@
u_fail = !NEAR_EQUAL(u_out, d[1],
tol.dist);
if (t_fail) {
fprintf(stream, "Failed function
%lu test case on line %lu result = %d expected t = %.15f result t = %.15f\n",
- u[0], line_num,
result, d[0], t_out);
+ u[0], line_num, result,
d[0], t_out);
}
if (u_fail) {
fprintf(stream, "Failed function
%lu test case on line %lu result = %d expected u = %.15f result u = %.15f\n",
- u[0], line_num,
result, d[1], u_out);
+ u[0], line_num, result,
d[1], u_out);
}
if (t_fail || u_fail) {
ret = 1;
@@ -537,17 +537,17 @@
ret = 1;
failed_cnt++;
fprintf(stream, "Failed function %lu
test case on line %lu expected = %d result = %d\n",
- u[0], line_num, i[0],
result);
+ u[0], line_num, i[0], result);
} else if (result == 0 || result == 1) {
d0_fail = !NEAR_EQUAL(dist[0], d[0],
VUNITIZE_TOL);
d1_fail = !NEAR_EQUAL(dist[1], d[1],
VUNITIZE_TOL);
if (d0_fail) {
fprintf(stream, "Failed function
%lu test case on line %lu result = %d expected dist[0] = %.15f result dist[0] =
%.15f\n",
- u[0], line_num,
result, d[0], dist[0]);
+ u[0], line_num, result,
d[0], dist[0]);
}
if (d1_fail) {
fprintf(stream, "Failed function
%lu test case on line %lu result = %d expected dist[1] = %.15f result dist[1] =
%.15f\n",
- u[0], line_num,
result, d[1], dist[1]);
+ u[0], line_num, result,
d[1], dist[1]);
}
if (d0_fail || d1_fail) {
ret = 1;
Modified: brlcad/trunk/src/libbn/tests/complex.c
===================================================================
--- brlcad/trunk/src/libbn/tests/complex.c 2019-05-20 02:16:41 UTC (rev
73090)
+++ brlcad/trunk/src/libbn/tests/complex.c 2019-05-20 06:20:41 UTC (rev
73091)
@@ -70,7 +70,7 @@
sscanf(argv[3], "%lg,%lg", &bn_cx_real(&bp), &bn_cx_imag(&bp));
sscanf(argv[4], "%lg,%lg", &bn_cx_real(&expected_result),
&bn_cx_imag(&expected_result));
- bn_cx_mul2(&actual_result, &ap, &bp)
+ bn_cx_mul2(&actual_result, &ap, &bp);
bn_cx_mul(&ap, &bp);
bu_log("bn_cx_mul: result: %g + %g * i\n", bn_cx_real(&ap),
bn_cx_imag(&ap));
Modified: brlcad/trunk/src/libbn/tests/list.c
===================================================================
--- brlcad/trunk/src/libbn/tests/list.c 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/src/libbn/tests/list.c 2019-05-20 06:20:41 UTC (rev 73091)
@@ -64,7 +64,7 @@
memset(result_buf, 0, BUFFER_SIZE);
rewind(result_fd);
- errno = 0;
+ errno = 0;
ret = fread(result_buf, sizeof(char), BUFFER_SIZE, result_fd);
if (ret < BUFFER_SIZE)
perror("fread");
Modified: brlcad/trunk/src/libbn/tests/mat.c
===================================================================
--- brlcad/trunk/src/libbn/tests/mat.c 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/src/libbn/tests/mat.c 2019-05-20 06:20:41 UTC (rev 73091)
@@ -544,60 +544,60 @@
if (function_num < 1 || function_num > 27) function_num = 0;
switch (function_num) {
- case 1:
- return test_bn_mat_mul(argc, argv);
- case 2:
- return test_bn_mat_mul3(argc, argv);
- case 3:
- return test_bn_mat_mul4(argc, argv);
- case 4:
- return test_bn_matXvec(argc, argv);
- case 5:
- return test_bn_mat_inverse(argc, argv);
- case 6:
- return test_bn_mat_trn(argc, argv);
- case 7:
- return test_bn_mat_is_identity(argc, argv);
- case 8:
- return test_bn_mat_det3(argc, argv);
- case 9:
- return test_bn_mat_determinant(argc, argv);
- case 10:
- return test_bn_mat_is_equal(argc, argv);
- case 11:
- return test_bn_atan2(argc, argv);
- case 12:
- return test_bn_vtoh_move(argc, argv);
- case 13:
- return test_bn_htov_move(argc, argv);
- case 14:
- return test_bn_mat_ae(argc, argv);
- case 15:
- return test_bn_ae_vec(argc, argv);
- case 16:
- return test_bn_vec_ae(argc, argv);
- case 17:
- return test_bn_vec_aed(argc, argv);
- case 18:
- return test_bn_mat_angles(argc, argv);
- case 19:
- return test_bn_mat_angles_rad(argc, argv);
- case 20:
- return test_bn_eigen2x2(argc, argv);
- case 21:
- return test_bn_mat_xrot(argc, argv);
- case 22:
- return test_bn_mat_yrot(argc, argv);
- case 23:
- return test_bn_mat_zrot(argc, argv);
- case 24:
- return test_bn_mat_scale_about_pt(argc, argv);
- case 25:
- return test_bn_mat_xform_about_pt(argc, argv);
- case 26:
- return test_bn_mat_ck(argc, argv);
- case 27:
- return test_bn_mat_dup();
+ case 1:
+ return test_bn_mat_mul(argc, argv);
+ case 2:
+ return test_bn_mat_mul3(argc, argv);
+ case 3:
+ return test_bn_mat_mul4(argc, argv);
+ case 4:
+ return test_bn_matXvec(argc, argv);
+ case 5:
+ return test_bn_mat_inverse(argc, argv);
+ case 6:
+ return test_bn_mat_trn(argc, argv);
+ case 7:
+ return test_bn_mat_is_identity(argc, argv);
+ case 8:
+ return test_bn_mat_det3(argc, argv);
+ case 9:
+ return test_bn_mat_determinant(argc, argv);
+ case 10:
+ return test_bn_mat_is_equal(argc, argv);
+ case 11:
+ return test_bn_atan2(argc, argv);
+ case 12:
+ return test_bn_vtoh_move(argc, argv);
+ case 13:
+ return test_bn_htov_move(argc, argv);
+ case 14:
+ return test_bn_mat_ae(argc, argv);
+ case 15:
+ return test_bn_ae_vec(argc, argv);
+ case 16:
+ return test_bn_vec_ae(argc, argv);
+ case 17:
+ return test_bn_vec_aed(argc, argv);
+ case 18:
+ return test_bn_mat_angles(argc, argv);
+ case 19:
+ return test_bn_mat_angles_rad(argc, argv);
+ case 20:
+ return test_bn_eigen2x2(argc, argv);
+ case 21:
+ return test_bn_mat_xrot(argc, argv);
+ case 22:
+ return test_bn_mat_yrot(argc, argv);
+ case 23:
+ return test_bn_mat_zrot(argc, argv);
+ case 24:
+ return test_bn_mat_scale_about_pt(argc, argv);
+ case 25:
+ return test_bn_mat_xform_about_pt(argc, argv);
+ case 26:
+ return test_bn_mat_ck(argc, argv);
+ case 27:
+ return test_bn_mat_dup();
}
bu_log("ERROR: function_num %d is not valid [%s]\n", function_num,
argv[0]);
Modified: brlcad/trunk/src/libbn/tests/qmath.c
===================================================================
--- brlcad/trunk/src/libbn/tests/qmath.c 2019-05-20 02:16:41 UTC (rev
73090)
+++ brlcad/trunk/src/libbn/tests/qmath.c 2019-05-20 06:20:41 UTC (rev
73091)
@@ -209,17 +209,17 @@
int
qmath_main(int argc, char *argv[])
{
- int function_num = 0;
+ int function_num = 0;
- const char **av = (const char **)argv;
+ const char **av = (const char **)argv;
- if (argc < 3) {
- bu_exit(1, "ERROR: input format is function_num function_test_args
[%s]\n", argv[0]);
- }
+ if (argc < 3) {
+ bu_exit(1, "ERROR: input format is function_num function_test_args
[%s]\n", argv[0]);
+ }
- sscanf(argv[1], "%d", &function_num);
+ sscanf(argv[1], "%d", &function_num);
- switch (function_num) {
+ switch (function_num) {
case 1:
return test_quat_mat2quat(argc - 2, av + 2);
case 2:
@@ -242,9 +242,9 @@
return test_quat_log(argc - 2, av + 2);
default:
bu_exit(1, "ERROR: Unrecognized function_num\n");
- }
+ }
- return 1;
+ return 1;
}
Modified: brlcad/trunk/src/libbn/tests/randsph.c
===================================================================
--- brlcad/trunk/src/libbn/tests/randsph.c 2019-05-20 02:16:41 UTC (rev
73090)
+++ brlcad/trunk/src/libbn/tests/randsph.c 2019-05-20 06:20:41 UTC (rev
73091)
@@ -76,7 +76,7 @@
bu_free(parray, "free array");
- return 1;
+ return 1;
}
Modified: brlcad/trunk/src/libbn/tests/sobolseq.c
===================================================================
--- brlcad/trunk/src/libbn/tests/sobolseq.c 2019-05-20 02:16:41 UTC (rev
73090)
+++ brlcad/trunk/src/libbn/tests/sobolseq.c 2019-05-20 06:20:41 UTC (rev
73091)
@@ -64,9 +64,9 @@
}
bn_sobol_destroy(s);
printf("Test integral = %g using Sobol, %g using pseudorandom.\n",
- testint_sobol / n, testint_rand / n);
+ testint_sobol / n, testint_rand / n);
printf(" error = %g using Sobol, %g using pseudorandom.\n",
- testint_sobol / n - 1, testint_rand / n - 1);
+ testint_sobol / n - 1, testint_rand / n - 1);
return ((testint_sobol / n - 1) > 0.001);
}
Modified: brlcad/trunk/src/libbn/tests/tabdata.c
===================================================================
--- brlcad/trunk/src/libbn/tests/tabdata.c 2019-05-20 02:16:41 UTC (rev
73090)
+++ brlcad/trunk/src/libbn/tests/tabdata.c 2019-05-20 06:20:41 UTC (rev
73091)
@@ -636,46 +636,46 @@
sscanf(argv[1], "%d", &function_num);
switch (function_num) {
- case 1:
- return test_bn_table_make_uniform(argc, argv);
- case 2:
- return test_bn_tabdata_add(argc, argv);
- case 3:
- return test_bn_tabdata_mul(argc, argv);
- case 4:
- return test_bn_tabdata_mul3(argc, argv);
- case 5:
- return test_bn_tabdata_incr_mul3_scale(argc, argv);
- case 6:
- return test_bn_tabdata_incr_mul2_scale(argc, argv);
- case 7:
- return test_bn_tabdata_scale(argc, argv);
- case 8:
- return test_bn_table_scale(argc, argv);
- case 9:
- return test_bn_tabdata_join1(argc, argv);
- case 10:
- return test_bn_tabdata_join2(argc, argv);
- case 11:
- return test_bn_tabdata_blend2(argc, argv);
- case 12:
- return test_bn_tabdata_blend3(argc, argv);
- case 13:
- return test_bn_tabdata_area1(argc, argv);
- case 14:
- return test_bn_tabdata_area2(argc, argv);
- case 15:
- return test_bn_tabdata_mul_area1(argc, argv);
- case 16:
- return test_bn_tabdata_mul_area2(argc, argv);
- case 17:
- return test_bn_table_lin_interp(argc, argv);
- case 18:
- return test_bn_tabdata_copy(argc, argv);
- case 19:
- return test_bn_tabdata_dup(argc, argv);
- case 20:
- return test_bn_tabdata_get_constval(argc, argv);
+ case 1:
+ return test_bn_table_make_uniform(argc, argv);
+ case 2:
+ return test_bn_tabdata_add(argc, argv);
+ case 3:
+ return test_bn_tabdata_mul(argc, argv);
+ case 4:
+ return test_bn_tabdata_mul3(argc, argv);
+ case 5:
+ return test_bn_tabdata_incr_mul3_scale(argc, argv);
+ case 6:
+ return test_bn_tabdata_incr_mul2_scale(argc, argv);
+ case 7:
+ return test_bn_tabdata_scale(argc, argv);
+ case 8:
+ return test_bn_table_scale(argc, argv);
+ case 9:
+ return test_bn_tabdata_join1(argc, argv);
+ case 10:
+ return test_bn_tabdata_join2(argc, argv);
+ case 11:
+ return test_bn_tabdata_blend2(argc, argv);
+ case 12:
+ return test_bn_tabdata_blend3(argc, argv);
+ case 13:
+ return test_bn_tabdata_area1(argc, argv);
+ case 14:
+ return test_bn_tabdata_area2(argc, argv);
+ case 15:
+ return test_bn_tabdata_mul_area1(argc, argv);
+ case 16:
+ return test_bn_tabdata_mul_area2(argc, argv);
+ case 17:
+ return test_bn_table_lin_interp(argc, argv);
+ case 18:
+ return test_bn_tabdata_copy(argc, argv);
+ case 19:
+ return test_bn_tabdata_dup(argc, argv);
+ case 20:
+ return test_bn_tabdata_get_constval(argc, argv);
}
bu_log("ERROR: function_num %d is not valid [%s]\n", function_num,
argv[0]);
Modified: brlcad/trunk/src/libbn/ulp.c
===================================================================
--- brlcad/trunk/src/libbn/ulp.c 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/src/libbn/ulp.c 2019-05-20 06:20:41 UTC (rev 73091)
@@ -106,13 +106,13 @@
bn_dbl_max(void)
{
#if defined(DBL_MAX)
- return DBL_MAX;
+ return DBL_MAX;
#elif defined(INFINITY)
static const double val = INFINITY;
long long next = *(long long*)&val - 1;
return *(double *)&next;
#else
- return 1.0/bn_dbl_min();
+ return 1.0/bn_dbl_min();
#endif
}
@@ -129,13 +129,13 @@
bn_flt_max(void)
{
#if defined(FLT_MAX)
- return FLT_MAX;
+ return FLT_MAX;
#elif defined(INFINITY)
static const float val = INFINITY;
long next = *(long*)&val - 1;
return *(float *)&next;
#else
- return 1.0/bn_flt_min();
+ return 1.0/bn_flt_min();
#endif
}
Modified: brlcad/trunk/src/libbn/vert_tree.c
===================================================================
--- brlcad/trunk/src/libbn/vert_tree.c 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/src/libbn/vert_tree.c 2019-05-20 06:20:41 UTC (rev 73091)
@@ -226,7 +226,7 @@
tree->max_vert += VERT_BLOCK;
tree->the_array = (fastf_t *)bu_realloc( tree->the_array, sizeof(
fastf_t ) * tree->max_vert * 3,
- "tree->the_array" );
+ "tree->the_array" );
}
VMOVE( &tree->the_array[tree->curr_vert*3], vertex );
@@ -351,8 +351,8 @@
tree->max_vert += VERT_BLOCK;
tree->the_array = (fastf_t *)bu_realloc( tree->the_array,
- sizeof( fastf_t ) *
tree->max_vert * 6,
- "tree->the_array" );
+ sizeof( fastf_t ) *
tree->max_vert * 6,
+ "tree->the_array" );
}
VMOVE( &tree->the_array[tree->curr_vert*6], vertex );
Modified: brlcad/trunk/src/libbn/vlist.c
===================================================================
--- brlcad/trunk/src/libbn/vlist.c 2019-05-20 02:16:41 UTC (rev 73090)
+++ brlcad/trunk/src/libbn/vlist.c 2019-05-20 06:20:41 UTC (rev 73091)
@@ -432,49 +432,49 @@
point_t p;
VSET(p, minn[X], minn[Y], minn[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_MOVE)
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_MOVE);
- /* first side */
- VSET(p, minn[X], maxx[Y], minn[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
- VSET(p, minn[X], maxx[Y], maxx[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
- VSET(p, minn[X], minn[Y], maxx[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
- VSET(p, minn[X], minn[Y], minn[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
+ /* first side */
+ VSET(p, minn[X], maxx[Y], minn[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
+ VSET(p, minn[X], maxx[Y], maxx[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
+ VSET(p, minn[X], minn[Y], maxx[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
+ VSET(p, minn[X], minn[Y], minn[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
- /* across */
- VSET(p, maxx[X], minn[Y], minn[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
+ /* across */
+ VSET(p, maxx[X], minn[Y], minn[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
- /* second side */
- VSET(p, maxx[X], maxx[Y], minn[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
- VSET(p, maxx[X], maxx[Y], maxx[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
- VSET(p, maxx[X], minn[Y], maxx[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
- VSET(p, maxx[X], minn[Y], minn[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
+ /* second side */
+ VSET(p, maxx[X], maxx[Y], minn[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
+ VSET(p, maxx[X], maxx[Y], maxx[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
+ VSET(p, maxx[X], minn[Y], maxx[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
+ VSET(p, maxx[X], minn[Y], minn[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
- /* front edge */
- VSET(p, minn[X], maxx[Y], minn[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_MOVE)
- VSET(p, maxx[X], maxx[Y], minn[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
+ /* front edge */
+ VSET(p, minn[X], maxx[Y], minn[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_MOVE);
+ VSET(p, maxx[X], maxx[Y], minn[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
- /* bottom back */
- VSET(p, minn[X], minn[Y], maxx[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_MOVE)
- VSET(p, maxx[X], minn[Y], maxx[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
+ /* bottom back */
+ VSET(p, minn[X], minn[Y], maxx[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_MOVE);
+ VSET(p, maxx[X], minn[Y], maxx[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
- /* top back */
- VSET(p, minn[X], maxx[Y], maxx[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_MOVE)
- VSET(p, maxx[X], maxx[Y], maxx[Z]);
- BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW)
+ /* top back */
+ VSET(p, minn[X], maxx[Y], maxx[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_MOVE);
+ VSET(p, maxx[X], maxx[Y], maxx[Z]);
+ BN_ADD_VLIST(vlists, hd, p, BN_VLIST_LINE_DRAW);
}
void
@@ -488,9 +488,9 @@
if (vbp->rgb[i] == 0) continue;
if (BU_LIST_IS_EMPTY(&(vbp->head[i]))) continue;
pl_color(fp,
- (vbp->rgb[i]>>16) & 0xFF,
- (vbp->rgb[i]>> 8) & 0xFF,
- (vbp->rgb[i]) & 0xFF);
+ (vbp->rgb[i]>>16) & 0xFF,
+ (vbp->rgb[i]>> 8) & 0xFF,
+ (vbp->rgb[i]) & 0xFF);
bn_vlist_to_uplot(fp, &(vbp->head[i]));
}
}
@@ -526,7 +526,7 @@
break;
default:
bu_log("bn_vlist_to_uplot: unknown vlist cmd x%x\n",
- *cmd);
+ *cmd);
}
}
}
Modified: brlcad/trunk/src/librt/primitives/annot/annot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/annot/annot.c 2019-05-20 02:16:41 UTC
(rev 73090)
+++ brlcad/trunk/src/librt/primitives/annot/annot.c 2019-05-20 06:20:41 UTC
(rev 73091)
@@ -615,7 +615,7 @@
pt[j] /= pt[coords-1];
}
if (i == 0)
- RT_ADD_VLIST(vhead, pt, BN_VLIST_LINE_MOVE)
+ RT_ADD_VLIST(vhead, pt, BN_VLIST_LINE_MOVE);
else
RT_ADD_VLIST(vhead, pt, BN_VLIST_LINE_DRAW);
}
Modified: brlcad/trunk/src/librt/primitives/sketch/sketch.c
===================================================================
--- brlcad/trunk/src/librt/primitives/sketch/sketch.c 2019-05-20 02:16:41 UTC
(rev 73090)
+++ brlcad/trunk/src/librt/primitives/sketch/sketch.c 2019-05-20 06:20:41 UTC
(rev 73091)
@@ -741,9 +741,9 @@
pt[j] /= pt[coords-1];
}
if (i == 0)
- RT_ADD_VLIST(vhead, pt, BN_VLIST_LINE_MOVE)
- else
- RT_ADD_VLIST(vhead, pt, BN_VLIST_LINE_DRAW);
+ RT_ADD_VLIST(vhead, pt, BN_VLIST_LINE_MOVE);
+ else
+ RT_ADD_VLIST(vhead, pt, BN_VLIST_LINE_DRAW);
}
bu_free((char *)eg.ctl_points, "eg.ctl_points");
break;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
