M src/FbTk/Color.cc → src/FbTk/Color.cc

@@ -31,14 +31,6 @@ using std::cerr;
 using std::endl;
 using std::string;
 
-namespace {
-
-inline unsigned char maxValue(unsigned short colval) {
-   return colval == 65535 ? 0xFF : static_cast<unsigned char>(colval/0xFF);
-}
-
-}
-
 namespace FbTk {
 
 Color::Color():
@@ -96,9 +88,7 @@ else if (! XAllocColor(disp, colm, &color))
         return false;
 
     setPixel(color.pixel);
-    setRGB(maxValue(color.red),
-           maxValue(color.green),
-           maxValue(color.blue));
+    setRGB(color.red / 256, color.green / 256, color.blue / 256);
     setAllocated(true);
     m_screen = screen;
 
@@ -168,9 +158,7 @@ _FB_USES_NLS;
         cerr<<"FbTk::Color: "<<_FBTK_CONSOLETEXT(Error, ColorAllocation, "Allocation error.", "XAllocColor failed...")<<endl;
     } else {
         free();
-        setRGB(maxValue(color.red),
-               maxValue(color.green),
-               maxValue(color.blue));
+        setRGB(color.red / 256, color.green / 256, color.blue / 256);
         setPixel(color.pixel);
         setAllocated(true);
     }

M src/FbTk/Color.hh → src/FbTk/Color.hh

@@ -63,6 +63,7 @@ void setAllocated(bool a) { m_allocated = a; }
     void setRGB(unsigned short red, unsigned short green, unsigned short blue);
 
 
+    // stored in [0 - 255] range
     unsigned short m_red, m_green, m_blue;
     unsigned long m_pixel;
     bool m_allocated;