Revision: 42122
http://brlcad.svn.sourceforge.net/brlcad/?rev=42122&view=rev
Author: starseeker
Date: 2011-01-12 02:33:03 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Update cmake branch to trunk r42120
Modified Paths:
--------------
brlcad/branches/cmake/src/conv/dxf/g-dxf.c
brlcad/branches/cmake/src/libged/make.c
brlcad/branches/cmake/src/mged/chgview.c
brlcad/branches/cmake/src/mged/cmd.c
brlcad/branches/cmake/src/rt/view.c
Property Changed:
----------------
brlcad/branches/cmake/
brlcad/branches/cmake/src/other/tkhtml/
Property changes on: brlcad/branches/cmake
___________________________________________________________________
Modified: svn:mergeinfo
- /brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42119
+ /brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120
Modified: brlcad/branches/cmake/src/conv/dxf/g-dxf.c
===================================================================
--- brlcad/branches/cmake/src/conv/dxf/g-dxf.c 2011-01-12 01:58:13 UTC (rev
42121)
+++ brlcad/branches/cmake/src/conv/dxf/g-dxf.c 2011-01-12 02:33:03 UTC (rev
42122)
@@ -217,7 +217,7 @@
color_num = find_closest_color( color );
if ( polyface_mesh ) {
- int i;
+ size_t i;
fprintf( fp, "0\nPOLYLINE\n8\n%s\n62\n%d\n70\n64\n71\n%lu\n72\n%d\n",
Modified: brlcad/branches/cmake/src/libged/make.c
===================================================================
--- brlcad/branches/cmake/src/libged/make.c 2011-01-12 01:58:13 UTC (rev
42121)
+++ brlcad/branches/cmake/src/libged/make.c 2011-01-12 02:33:03 UTC (rev
42122)
@@ -661,8 +661,8 @@
extrude_ip->sketch_name = bu_strdup(bu_vls_addr(&gedp->ged_result_str));
extrude_ip->skt = (struct rt_sketch_internal *)NULL;
- sprintf(center_str, "%lf %lf %lf", V3ARGS(origin));
- sprintf(scale_str, "%lf", scale);
+ sprintf(center_str, "%f %f %f", V3ARGS(origin));
+ sprintf(scale_str, "%f", scale);
av[0] = "make";
av[1] = "-o";
av[2] = center_str;
Modified: brlcad/branches/cmake/src/mged/chgview.c
===================================================================
--- brlcad/branches/cmake/src/mged/chgview.c 2011-01-12 01:58:13 UTC (rev
42121)
+++ brlcad/branches/cmake/src/mged/chgview.c 2011-01-12 02:33:03 UTC (rev
42122)
@@ -270,7 +270,7 @@
int flag_R_noresize=0;
int flag_o_nonunique=1;
- int i;
+ size_t i;
int last_opt=0;
struct bu_vls vls;
@@ -483,7 +483,7 @@
int
emuves_com(int argc, const char *argv[])
{
- int i;
+ size_t i;
struct bu_ptbl *tbl;
struct bu_attribute_value_set avs;
const char **objs;
Modified: brlcad/branches/cmake/src/mged/cmd.c
===================================================================
--- brlcad/branches/cmake/src/mged/cmd.c 2011-01-12 01:58:13 UTC (rev
42121)
+++ brlcad/branches/cmake/src/mged/cmd.c 2011-01-12 02:33:03 UTC (rev
42122)
@@ -1836,7 +1836,7 @@
struct bu_vls vls;
struct bu_ptbl *tbl;
struct directory *dp;
- int i;
+ size_t i;
int last_opt=0;
int new_arg_count=1;
int new_argc;
Property changes on: brlcad/branches/cmake/src/other/tkhtml
___________________________________________________________________
Modified: svn:mergeinfo
-
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42119
+
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42120
Modified: brlcad/branches/cmake/src/rt/view.c
===================================================================
--- brlcad/branches/cmake/src/rt/view.c 2011-01-12 01:58:13 UTC (rev 42121)
+++ brlcad/branches/cmake/src/rt/view.c 2011-01-12 02:33:03 UTC (rev 42122)
@@ -449,8 +449,8 @@
switch (buf_mode) {
case BUFMODE_INCR:
{
- size_t dy, yy;
- size_t spread;
+ long dy, yy;
+ long spread;
size_t npix = 0;
if (fbp == FBIO_NULL)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
