* more systray related ifndefs for the Darwin platform

[vlc] / modules / gui / skins2 / x11 / x11_display.cpp

diff --git a/modules/gui/skins2/x11/x11_display.cpp b/modules/gui/skins2/x11/x11_display.cpp
index 594b503bc92d4c5e6da4ff72b14135dca1d42f6c..a2b1bf33cd121b56b137fc4e0c51c3c400c68f3b 100644 (file)
--- a/modules/gui/skins2/x11/x11_display.cpp
+++ b/modules/gui/skins2/x11/x11_display.cpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * x11_display.cpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teulière <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef X11_SKINS
@@ -416,9 +416,9 @@ unsigned long X11Display::getPixelValue( uint8_t r, uint8_t g, uint8_t b )
     const
 {
     unsigned long value;
-    value = ( ((uint32_t)r >> m_redRightShift) << m_redLeftShift ) |
-            ( ((uint32_t)g >> m_greenRightShift) << m_greenLeftShift ) |
-            ( ((uint32_t)b >> m_blueRightShift) << m_blueLeftShift );
+
+    PUT_PIXEL(value, r, g, b, uint32_t)
+
     if( m_pixelSize == 1 )
     {
         return 255 - value;