[vlc-devel] commit: Skins2: Move getShifts from const to static. (JP Dinger )

git version control git at videolan.org
Sat Dec 5 22:35:10 CET 2009


vlc | branch: master | JP Dinger <jpd at videolan.org> | Sat Nov 21 15:26:52 2009 +0100| [f73b0909bdf0620c2966c5a2eea0dc4e15a7d983] | committer: JP Dinger 

Skins2: Move getShifts from const to static.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f73b0909bdf0620c2966c5a2eea0dc4e15a7d983
---

 modules/gui/skins2/x11/x11_display.cpp |    3 +--
 modules/gui/skins2/x11/x11_display.hpp |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/gui/skins2/x11/x11_display.cpp b/modules/gui/skins2/x11/x11_display.cpp
index 8fc362f..9a6f432 100644
--- a/modules/gui/skins2/x11/x11_display.cpp
+++ b/modules/gui/skins2/x11/x11_display.cpp
@@ -253,8 +253,7 @@ X11Display::~X11Display()
 }
 
 
-void X11Display::getShifts( uint32_t mask, int &rLeftShift,
-                            int &rRightShift ) const
+void X11Display::getShifts( uint32_t mask, int &rLeftShift, int &rRightShift )
 {
     for( rLeftShift = 0; (rLeftShift < 32) && !(mask & 1); rLeftShift++ )
     {
diff --git a/modules/gui/skins2/x11/x11_display.hpp b/modules/gui/skins2/x11/x11_display.hpp
index 6d7eaaa..be297ee 100644
--- a/modules/gui/skins2/x11/x11_display.hpp
+++ b/modules/gui/skins2/x11/x11_display.hpp
@@ -99,8 +99,7 @@ private:
     type blendPixel(type v,type r, type g, type b,type a) const;
 
     /// Calculate shifts from a color mask
-    void getShifts( uint32_t mask, int &rLeftShift,
-                    int &rRightShift ) const;
+    static void getShifts( uint32_t mask, int &rLeftShift, int &rRightShift );
 
     /// 8 bpp version of blendPixel
     void blendPixel8( uint8_t *pPixel, uint8_t r, uint8_t g, uint8_t b,




More information about the vlc-devel mailing list