fix warnings
This commit is contained in:
@@ -269,7 +269,7 @@ void PaneDisplay::SetContent( PaneContents c )
|
||||
const CString metric = ITEM_COLOR(g_Contents[c].name, p);
|
||||
CStringArray spec;
|
||||
split( metric, ";", spec );
|
||||
LOG->Trace("%i/%i, '%s', %i, max '%s'", p, num, metric.c_str(), spec.size(), spec[0].c_str() );
|
||||
LOG->Trace("%i/%i, '%s', %zu, max '%s'", p, num, metric.c_str(), spec.size(), spec[0].c_str() );
|
||||
if( spec.size() < 2 )
|
||||
RageException::Throw( "Metric '%s' malformed", metric.c_str() );
|
||||
const float n = (float) atof( spec[0] );
|
||||
|
||||
@@ -1042,7 +1042,7 @@ bool RageDisplay_OGL::IsZWriteEnabled() const
|
||||
bool RageDisplay_OGL::IsZTestEnabled() const
|
||||
{
|
||||
GLenum a;
|
||||
glGetIntegerv( GL_DEPTH_FUNC, (int*)&a );
|
||||
glGetIntegerv( GL_DEPTH_FUNC, (GLint*)&a );
|
||||
return a != GL_ALWAYS;
|
||||
}
|
||||
|
||||
|
||||
@@ -278,7 +278,7 @@ int FFMpeg_Helper::DecodePacket()
|
||||
{
|
||||
if ( GetNextTimestamp )
|
||||
{
|
||||
if (pkt.pts != AV_NOPTS_VALUE)
|
||||
if (pkt.pts != int(AV_NOPTS_VALUE))
|
||||
pts = (float)pkt.pts * m_fctx->pts_num / m_fctx->pts_den;
|
||||
else
|
||||
pts = -1;
|
||||
|
||||
Reference in New Issue
Block a user