Revision: 57166
http://sourceforge.net/p/brlcad/code/57166
Author: brlcad
Date: 2013-08-27 03:17:10 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
convert to bu_sscanf()
Modified Paths:
--------------
brlcad/trunk/src/adrt/librender/cut.c
brlcad/trunk/src/adrt/librender/flos.c
brlcad/trunk/src/adrt/librender/spall.c
brlcad/trunk/src/anim/anim_cascade.c
Modified: brlcad/trunk/src/adrt/librender/cut.c
===================================================================
--- brlcad/trunk/src/adrt/librender/cut.c 2013-08-27 03:13:43 UTC (rev
57165)
+++ brlcad/trunk/src/adrt/librender/cut.c 2013-08-27 03:17:10 UTC (rev
57166)
@@ -30,16 +30,20 @@
#include "vmath.h"
#ifndef TIE_PRECISION
-# define TIE_PRECISION 0
+# define TIE_PRECISION 0
#endif
#include "adrt.h"
#include "adrt_struct.h"
#include "render.h"
+
+extern struct tie_s *tie;
+
void* render_cut_hit(struct tie_ray_s *ray, struct tie_id_s *id, struct
tie_tri_s *tri, void *ptr);
void render_cut(struct tie_s *tie, struct tie_ray_s *ray, TIE_3 *pixel);
+
typedef struct render_cut_s {
point_t ray_pos;
vect_t ray_dir;
@@ -54,6 +58,7 @@
tfloat mod;
} render_cut_hit_t;
+
void *
render_cut_hit_cutline(struct tie_ray_s *UNUSED(ray), struct tie_id_s
*UNUSED(id), struct tie_tri_s *tri, void *UNUSED(ptr))
{
@@ -62,8 +67,6 @@
}
-extern struct tie_s *tie;
-
void
render_cut_free(render_t *render)
{
@@ -177,12 +180,12 @@
struct tie_ray_s ray;
double step, f[6];
- if(buf == NULL)
+ if (buf == NULL)
return -1;
- sscanf(buf, "#(%lf %lf %lf) #(%lf %lf %lf)",
- f, f+1, f+2,
- f+3, f+3+1, f+3+2);
+ bu_sscanf(buf, "#(%lf %lf %lf) #(%lf %lf %lf)",
+ f, f+1, f+2,
+ f+3, f+3+1, f+3+2);
VMOVE(ray_pos, f);
VMOVE(ray_dir, f+3);
VUNITIZE(ray_dir);
@@ -241,7 +244,7 @@
VMOVE(list[5].v, ray_pos);
list[5].v[2] += shot_width;
- for(i=0;i<6;i++)
+ for (i=0;i<6;i++)
tlist[i] = &list[i];
tie_push(&d->tie, tlist, 2, NULL, 0);
Modified: brlcad/trunk/src/adrt/librender/flos.c
===================================================================
--- brlcad/trunk/src/adrt/librender/flos.c 2013-08-27 03:13:43 UTC (rev
57165)
+++ brlcad/trunk/src/adrt/librender/flos.c 2013-08-27 03:17:10 UTC (rev
57166)
@@ -92,7 +92,7 @@
BU_ALLOC(render->data, struct render_flos_s);
d = (struct render_flos_s *)render->data;
- sscanf(frag_pos, "#(%lf %lf %lf)", &scan[0], &scan[1], &scan[2]);
+ bu_sscanf(frag_pos, "#(%lf %lf %lf)", &scan[0], &scan[1], &scan[2]);
/* convert from double to fastf_t */
VMOVE(d->frag_pos, scan);
return 0;
Modified: brlcad/trunk/src/adrt/librender/spall.c
===================================================================
--- brlcad/trunk/src/adrt/librender/spall.c 2013-08-27 03:13:43 UTC (rev
57165)
+++ brlcad/trunk/src/adrt/librender/spall.c 2013-08-27 03:17:10 UTC (rev
57166)
@@ -191,16 +191,16 @@
double ray_pos[3], ray_dir[3];
double scan;
- if(buf == NULL)
+ if (buf == NULL)
return -1;
render->work = render_spall_work;
render->free = render_spall_free;
- sscanf(buf, "(%lg %lg %lg) (%lg %lg %lg) %lg",
- &ray_pos[0], &ray_pos[1], &ray_pos[2],
- &ray_dir[0], &ray_dir[1], &ray_dir[2],
- &scan);
+ bu_sscanf(buf, "(%lg %lg %lg) (%lg %lg %lg) %lg",
+ &ray_pos[0], &ray_pos[1], &ray_pos[2],
+ &ray_dir[0], &ray_dir[1], &ray_dir[2],
+ &scan);
angle = scan; /* double to fastf_t */
BU_ALLOC(render->data, struct render_spall_s);
Modified: brlcad/trunk/src/anim/anim_cascade.c
===================================================================
--- brlcad/trunk/src/anim/anim_cascade.c 2013-08-27 03:13:43 UTC (rev
57165)
+++ brlcad/trunk/src/anim/anim_cascade.c 2013-08-27 03:17:10 UTC (rev
57166)
@@ -83,16 +83,16 @@
case 'f':
d = *(bu_optarg);
if (d == 'c') {
- sscanf(argv[bu_optind], "%lf", fcenter+0);
- sscanf(argv[bu_optind+1], "%lf", fcenter+1);
- sscanf(argv[bu_optind+2], "%lf", fcenter+2);
+ bu_sscanf(argv[bu_optind], "%lf", fcenter+0);
+ bu_sscanf(argv[bu_optind+1], "%lf", fcenter+1);
+ bu_sscanf(argv[bu_optind+2], "%lf", fcenter+2);
bu_optind += 3;
cmd_fcen = 1;
break;
} else if (d =='y') {
- sscanf(argv[bu_optind], "%lf", fypr+0);
- sscanf(argv[bu_optind+1], "%lf", fypr+1);
- sscanf(argv[bu_optind+2], "%lf", fypr+2);
+ bu_sscanf(argv[bu_optind], "%lf", fypr+0);
+ bu_sscanf(argv[bu_optind+1], "%lf", fypr+1);
+ bu_sscanf(argv[bu_optind+2], "%lf", fypr+2);
bu_optind += 3;
cmd_fypr = 1;
break;
@@ -103,16 +103,16 @@
case 'r':
d = *(bu_optarg);
if (d == 'c') {
- sscanf(argv[bu_optind], "%lf", rcenter+0);
- sscanf(argv[bu_optind+1], "%lf", rcenter+1);
- sscanf(argv[bu_optind+2], "%lf", rcenter+2);
+ bu_sscanf(argv[bu_optind], "%lf", rcenter+0);
+ bu_sscanf(argv[bu_optind+1], "%lf", rcenter+1);
+ bu_sscanf(argv[bu_optind+2], "%lf", rcenter+2);
bu_optind += 3;
cmd_rcen = 1;
break;
} else if (d =='y') {
- sscanf(argv[bu_optind], "%lf", rypr+0);
- sscanf(argv[bu_optind+1], "%lf", rypr+1);
- sscanf(argv[bu_optind+2], "%lf", rypr+2);
+ bu_sscanf(argv[bu_optind], "%lf", rypr+0);
+ bu_sscanf(argv[bu_optind+1], "%lf", rypr+1);
+ bu_sscanf(argv[bu_optind+2], "%lf", rypr+2);
bu_optind += 3;
cmd_rypr = 1;
break;
@@ -123,16 +123,16 @@
case 'a':
d = *(bu_optarg);
if (d == 'c') {
- sscanf(argv[bu_optind], "%lf", acenter+0);
- sscanf(argv[bu_optind+1], "%lf", acenter+1);
- sscanf(argv[bu_optind+2], "%lf", acenter+2);
+ bu_sscanf(argv[bu_optind], "%lf", acenter+0);
+ bu_sscanf(argv[bu_optind+1], "%lf", acenter+1);
+ bu_sscanf(argv[bu_optind+2], "%lf", acenter+2);
bu_optind += 3;
cmd_acen = 1;
break;
} else if (d =='y') {
- sscanf(argv[bu_optind], "%lf", aypr+0);
- sscanf(argv[bu_optind+1], "%lf", aypr+1);
- sscanf(argv[bu_optind+2], "%lf", aypr+2);
+ bu_sscanf(argv[bu_optind], "%lf", aypr+0);
+ bu_sscanf(argv[bu_optind+1], "%lf", aypr+1);
+ bu_sscanf(argv[bu_optind+2], "%lf", aypr+2);
bu_optind += 3;
cmd_aypr = 1;
break;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
