Revision: 37526
http://brlcad.svn.sourceforge.net/brlcad/?rev=37526&view=rev
Author: bob1961
Date: 2010-02-02 20:08:38 +0000 (Tue, 02 Feb 2010)
Log Message:
-----------
The cast to long is now part of the bu_offsetof definition.
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/arb8/arb8.c
brlcad/trunk/src/librt/primitives/dsp/dsp.c
brlcad/trunk/src/librt/primitives/ebm/ebm.c
brlcad/trunk/src/librt/primitives/ehy/ehy.c
brlcad/trunk/src/librt/primitives/ell/ell.c
brlcad/trunk/src/librt/primitives/epa/epa.c
brlcad/trunk/src/librt/primitives/eto/eto.c
brlcad/trunk/src/librt/primitives/grip/grip.c
brlcad/trunk/src/librt/primitives/half/half.c
brlcad/trunk/src/librt/primitives/hf/hf.c
brlcad/trunk/src/librt/primitives/hyp/hyp.c
brlcad/trunk/src/librt/primitives/part/part.c
brlcad/trunk/src/librt/primitives/revolve/revolve.h
brlcad/trunk/src/librt/primitives/rhc/rhc.c
brlcad/trunk/src/librt/primitives/rpc/rpc.c
brlcad/trunk/src/librt/primitives/superell/superell.c
brlcad/trunk/src/librt/primitives/tgc/tgc.c
brlcad/trunk/src/librt/primitives/tor/tor.c
brlcad/trunk/src/librt/primitives/vol/vol.c
Modified: brlcad/trunk/src/librt/primitives/arb8/arb8.c
===================================================================
--- brlcad/trunk/src/librt/primitives/arb8/arb8.c 2010-02-02 18:14:00 UTC
(rev 37525)
+++ brlcad/trunk/src/librt/primitives/arb8/arb8.c 2010-02-02 20:08:38 UTC
(rev 37526)
@@ -128,14 +128,14 @@
const struct bu_structparse rt_arb_parse[] = {
- { "%f", 3, "V1", (long)bu_offsetof(struct rt_arb_internal, pt[0][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V2", (long)bu_offsetof(struct rt_arb_internal, pt[1][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V3", (long)bu_offsetof(struct rt_arb_internal, pt[2][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V4", (long)bu_offsetof(struct rt_arb_internal, pt[3][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V5", (long)bu_offsetof(struct rt_arb_internal, pt[4][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V6", (long)bu_offsetof(struct rt_arb_internal, pt[5][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V7", (long)bu_offsetof(struct rt_arb_internal, pt[6][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V8", (long)bu_offsetof(struct rt_arb_internal, pt[7][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V1", bu_offsetof(struct rt_arb_internal, pt[0][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V2", bu_offsetof(struct rt_arb_internal, pt[1][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V3", bu_offsetof(struct rt_arb_internal, pt[2][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V4", bu_offsetof(struct rt_arb_internal, pt[3][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V5", bu_offsetof(struct rt_arb_internal, pt[4][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V6", bu_offsetof(struct rt_arb_internal, pt[5][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V7", bu_offsetof(struct rt_arb_internal, pt[6][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V8", bu_offsetof(struct rt_arb_internal, pt[7][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/dsp/dsp.c
===================================================================
--- brlcad/trunk/src/librt/primitives/dsp/dsp.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/dsp/dsp.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -271,7 +271,7 @@
{"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
{"%d", 1, "w", DSP_O(dsp_xcnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", DSP_O(dsp_ycnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 16, "stom", (long)DSP_AO(dsp_stom), hook_mtos_from_stom, NULL,
NULL },
+ {"%f", 16, "stom", DSP_AO(dsp_stom), hook_mtos_from_stom, NULL, NULL },
{"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
@@ -282,7 +282,7 @@
{"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
{"%d", 1, "w", DSP_O(dsp_xcnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", DSP_O(dsp_ycnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 16, "stom", (long)DSP_AO(dsp_stom), BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL },
+ {"%f", 16, "stom", DSP_AO(dsp_stom), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
{"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
@@ -4638,7 +4638,7 @@
{"%d", 1, "n", DSP_O(dsp_ycnt), hook_verify, NULL, NULL },
{"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%c", 1, "cut", DSP_O(dsp_cuttype), hook_verify, NULL, NULL },
- {"%f", 16, "stom", (long)DSP_AO(dsp_stom), hook_verify, NULL, NULL },
+ {"%f", 16, "stom", DSP_AO(dsp_stom), hook_verify, NULL, NULL },
{"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/ebm/ebm.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ebm/ebm.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/ebm/ebm.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -63,11 +63,11 @@
#define RT_EBM_O(m) bu_offsetof(struct rt_ebm_internal, m)
const struct bu_structparse rt_ebm_parse[] = {
- {"%s", RT_EBM_NAME_LEN, "file", (long)bu_offsetofarray(struct
rt_ebm_internal, file), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%s", RT_EBM_NAME_LEN, "file", bu_offsetofarray(struct
rt_ebm_internal, file), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "w", RT_EBM_O(xdim),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", RT_EBM_O(ydim),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "d", RT_EBM_O(tallness),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 16, "mat", (long)bu_offsetofarray(struct rt_ebm_internal, mat),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 16, "mat", bu_offsetofarray(struct rt_ebm_internal, mat),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/ehy/ehy.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ehy/ehy.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/ehy/ehy.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -174,9 +174,9 @@
const struct bu_structparse rt_ehy_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_ehy_internal, ehy_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", (long)bu_offsetof(struct rt_ehy_internal, ehy_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", (long)bu_offsetof(struct rt_ehy_internal, ehy_Au[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_ehy_internal, ehy_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", bu_offsetof(struct rt_ehy_internal, ehy_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", bu_offsetof(struct rt_ehy_internal, ehy_Au[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_1", bu_offsetof(struct rt_ehy_internal, ehy_r1),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_2", bu_offsetof(struct rt_ehy_internal, ehy_r2),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "c", bu_offsetof(struct rt_ehy_internal, ehy_c),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
Modified: brlcad/trunk/src/librt/primitives/ell/ell.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ell/ell.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/ell/ell.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -45,10 +45,10 @@
struct rt_i *rtip));
const struct bu_structparse rt_ell_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_ell_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", (long)bu_offsetof(struct rt_ell_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "B", (long)bu_offsetof(struct rt_ell_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "C", (long)bu_offsetof(struct rt_ell_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_ell_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", bu_offsetof(struct rt_ell_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "B", bu_offsetof(struct rt_ell_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "C", bu_offsetof(struct rt_ell_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/epa/epa.c
===================================================================
--- brlcad/trunk/src/librt/primitives/epa/epa.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/epa/epa.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -173,9 +173,9 @@
const struct bu_structparse rt_epa_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_epa_internal, epa_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", (long)bu_offsetof(struct rt_epa_internal, epa_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", (long)bu_offsetof(struct rt_epa_internal, epa_Au[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_epa_internal, epa_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", bu_offsetof(struct rt_epa_internal, epa_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", bu_offsetof(struct rt_epa_internal, epa_Au[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_1", bu_offsetof(struct rt_epa_internal, epa_r1),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_2", bu_offsetof(struct rt_epa_internal, epa_r2),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/eto/eto.c
===================================================================
--- brlcad/trunk/src/librt/primitives/eto/eto.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/eto/eto.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -139,9 +139,9 @@
const struct bu_structparse rt_eto_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_eto_internal, eto_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "N", (long)bu_offsetof(struct rt_eto_internal, eto_N[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "C", (long)bu_offsetof(struct rt_eto_internal, eto_C[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_eto_internal, eto_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "N", bu_offsetof(struct rt_eto_internal, eto_N[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "C", bu_offsetof(struct rt_eto_internal, eto_C[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r", bu_offsetof(struct rt_eto_internal, eto_r),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_d", bu_offsetof(struct rt_eto_internal, eto_rd),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/grip/grip.c
===================================================================
--- brlcad/trunk/src/librt/primitives/grip/grip.c 2010-02-02 18:14:00 UTC
(rev 37525)
+++ brlcad/trunk/src/librt/primitives/grip/grip.c 2010-02-02 20:08:38 UTC
(rev 37526)
@@ -56,8 +56,8 @@
#define GRIP_NULL ((struct grip_specific *)0)
const struct bu_structparse rt_grp_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_grip_internal, center[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "N", (long)bu_offsetof(struct rt_grip_internal, normal[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_grip_internal, center[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "N", bu_offsetof(struct rt_grip_internal, normal[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "L", bu_offsetof(struct rt_grip_internal, mag),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/half/half.c
===================================================================
--- brlcad/trunk/src/librt/primitives/half/half.c 2010-02-02 18:14:00 UTC
(rev 37525)
+++ brlcad/trunk/src/librt/primitives/half/half.c 2010-02-02 20:08:38 UTC
(rev 37526)
@@ -59,8 +59,8 @@
#define HALF_NULL ((struct half_specific *)0)
const struct bu_structparse rt_hlf_parse[] = {
- { "%f", 3, "N", (long)bu_offsetof(struct rt_half_internal, eqn[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 1, "d", (long)bu_offsetof(struct rt_half_internal, eqn[W]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "N", bu_offsetof(struct rt_half_internal, eqn[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 1, "d", bu_offsetof(struct rt_half_internal, eqn[W]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/hf/hf.c
===================================================================
--- brlcad/trunk/src/librt/primitives/hf/hf.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/hf/hf.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -64,16 +64,16 @@
/* All fields valid in string solid */
const struct bu_structparse rt_hf_parse[] = {
- {"%s", 128, "cfile", (long)bu_offsetofarray(struct
rt_hf_internal, cfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%s", 128, "dfile", (long)bu_offsetofarray(struct
rt_hf_internal, dfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%s", 8, "fmt", (long)bu_offsetofarray(struct
rt_hf_internal, fmt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%s", 128, "cfile", bu_offsetofarray(struct rt_hf_internal,
cfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%s", 128, "dfile", bu_offsetofarray(struct rt_hf_internal,
dfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%s", 8, "fmt", bu_offsetofarray(struct rt_hf_internal,
fmt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%d", 1, "w", HF_O(w),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", HF_O(n),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "shorts", HF_O(shorts),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "file2mm", HF_O(file2mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "v", (long)HF_O(v[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "x", (long)HF_O(x[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "y", (long)HF_O(y[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "v", HF_O(v[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "x", HF_O(x[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "y", HF_O(y[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "xlen", HF_O(xlen),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "ylen", HF_O(ylen),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "zscale", HF_O(zscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
@@ -81,8 +81,8 @@
};
/* Subset of fields found in cfile */
const struct bu_structparse rt_hf_cparse[] = {
- {"%s", 128, "dfile", (long)bu_offsetofarray(struct
rt_hf_internal, dfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%s", 8, "fmt", (long)bu_offsetofarray(struct
rt_hf_internal, fmt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%s", 128, "dfile", bu_offsetofarray(struct rt_hf_internal,
dfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%s", 8, "fmt", bu_offsetofarray(struct rt_hf_internal,
fmt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%d", 1, "w", HF_O(w),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", HF_O(n),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "shorts", HF_O(shorts),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
Modified: brlcad/trunk/src/librt/primitives/hyp/hyp.c
===================================================================
--- brlcad/trunk/src/librt/primitives/hyp/hyp.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/hyp/hyp.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -103,9 +103,9 @@
const struct bu_structparse rt_hyp_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_hyp_internal, hyp_Vi[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", (long)bu_offsetof(struct rt_hyp_internal, hyp_Hi[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", (long)bu_offsetof(struct rt_hyp_internal, hyp_A[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_hyp_internal, hyp_Vi[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", bu_offsetof(struct rt_hyp_internal, hyp_Hi[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", bu_offsetof(struct rt_hyp_internal, hyp_A[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "b", bu_offsetof(struct rt_hyp_internal, hyp_b),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "bnr", bu_offsetof(struct rt_hyp_internal, hyp_bnr),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/part/part.c
===================================================================
--- brlcad/trunk/src/librt/primitives/part/part.c 2010-02-02 18:14:00 UTC
(rev 37525)
+++ brlcad/trunk/src/librt/primitives/part/part.c 2010-02-02 20:08:38 UTC
(rev 37526)
@@ -212,8 +212,8 @@
#define RT_PARTICLE_SURF_HSPHERE 3
const struct bu_structparse rt_part_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_part_internal, part_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", (long)bu_offsetof(struct rt_part_internal, part_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_part_internal, part_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", bu_offsetof(struct rt_part_internal, part_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_v", bu_offsetof(struct rt_part_internal, part_vrad),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_h", bu_offsetof(struct rt_part_internal, part_hrad),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/revolve/revolve.h
===================================================================
--- brlcad/trunk/src/librt/primitives/revolve/revolve.h 2010-02-02 18:14:00 UTC
(rev 37525)
+++ brlcad/trunk/src/librt/primitives/revolve/revolve.h 2010-02-02 20:08:38 UTC
(rev 37526)
@@ -25,9 +25,9 @@
const struct bu_structparse rt_revolve_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_revolve_internal, v3d[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "axis", (long)bu_offsetof(struct rt_revolve_internal,
axis3d[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "R", (long)bu_offsetof(struct rt_revolve_internal, r[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_revolve_internal, v3d[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "axis", bu_offsetof(struct rt_revolve_internal, axis3d[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "R", bu_offsetof(struct rt_revolve_internal, r[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "ang", bu_offsetof(struct rt_revolve_internal, ang),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%V", 1, "sk_name", bu_offsetof(struct rt_revolve_internal,
sketch_name), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/rhc/rhc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/rhc/rhc.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/rhc/rhc.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -189,9 +189,9 @@
const struct bu_structparse rt_rhc_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_rhc_internal, rhc_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", (long)bu_offsetof(struct rt_rhc_internal, rhc_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "B", (long)bu_offsetof(struct rt_rhc_internal, rhc_B[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_rhc_internal, rhc_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", bu_offsetof(struct rt_rhc_internal, rhc_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "B", bu_offsetof(struct rt_rhc_internal, rhc_B[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r", bu_offsetof(struct rt_rhc_internal, rhc_r),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "c", bu_offsetof(struct rt_rhc_internal, rhc_c),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/rpc/rpc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/rpc/rpc.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/rpc/rpc.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -185,9 +185,9 @@
const struct bu_structparse rt_rpc_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_rpc_internal, rpc_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", (long)bu_offsetof(struct rt_rpc_internal, rpc_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "B", (long)bu_offsetof(struct rt_rpc_internal, rpc_B[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_rpc_internal, rpc_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", bu_offsetof(struct rt_rpc_internal, rpc_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "B", bu_offsetof(struct rt_rpc_internal, rpc_B[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r", bu_offsetof(struct rt_rpc_internal, rpc_r),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/superell/superell.c
===================================================================
--- brlcad/trunk/src/librt/primitives/superell/superell.c 2010-02-02
18:14:00 UTC (rev 37525)
+++ brlcad/trunk/src/librt/primitives/superell/superell.c 2010-02-02
20:08:38 UTC (rev 37526)
@@ -47,10 +47,10 @@
const struct bu_structparse rt_superell_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_superell_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", (long)bu_offsetof(struct rt_superell_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "B", (long)bu_offsetof(struct rt_superell_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "C", (long)bu_offsetof(struct rt_superell_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_superell_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", bu_offsetof(struct rt_superell_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "B", bu_offsetof(struct rt_superell_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "C", bu_offsetof(struct rt_superell_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "n", bu_offsetof(struct rt_superell_internal, n),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "e", bu_offsetof(struct rt_superell_internal, e),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/tgc/tgc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/tgc/tgc.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/tgc/tgc.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -76,12 +76,12 @@
#define ALPHA(x, y, c, d) ((x)*(x)*(c) + (y)*(y)*(d))
const struct bu_structparse rt_tgc_parse[] = {
- { "%f", 3, "V", (long)bu_offsetof(struct rt_tgc_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", (long)bu_offsetof(struct rt_tgc_internal, h[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", (long)bu_offsetof(struct rt_tgc_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "B", (long)bu_offsetof(struct rt_tgc_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "C", (long)bu_offsetof(struct rt_tgc_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "D", (long)bu_offsetof(struct rt_tgc_internal, d[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", bu_offsetof(struct rt_tgc_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", bu_offsetof(struct rt_tgc_internal, h[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", bu_offsetof(struct rt_tgc_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "B", bu_offsetof(struct rt_tgc_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "C", bu_offsetof(struct rt_tgc_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "D", bu_offsetof(struct rt_tgc_internal, d[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/tor/tor.c
===================================================================
--- brlcad/trunk/src/librt/primitives/tor/tor.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/tor/tor.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -134,8 +134,8 @@
*/
const struct bu_structparse rt_tor_parse[] = {
- {"%f", 3, "V", (long)bu_offsetof(struct rt_tor_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%f", 3, "H", (long)bu_offsetof(struct rt_tor_internal, h[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%f", 3, "V", bu_offsetof(struct rt_tor_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%f", 3, "H", bu_offsetof(struct rt_tor_internal, h[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%f", 1, "r_a", bu_offsetof(struct rt_tor_internal, r_a),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%f", 1, "r_h", bu_offsetof(struct rt_tor_internal, r_h),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{{'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL}
Modified: brlcad/trunk/src/librt/primitives/vol/vol.c
===================================================================
--- brlcad/trunk/src/librt/primitives/vol/vol.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/vol/vol.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -65,14 +65,14 @@
#define VOL_O(m) bu_offsetof(struct rt_vol_internal, m)
const struct bu_structparse rt_vol_parse[] = {
- {"%s", RT_VOL_NAME_LEN, "file", (long)bu_offsetofarray(struct
rt_vol_internal, file), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%s", RT_VOL_NAME_LEN, "file", bu_offsetofarray(struct rt_vol_internal,
file), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "w", VOL_O(xdim), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", VOL_O(ydim), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "d", VOL_O(zdim), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "lo", VOL_O(lo), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "hi", VOL_O(hi), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", ELEMENTS_PER_VECT, "size", (long)bu_offsetofarray(struct
rt_vol_internal, cellsize), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 16, "mat", (long)bu_offsetofarray(struct rt_vol_internal, mat),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", ELEMENTS_PER_VECT, "size", bu_offsetofarray(struct rt_vol_internal,
cellsize), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 16, "mat", bu_offsetofarray(struct rt_vol_internal, mat),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
