X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frendercolor.hh;h=5076167f3d9d565ddd43d73fdff1b19b09a0a197;hb=3dfe9f4ebeb7abd8446c52db0232b9f610a78846;hp=4eeb8158a0d20c0bade832f73c5d6011ef9e3510;hpb=033e9843bcec8340c9e657fe0f0519f86075424b;p=chaz%2Fopenbox

diff --git a/otk/rendercolor.hh b/otk/rendercolor.hh
index 4eeb8158..5076167f 100644
--- a/otk/rendercolor.hh
+++ b/otk/rendercolor.hh
@@ -10,25 +10,25 @@ extern "C" {
 
 namespace otk {
 
-class RenderColor {
-public:
-  struct RGB {
-    int r;
-    int g;
-    int b;
-    RGB(int red, int green, int blue) : r(red), g(green), b(blue) {}
-    // color is in ARGB format
-    RGB(unsigned long color)
-      : r((color >> 16) & 0xff),
-        g((color >> 8) & 0xff),
-        b((color) & 0xff) {}
-  };
+struct RGB {
+  int r;
+  int g;
+  int b;
+  RGB(int red, int green, int blue) : r(red), g(green), b(blue) {}
+  // color is in ARGB format
+  RGB(unsigned long color)
+    : r((color >> 16) & 0xff),
+      g((color >> 8) & 0xff),
+      b((color) & 0xff) {}
+};
 
+class RenderColor {
 private:
   struct CacheItem {
     GC gc;
+    unsigned long pixel;
     int count;
-    CacheItem(GC g) : gc(g), count(0) {}
+    CacheItem(GC g, unsigned long p) : gc(g), pixel(p), count(0) {}
   };
   static std::map<unsigned long, CacheItem*> *_cache;
 
@@ -36,8 +36,8 @@ private:
   unsigned char _red;
   unsigned char _green;
   unsigned char _blue;
-  unsigned long _pixel;
 
+  unsigned long _pixel;
   GC _gc;
 
   void create();
@@ -55,8 +55,8 @@ public:
   inline unsigned char red() const { return _red; }
   inline unsigned char green() const { return _green; }
   inline unsigned char blue() const { return _blue; }
-  inline unsigned long pixel() const { return _pixel; }
-  inline GC gc() const { return _gc; }
+  unsigned long pixel() const { return _pixel; }
+  GC gc() const { return _gc; }
 };
 
 }