[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55899] trunk/blender/source/blender/ freestyle/intern: code cleanup: unused macros

[Campbell Barton]

Revision: 55899
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55899
Author:   campbellbarton
Date:     2013-04-08 09:52:43 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
code cleanup: unused macros

Modified Paths:
--------------
    trunk/blender/source/blender/freestyle/intern/geometry/Noise.cpp
    trunk/blender/source/blender/freestyle/intern/system/RandGen.cpp

Modified: trunk/blender/source/blender/freestyle/intern/geometry/Noise.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/Noise.cpp	2013-04-08 08:59:30 UTC (rev 55898)
+++ trunk/blender/source/blender/freestyle/intern/geometry/Noise.cpp	2013-04-08 09:52:43 UTC (rev 55899)
@@ -32,32 +32,28 @@
 
 #include "Noise.h"
 
-#define MINX -1000000
-#define MINY MINX
-#define MINZ MINX
-
 #define SCURVE(a) ((a) * (a) * (3.0 - 2.0 * (a)))
 
+#if 0  // XXX Unused
 #define REALSCALE (2.0 / 65536.0)
 #define NREALSCALE (2.0 / 4096.0)
 
 #define HASH3D(a, b, c) hashTable[hashTable[hashTable[(a) & 0xfff] ^ ((b) & 0xfff)] ^ ((c) & 0xfff)]
 #define HASH(a, b, c) (xtab[(xtab[(xtab[(a) & 0xff] ^ (b)) & 0xff] ^ (c)) & 0xff] & 0xff)
-
 #define INCRSUM(m, s, x, y, z) \
 	((s) * (RTable[m] * 0.5 + RTable[m + 1] * (x) + RTable[m + 2] * (y) + RTable[m + 3] * (z)))
 
 #define MAXSIZE 500
-
-#if 0  // XXX Unused
 #define NRAND() ((float)rand() / (float)RAND_MAX)
 #endif
 #define SEEDNRAND(x) (srand(x * RAND_MAX))
 
 #define BM 0xff
 #define N  0x1000
+#if 0  // XXX Unused
 #define NP 12  /* 2^N */
 #define NM 0xfff
+#endif
 
 #define LERP(t, a, b) ((a) + (t) * ((b) - (a)))
 

Modified: trunk/blender/source/blender/freestyle/intern/system/RandGen.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/system/RandGen.cpp	2013-04-08 08:59:30 UTC (rev 55898)
+++ trunk/blender/source/blender/freestyle/intern/system/RandGen.cpp	2013-04-08 09:52:43 UTC (rev 55899)
@@ -41,7 +41,9 @@
 #define A1     0xDEEC
 #define A2     0x5
 #define C      0xB
+#if 0  // XXX Unused
 #define HI_BIT (1L << (2 * N - 1))
+#endif
 
 #define LOW(x)  ((unsigned)(x) & MASK)
 #define HIGH(x) LOW((x) >> N)
@@ -56,9 +58,12 @@
 #define CARRY(x, y)         ((unsigned long)((long)(x) + (long)(y)) > MASK)
 #define ADDEQU(x, y, z)     (z = CARRY(x, (y)), x = LOW(x + (y)))
 #define SET3(x, x0, x1, x2) ((x)[0] = (x0), (x)[1] = (x1), (x)[2] = (x2))
+#if 0 // XXX, unused
 #define SETLOW(x, y, n)     SET3(x, LOW((y)[n]), LOW((y)[(n)+1]), LOW((y)[(n)+2]))
+#endif
 #define SEED(x0, x1, x2)    (SET3(x, x0, x1, x2), SET3(a, A0, A1, A2), c = C)
 
+#if 0 // XXX, unused
 #define REST(v)               \
 	for (i = 0; i < 3; i++) { \
 		xsubi[i] = x[i];      \
@@ -79,6 +84,7 @@
 		v = F();                             \
 		REST(v);                             \
 	}
+#endif
 
 static unsigned x[3] = {
 	X0,