Revision: 53400
http://brlcad.svn.sourceforge.net/brlcad/?rev=53400&view=rev
Author: brlcad
Date: 2012-10-30 01:52:12 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
this is the one place that must change from %f to %g for the two double n/e
power fields. everything else is a fastf_t. make the vec buffers double for
import/export since they must be, not fastf_t.
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/superell/superell.c
Modified: brlcad/trunk/src/librt/primitives/superell/superell.c
===================================================================
--- brlcad/trunk/src/librt/primitives/superell/superell.c 2012-10-30
01:50:21 UTC (rev 53399)
+++ brlcad/trunk/src/librt/primitives/superell/superell.c 2012-10-30
01:52:12 UTC (rev 53400)
@@ -52,8 +52,8 @@
{ "%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 },
+ { "%g", 1, "n", bu_offsetof(struct rt_superell_internal, n),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%g", 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 }
};
@@ -900,8 +900,10 @@
rt_superell_import5(struct rt_db_internal *ip, const struct bu_external *ep,
const fastf_t *mat, const struct db_i *dbip)
{
struct rt_superell_internal *eip;
- fastf_t vec[ELEMENTS_PER_VECT*4 + 2];
+ /* must be double for import and export */
+ double vec[ELEMENTS_PER_VECT*4 + 2];
+
if (dbip) RT_CK_DBI(dbip);
RT_CK_DB_INTERNAL(ip);
@@ -946,8 +948,10 @@
rt_superell_export5(struct bu_external *ep, const struct rt_db_internal *ip,
double local2mm, const struct db_i *dbip)
{
struct rt_superell_internal *eip;
- fastf_t vec[ELEMENTS_PER_VECT*4 + 2];
+ /* must be double for import and export */
+ double vec[ELEMENTS_PER_VECT*4 + 2];
+
if (dbip) RT_CK_DBI(dbip);
RT_CK_DB_INTERNAL(ip);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
