Revision: 42253
http://brlcad.svn.sourceforge.net/brlcad/?rev=42253&view=rev
Author: brlcad
Date: 2011-01-13 23:31:12 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
more COMMA preprocessor conversions for safety
Modified Paths:
--------------
brlcad/trunk/src/fb/cat-fb.c
brlcad/trunk/src/fb/fbcolor.c
brlcad/trunk/src/fb/pl-fb.c
Modified: brlcad/trunk/src/fb/cat-fb.c
===================================================================
--- brlcad/trunk/src/fb/cat-fb.c 2011-01-13 22:14:06 UTC (rev 42252)
+++ brlcad/trunk/src/fb/cat-fb.c 2011-01-13 23:31:12 UTC (rev 42253)
@@ -54,6 +54,7 @@
/* The vfonts are scaled for 200 dpi */
#define CONVERT(n) ((n)*(200./432.))
#define RECONVERT(n) ((n)*(432./200.))
+#define COMMA ','
unsigned char *scanline;
@@ -156,7 +157,7 @@
'.', /*.*/
'g', /*g*/
'\023', /*3/4*/
- ',', /*,*/
+ COMMA, /*,*/
'&', /*&*/
'y', /*y*/
'\0', /*blank*/
Modified: brlcad/trunk/src/fb/fbcolor.c
===================================================================
--- brlcad/trunk/src/fb/fbcolor.c 2011-01-13 22:14:06 UTC (rev 42252)
+++ brlcad/trunk/src/fb/fbcolor.c 2011-01-13 23:31:12 UTC (rev 42253)
@@ -35,6 +35,9 @@
#include "fb.h"
#include "libtermio.h"
+#define COMMA ','
+
+
int curchan = 0; /* 0=r, 1=g, 2=b */
int col[6] = {128, 128, 128}; /* r, g, b h, s, v */
@@ -228,7 +231,7 @@
new_rgb();
break;
case '-':
- case ',':
+ case COMMA:
col[curchan]--;
new_rgb();
break;
Modified: brlcad/trunk/src/fb/pl-fb.c
===================================================================
--- brlcad/trunk/src/fb/pl-fb.c 2011-01-13 22:14:06 UTC (rev 42252)
+++ brlcad/trunk/src/fb/pl-fb.c 2011-01-13 23:31:12 UTC (rev 42253)
@@ -82,6 +82,8 @@
#include "fb.h"
#include "plot3.h"
+#define COMMA ','
+
/*
Raster device model and image terminology as used herein:
@@ -267,7 +269,7 @@
/* Some needed chars, hastily drawn -MJM */
{'.', {{4, 7}, {3, 7}, {3, 6}, {4, 6}, {4, 7}, {END}, {NIL},
{NIL}, {NIL}, {NIL}}},
- {',', {{4, 6}, {3, 6}, {3, 5}, {4, 5}, {4, 8}, {END}, {NIL},
{NIL}, {NIL}, {NIL}}},
+ {COMMA, {{4, 6}, {3, 6}, {3, 5}, {4, 5}, {4, 8}, {END}, {NIL},
{NIL}, {NIL}, {NIL}}},
{'\0', {{NIL}, {NIL}, {NIL}, {NIL}, {NIL}, {NIL}, {NIL}, {NIL}, {NIL},
{NIL}}}
};
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
