Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxCOMPOSITION_INVALID mode and use it to simplify the code.

Browse Source 
Having an invalid element in wxCompositionMode enum allows to directly return
it from TranslateRasterOp() function instead of needing a separate bool
parameter to indicate that a ROP couldn't be translated.

This also incidentally fixes warnings about possibly uninitialized variables
in optimized g++ builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-07-02 10:29:11 +00:00
parent 749f13d4a2
commit fec4e45897
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/common/dcgraph.cpp
View File

@@ -53,27 +53,26 @@ static inline double DegToRad(double deg)
return (deg * M_PI) / 180.0;
}
static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode *op)
static wxCompositionMode TranslateRasterOp(wxRasterOperationMode function)
{
switch ( function )
{
case wxCOPY: // src
// since we are supporting alpha, _OVER is closer to the intention than _SOURCE
// since the latter would overwrite even when alpha is not set to opaque
*op = wxCOMPOSITION_OVER;
break;
return wxCOMPOSITION_OVER;
case wxOR: // src OR dst
*op = wxCOMPOSITION_ADD;
break;
return wxCOMPOSITION_ADD;
case wxNO_OP: // dst
*op = wxCOMPOSITION_DEST; // ignore the source
break;
return wxCOMPOSITION_DEST; // ignore the source
case wxCLEAR: // 0
*op = wxCOMPOSITION_CLEAR;// clear dst
break;
return wxCOMPOSITION_CLEAR;// clear dst
case wxXOR: // src XOR dst
*op = wxCOMPOSITION_XOR;
break;
return wxCOMPOSITION_XOR;
case wxAND: // src AND dst
case wxAND_INVERT: // (NOT src) AND dst
@@ -86,10 +85,10 @@ static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode
case wxOR_REVERSE: // src OR (NOT dst)
case wxSET: // 1
case wxSRC_INVERT: // NOT src
default:
return false;
break;
}
return true;
return wxCOMPOSITION_INVALID;
}
//-----------------------------------------------------------------------------
@@ -502,8 +501,8 @@ void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function )
m_logicalFunction = function;
wxCompositionMode mode;
m_logicalFunctionSupported = TranslateRasterOp( function, &mode);
wxCompositionMode mode = TranslateRasterOp( function );
m_logicalFunctionSupported = mode != wxCOMPOSITION_INVALID;
if (m_logicalFunctionSupported)
m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode);
@@ -874,8 +873,8 @@ bool wxGCDCImpl::DoStretchBlit(
if ( logical_func == wxNO_OP )
return true;
wxCompositionMode mode;
if ( !TranslateRasterOp(logical_func, &mode) )
wxCompositionMode mode = TranslateRasterOp(logical_func);
if ( mode == wxCOMPOSITION_INVALID )
{
wxFAIL_MSG( wxT("Blitting is not supported with this logical operation.") );
return false;