diff options
| author | Jonathan Marshall <jmarshall@never.you.mind> | 2013-06-02 20:06:04 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@never.you.mind> | 2013-06-02 20:06:04 +1200 |
| commit | 1c4b9f087d7489bc76b8d7c0ff39e536e8b7c57e (patch) | |
| tree | 3c025deffd54642c0134758ae5305fdafa70c65e | |
| parent | 4061ad04a42798ffaebf8f335b903f0570970fd3 (diff) | |
fix build on *nix due to wrong type in ternary operator
| -rw-r--r-- | xbmc/guilib/GUITexture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/guilib/GUITexture.cpp b/xbmc/guilib/GUITexture.cpp index ff5259efce..8df3d221f4 100644 --- a/xbmc/guilib/GUITexture.cpp +++ b/xbmc/guilib/GUITexture.cpp @@ -177,8 +177,8 @@ void CGUITextureBase::Render() #define MIX_ALPHA(a,c) (((a * (c >> 24)) / 255) << 24) | (c & 0x00ffffff) // diffuse color - color_t color = (m_info.diffuseColor) ? m_info.diffuseColor : m_diffuseColor; - if (m_alpha != 0xFF)
+ color_t color = (m_info.diffuseColor) ? (color_t)m_info.diffuseColor : m_diffuseColor; + if (m_alpha != 0xFF) color = MIX_ALPHA(m_alpha, color); color = g_graphicsContext.MergeAlpha(color); |