From: Vadim Zeitlin Date: Sat, 2 Jul 2011 10:29:11 +0000 (+0000) Subject: Add wxCOMPOSITION_INVALID mode and use it to simplify the code. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fec4e45897e44182abc696adc5fd95e66f48e862 Add wxCOMPOSITION_INVALID mode and use it to simplify the code. 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 --- diff --git a/include/wx/graphics.h b/include/wx/graphics.h index d30fd3b7c1..2581044d67 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -49,6 +49,7 @@ enum wxCompositionMode // classic Porter-Duff compositions // http://keithp.com/~keithp/porterduff/p253-porter.pdf + wxCOMPOSITION_INVALID = -1, /* indicates invalid/unsupported mode */ wxCOMPOSITION_CLEAR, /* R = 0 */ wxCOMPOSITION_SOURCE, /* R = S */ wxCOMPOSITION_OVER, /* R = S + D*(1 - Sa) */ diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h index 55361daecc..f43a420e9e 100644 --- a/interface/wx/graphics.h +++ b/interface/wx/graphics.h @@ -241,6 +241,14 @@ enum wxInterpolationQuality */ enum wxCompositionMode { + /** + Indicates invalid or unsupported composition mode. + + This value can't be passed to wxGraphicsContext::SetCompositionMode(). + + @since 2.9.2 + */ + wxCOMPOSITION_INVALID = -1, wxCOMPOSITION_CLEAR, /**< @e R = 0 */ wxCOMPOSITION_SOURCE, /**< @e R = S */ wxCOMPOSITION_OVER, /**< @e R = @e S + @e D*(1 - @e Sa) */ diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index f91a78fd6f..8cf95f3f9b 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -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;