[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47916] trunk/blender/source/blender: remove unused fRGB defines and change float member to bool.

[Campbell Barton]

Revision: 47916
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47916
Author:   campbellbarton
Date:     2012-06-14 19:09:00 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
remove unused fRGB defines and change float member to bool.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.h
    trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.h
    trunk/blender/source/blender/nodes/composite/node_composite_util.h

Modified: trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.h	2012-06-14 18:55:35 UTC (rev 47915)
+++ trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.h	2012-06-14 19:09:00 UTC (rev 47916)
@@ -32,30 +32,18 @@
 typedef float fRGB[4];
 
 /* TODO - replace with BLI_math_vector */
-/* clear color */
-#define fRGB_clear(c) { c[0] = c[1] = c[2] = 0.f; } (void)0
 /* copy c2 to c1 */
 #define fRGB_copy(c1, c2) { c1[0] = c2[0];  c1[1] = c2[1];  c1[2] = c2[2]; c1[3] = c2[3]; } (void)0
 /* add c2 to c1 */
 #define fRGB_add(c1, c2) { c1[0] += c2[0];  c1[1] += c2[1];  c1[2] += c2[2]; } (void)0
-/* subtract c2 from c1 */
-#define fRGB_sub(c1, c2) { c1[0] -= c2[0];  c1[1] -= c2[1];  c1[2] -= c2[2]; } (void)0
 /* multiply c by float value s */
 #define fRGB_mult(c, s) { c[0] *= s;  c[1] *= s;  c[2] *= s; } (void)0
 /* multiply c2 by s and add to c1 */
 #define fRGB_madd(c1, c2, s) { c1[0] += c2[0] * s;  c1[1] += c2[1] * s;  c1[2] += c2[2] * s; } (void)0
 /* multiply c2 by color c1 */
 #define fRGB_colormult(c, cs) { c[0] *= cs[0];  c[1] *= cs[1];  c[2] *= cs[2]; } (void)0
-/* multiply c2 by color c3 and add to c1 */
-#define fRGB_colormadd(c1, c2, c3) { c1[0] += c2[0] * c3[0];  c1[1] += c2[1] * c3[1];  c1[2] += c2[2] * c3[2]; } (void)0
 /* multiply c2 by color rgb, rgb as separate arguments */
 #define fRGB_rgbmult(c, r, g, b) { c[0] *= (r);  c[1] *= (g);  c[2] *= (b); } (void)0
-/* swap colors c1 & c2 */
-#define fRGB_swap(c1, c2) { float _t = c1[0];  c1[0] = c2[0];  c2[0] = _t; \
-                                  _t = c1[1];  c1[1] = c2[1];  c2[1] = _t; \
-                                  _t = c1[2];  c1[2] = c2[2];  c2[2] = _t; \
-                                  _t = c1[3];  c1[3] = c2[3];  c3[3] = _t; \
-                          } (void)0
 
 
 class GlareBaseOperation : public SingleThreadedNodeOperation {

Modified: trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.h	2012-06-14 18:55:35 UTC (rev 47915)
+++ trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.h	2012-06-14 19:09:00 UTC (rev 47916)
@@ -32,7 +32,7 @@
 	SocketReader *inputYOperation;
 	float deltaX;
 	float deltaY;
-	float isDeltaSet;
+	bool isDeltaSet;
 public:
 	TranslateOperation();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);

Modified: trunk/blender/source/blender/nodes/composite/node_composite_util.h
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_util.h	2012-06-14 18:55:35 UTC (rev 47915)
+++ trunk/blender/source/blender/nodes/composite/node_composite_util.h	2012-06-14 19:09:00 UTC (rev 47916)
@@ -182,30 +182,18 @@
 /* utility functions used by glare, tonemap and lens distortion */
 /* soms macros for color handling */
 typedef float fRGB[4];
-/* clear color */
-#define fRGB_clear(c) { c[0]=c[1]=c[2]=0.f; } (void)0
 /* copy c2 to c1 */
 #define fRGB_copy(c1, c2) { c1[0]=c2[0];  c1[1]=c2[1];  c1[2]=c2[2]; c1[3]=c2[3]; } (void)0
 /* add c2 to c1 */
 #define fRGB_add(c1, c2) { c1[0]+=c2[0];  c1[1]+=c2[1];  c1[2]+=c2[2]; } (void)0
-/* subtract c2 from c1 */
-#define fRGB_sub(c1, c2) { c1[0]-=c2[0];  c1[1]-=c2[1];  c1[2]-=c2[2]; } (void)0
 /* multiply c by float value s */
 #define fRGB_mult(c, s) { c[0]*=s;  c[1]*=s;  c[2]*=s; } (void)0
 /* multiply c2 by s and add to c1 */
 #define fRGB_madd(c1, c2, s) { c1[0]+=c2[0]*s;  c1[1]+=c2[1]*s;  c1[2]+=c2[2]*s; } (void)0
 /* multiply c2 by color c1 */
 #define fRGB_colormult(c, cs) { c[0]*=cs[0];  c[1]*=cs[1];  c[2]*=cs[2]; } (void)0
-/* multiply c2 by color c3 and add to c1 */
-#define fRGB_colormadd(c1, c2, c3) { c1[0]+=c2[0]*c3[0];  c1[1]+=c2[1]*c3[1];  c1[2]+=c2[2]*c3[2]; } (void)0
 /* multiply c2 by color rgb, rgb as separate arguments */
 #define fRGB_rgbmult(c, r, g, b) { c[0]*=(r);  c[1]*=(g);  c[2]*=(b); } (void)0
-/* swap colors c1 & c2 */
-#define fRGB_swap(c1, c2) { float _t=c1[0];  c1[0]=c2[0];  c2[0]=_t;\
-                                  _t=c1[1];  c1[1]=c2[1];  c2[1]=_t;\
-                                  _t=c1[2];  c1[2]=c2[2];  c2[2]=_t;\
-                                  _t=c1[3];  c1[3]=c2[3];  c3[3]=_t;\
-                          } (void)0
 
 void qd_getPixel(CompBuf* src, int x, int y, float* col);
 void qd_setPixel(CompBuf* src, int x, int y, float* col);