Commit 5953275f authored by Don Gagne's avatar Don Gagne

Merge pull request #867 from DonLakeFlyer/qwtWarnings

Hack fix for qwt 64 bit Windows compiler warnings
parents 61dd5731 10a35ec8
...@@ -349,7 +349,7 @@ void QwtPlotCurve::drawSeries( QPainter *painter, ...@@ -349,7 +349,7 @@ void QwtPlotCurve::drawSeries( QPainter *painter,
const QwtScaleMap &xMap, const QwtScaleMap &yMap, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QRectF &canvasRect, int from, int to ) const const QRectF &canvasRect, int from, int to ) const
{ {
const size_t numSamples = dataSize(); const int numSamples = static_cast<int>(dataSize());
if ( !painter || numSamples <= 0 ) if ( !painter || numSamples <= 0 )
return; return;
...@@ -405,7 +405,7 @@ void QwtPlotCurve::drawCurve( QPainter *painter, int style, ...@@ -405,7 +405,7 @@ void QwtPlotCurve::drawCurve( QPainter *painter, int style,
// we always need the complete // we always need the complete
// curve for fitting // curve for fitting
from = 0; from = 0;
to = dataSize() - 1; to = static_cast<int>(dataSize()) - 1;
} }
drawLines( painter, xMap, yMap, canvasRect, from, to ); drawLines( painter, xMap, yMap, canvasRect, from, to );
break; break;
......
...@@ -37,10 +37,10 @@ QwtPointArrayData::QwtPointArrayData( ...@@ -37,10 +37,10 @@ QwtPointArrayData::QwtPointArrayData(
QwtPointArrayData::QwtPointArrayData( const double *x, QwtPointArrayData::QwtPointArrayData( const double *x,
const double *y, size_t size ) const double *y, size_t size )
{ {
d_x.resize( size ); d_x.resize( static_cast<int>(size) );
::memcpy( d_x.data(), x, size * sizeof( double ) ); ::memcpy( d_x.data(), x, size * sizeof( double ) );
d_y.resize( size ); d_y.resize(static_cast<int>(size));
::memcpy( d_y.data(), y, size * sizeof( double ) ); ::memcpy( d_y.data(), y, size * sizeof( double ) );
} }
...@@ -273,7 +273,7 @@ QPointF QwtSyntheticPointData::sample( size_t index ) const ...@@ -273,7 +273,7 @@ QPointF QwtSyntheticPointData::sample( size_t index ) const
if ( index >= d_size ) if ( index >= d_size )
return QPointF( 0, 0 ); return QPointF( 0, 0 );
const double xValue = x( index ); const double xValue = x( static_cast<uint>(index) );
const double yValue = y( xValue ); const double yValue = y( xValue );
return QPointF( xValue, yValue ); return QPointF( xValue, yValue );
......
...@@ -78,7 +78,7 @@ QRectF qwtBoundingRectT( ...@@ -78,7 +78,7 @@ QRectF qwtBoundingRectT(
from = 0; from = 0;
if ( to < 0 ) if ( to < 0 )
to = series.size() - 1; to = static_cast<int>(series.size()) - 1;
if ( to < from ) if ( to < from )
return boundingRect; return boundingRect;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment