[goffice] Colours: remove unused pixel macros.



commit 9ea6460c11823461a723756a3bea34e676dad3d7
Author: Morten Welinder <terra gnome org>
Date:   Sun Aug 23 19:58:44 2009 -0400

    Colours: remove unused pixel macros.

 ChangeLog                |    4 ++++
 goffice/utils/go-color.h |   20 --------------------
 2 files changed, 4 insertions(+), 20 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3e079f8..7337547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-23  Morten Welinder  <terra gnome org>
+
+	* goffice/utils/go-color.h (PIXEL_*): Kill unused macros.
+
 2009-08-23  Jean Brefort  <jean brefort normalesup org>
 
 	* goffice/canvas/goc-canvas.c: add RTL support tothe canvas.
diff --git a/goffice/utils/go-color.h b/goffice/utils/go-color.h
index ef4e826..b6072de 100644
--- a/goffice/utils/go-color.h
+++ b/goffice/utils/go-color.h
@@ -88,26 +88,6 @@ typedef struct {
 		MONO_INTERPOLATE(UINT_RGBA_G(c1), UINT_RGBA_G(c2), t), \
 		MONO_INTERPOLATE(UINT_RGBA_B(c1), UINT_RGBA_B(c2), t), \
 		MONO_INTERPOLATE(UINT_RGBA_A(c1), UINT_RGBA_A(c2), t) )
-#define PIXEL_RGB(p, r, g, b) \
-{((guchar*)(p))[0]=(r); ((guchar*)(p))[1]=(g); ((guchar*)(p))[2]=(b);}
-#define PIXEL_RGBA(p, r, g, b, a) \
-{ if ((a)>=0xff) { PIXEL_RGB(p,r,g,b) } \
-  else if ((a)>0) { \
-    guint pixel_tmp; \
-    pixel_tmp = ((guchar*)(p))[0]; \
-    ((guchar*)(p))[0] = pixel_tmp + ((((r)-pixel_tmp)*(a)+0x80) >> 8); \
-    pixel_tmp = ((guchar*)(p))[1]; \
-    ((guchar*)(p))[1] = pixel_tmp + ((((g)-pixel_tmp)*(a)+0x80) >> 8); \
-    pixel_tmp = ((guchar*)(p))[2]; \
-    ((guchar*)(p))[2] = pixel_tmp + ((((b)-pixel_tmp)*(a)+0x80) >> 8); }}
-#define PIXEL_RGB_UINT(p, i) \
-UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2)
-#define PIXEL_RGBA_UINT(p, i) \
-  PIXEL_RGBA((p), ((i)>>24)&0xff, ((i)>>16)&0xff, ((i)>>8)&0xff, (i)&0xff)
-#define PIXEL_BLACK(p) PIXEL_RGB(p,0,0,0)
-#define PIXEL_WHITE(p) PIXEL_RGB(p,0xff,0xff,0xff)
-#define PIXEL_GREY(p,g) PIXEL_RGB(p,g,g,g)
-#define PIXEL_GREYA(p,g,a) PIXEL_RGBA(p,g,g,g,a)
 
 #define DOUBLE_RGBA_R(x) (double)UINT_RGBA_R(x)/255.0
 #define DOUBLE_RGBA_G(x) (double)UINT_RGBA_G(x)/255.0



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]