2 changes: 1 addition & 1 deletion src/core/raster/qgsmultibandcolorrenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ QgsRasterBlock* QgsMultiBandColorRenderer::block( int bandNo, QgsRectangle cons
currentOpacity *= alphaBlock->value( i ) / 255.0;
}

if ( doubleNear( currentOpacity, 1.0 ) )
if ( qgsDoubleNear( currentOpacity, 1.0 ) )
{
outputBlock->setColor( i, qRgba( redVal, greenVal, blueVal, 255 ) );
}
Expand Down
20 changes: 10 additions & 10 deletions src/core/raster/qgsrasterblock.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ QgsRasterBlock::QgsRasterBlock( QGis::DataType theDataType, int theWidth, int th

QgsRasterBlock::~QgsRasterBlock()
{
QgsFree( mData );
qgsFree( mData );
delete mImage;
QgsFree( mNoDataBitmap );
qgsFree( mNoDataBitmap );
}

bool QgsRasterBlock::reset( QGis::DataType theDataType, int theWidth, int theHeight )
Expand All @@ -93,11 +93,11 @@ bool QgsRasterBlock::reset( QGis::DataType theDataType, int theWidth, int theHei
{
QgsDebugMsg( QString( "theWidth= %1 theHeight = %2 theDataType = %3 theNoDataValue = %4" ).arg( theWidth ).arg( theHeight ).arg( theDataType ).arg( theNoDataValue ) );

QgsFree( mData );
qgsFree( mData );
mData = 0;
delete mImage;
mImage = 0;
QgsFree( mNoDataBitmap );
qgsFree( mNoDataBitmap );
mNoDataBitmap = 0;
mDataType = QGis::UnknownDataType;
mTypeSize = 0;
Expand All @@ -112,7 +112,7 @@ bool QgsRasterBlock::reset( QGis::DataType theDataType, int theWidth, int theHei
QgsDebugMsg( "Numeric type" );
size_t tSize = typeSize( theDataType );
QgsDebugMsg( QString( "allocate %1 bytes" ).arg( tSize * theWidth * theHeight ) );
mData = QgsMalloc( tSize * theWidth * theHeight );
mData = qgsMalloc( tSize * theWidth * theHeight );
if ( mData == 0 )
{
QgsDebugMsg( QString( "Couldn't allocate data memory of %1 bytes" ).arg( tSize * theWidth * theHeight ) );
Expand Down Expand Up @@ -268,7 +268,7 @@ bool QgsRasterBlock::isNoDataValue( double value, double noDataValue )
// More precise would be qIsNaN(value) && qIsNaN(noDataValue(bandNo)), but probably
// not important and slower
if ( qIsNaN( value ) ||
doubleNear( value, noDataValue ) )
qgsDoubleNear( value, noDataValue ) )
{
return true;
}
Expand Down Expand Up @@ -467,7 +467,7 @@ bool QgsRasterBlock::convert( QGis::DataType destDataType )
QgsDebugMsg( "Cannot convert raster block" );
return false;
}
QgsFree( mData );
qgsFree( mData );
mData = data;
mDataType = destDataType;
mTypeSize = typeSize( mDataType );
Expand Down Expand Up @@ -518,7 +518,7 @@ QImage QgsRasterBlock::image() const

bool QgsRasterBlock::setImage( const QImage * image )
{
QgsFree( mData );
qgsFree( mData );
mData = 0;
delete mImage;
mImage = 0;
Expand Down Expand Up @@ -589,7 +589,7 @@ QString QgsRasterBlock::printValue( double value )
void * QgsRasterBlock::convert( void *srcData, QGis::DataType srcDataType, QGis::DataType destDataType, size_t size )
{
int destDataTypeSize = typeSize( destDataType );
void *destData = QgsMalloc( destDataTypeSize * size );
void *destData = qgsMalloc( destDataTypeSize * size );
for ( size_t i = 0; i < size; i++ )
{
double value = readValue( srcData, srcDataType, i );
Expand Down Expand Up @@ -653,7 +653,7 @@ bool QgsRasterBlock::createNoDataBitmap()
{
size_t size = mWidth * mHeight / 8 + 1;
QgsDebugMsg( QString( "allocate %1 bytes" ).arg( size ) );
mNoDataBitmap = ( char* )QgsMalloc( size );
mNoDataBitmap = ( char* )qgsMalloc( size );
if ( mNoDataBitmap == 0 )
{
QgsDebugMsg( QString( "Couldn't allocate no data memory of %1 bytes" ).arg( size ) );
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterblock.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ inline bool QgsRasterBlock::isNoDataValue( double value ) const
// More precise would be qIsNaN(value) && qIsNaN(noDataValue(bandNo)), but probably
// not important and slower
if ( qIsNaN( value ) ||
doubleNear( value, mNoDataValue ) )
qgsDoubleNear( value, mNoDataValue ) )
{
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/raster/qgsrasterdataprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ QgsRasterBlock * QgsRasterDataProvider::block( int theBandNo, QgsRectangle cons
providerYRes = extent().height() / ySize();
tmpXRes = qMax( providerXRes, xRes );
tmpYRes = qMax( providerYRes, yRes );
if ( doubleNear( tmpXRes, xRes ) ) tmpXRes = xRes;
if ( doubleNear( tmpYRes, yRes ) ) tmpYRes = yRes;
if ( qgsDoubleNear( tmpXRes, xRes ) ) tmpXRes = xRes;
if ( qgsDoubleNear( tmpYRes, yRes ) ) tmpYRes = yRes;
}
else
{
Expand Down
14 changes: 7 additions & 7 deletions src/core/raster/qgsrasterfilewriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster(
{
iter->startRasterRead( i, nCols, nRows, outputExtent );
// TODO: no need to alloc memory, change to readBlock() returning the allocated block
//blockList.push_back( QgsMalloc( dataTypeSize * mMaxTileWidth * mMaxTileHeight ) );
//blockList.push_back( qgsMalloc( dataTypeSize * mMaxTileWidth * mMaxTileHeight ) );
blockList.push_back( 0 );
if ( destProvider ) // no tiles
{
Expand Down Expand Up @@ -471,11 +471,11 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
iter->setMaximumTileWidth( mMaxTileWidth );
iter->setMaximumTileHeight( mMaxTileHeight );

//void* data = QgsMalloc( QgsRasterBlock::typeSize( inputDataType ) * mMaxTileWidth * mMaxTileHeight );
void* redData = QgsMalloc( mMaxTileWidth * mMaxTileHeight );
void* greenData = QgsMalloc( mMaxTileWidth * mMaxTileHeight );
void* blueData = QgsMalloc( mMaxTileWidth * mMaxTileHeight );
void* alphaData = QgsMalloc( mMaxTileWidth * mMaxTileHeight );
//void* data = qgsMalloc( QgsRasterBlock::typeSize( inputDataType ) * mMaxTileWidth * mMaxTileHeight );
void* redData = qgsMalloc( mMaxTileWidth * mMaxTileHeight );
void* greenData = qgsMalloc( mMaxTileWidth * mMaxTileHeight );
void* blueData = qgsMalloc( mMaxTileWidth * mMaxTileHeight );
void* alphaData = qgsMalloc( mMaxTileWidth * mMaxTileHeight );
QgsRectangle mapRect;
int iterLeft = 0, iterTop = 0, iterCols = 0, iterRows = 0;
int fileIndex = 0;
Expand Down Expand Up @@ -589,7 +589,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
if ( destProvider )
delete destProvider;

QgsFree( redData ); QgsFree( greenData ); QgsFree( blueData ); QgsFree( alphaData );
qgsFree( redData ); qgsFree( greenData ); qgsFree( blueData ); qgsFree( alphaData );

if ( progressDialog )
{
Expand Down
8 changes: 4 additions & 4 deletions src/core/raster/qgsrasterinterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ QgsRasterBandStats QgsRasterInterface::bandStatistics( int theBandNo,
int myNXBlocks = ( myWidth + myXBlockSize - 1 ) / myXBlockSize;
int myNYBlocks = ( myHeight + myYBlockSize - 1 ) / myYBlockSize;

// void *myData = QgsMalloc( myXBlockSize * myYBlockSize * ( QgsRasterBlock::typeSize( dataType( theBandNo ) ) ) );
// void *myData = qgsMalloc( myXBlockSize * myYBlockSize * ( QgsRasterBlock::typeSize( dataType( theBandNo ) ) ) );

double myXRes = myExtent.width() / myWidth;
double myYRes = myExtent.height() / myHeight;
Expand Down Expand Up @@ -258,7 +258,7 @@ QgsRasterBandStats QgsRasterInterface::bandStatistics( int theBandNo,
QgsDebugMsg( QString( "MEAN %1" ).arg( myRasterBandStats.mean ) );
QgsDebugMsg( QString( "STDDEV %1" ).arg( myRasterBandStats.stdDev ) );

//QgsFree( myData );
//qgsFree( myData );

myRasterBandStats.statsGathered = QgsRasterBandStats::All;
mStatistics.append( myRasterBandStats );
Expand Down Expand Up @@ -447,7 +447,7 @@ QgsRasterHistogram QgsRasterInterface::histogram( int theBandNo,
int myNXBlocks = ( myWidth + myXBlockSize - 1 ) / myXBlockSize;
int myNYBlocks = ( myHeight + myYBlockSize - 1 ) / myYBlockSize;

//void *myData = QgsMalloc( myXBlockSize * myYBlockSize * ( QgsRasterBlock::typeSize( dataType( theBandNo ) ) ) );
//void *myData = qgsMalloc( myXBlockSize * myYBlockSize * ( QgsRasterBlock::typeSize( dataType( theBandNo ) ) ) );

double myXRes = myExtent.width() / myWidth;
double myYRes = myExtent.height() / myHeight;
Expand Down Expand Up @@ -510,7 +510,7 @@ QgsRasterHistogram QgsRasterInterface::histogram( int theBandNo,
}
}

//QgsFree( myData );
//qgsFree( myData );

myHistogram.valid = true;
mHistograms.append( myHistogram );
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterlayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2632,7 +2632,7 @@ void *QgsRasterLayer::readData( int bandNo, QgsRasterViewPort *viewPort )
", dest size: " + QString::number( viewPort->drawableAreaXDim ) +
", " + QString::number( viewPort->drawableAreaYDim ) );
#endif
void *data = QgsMalloc( size * viewPort->drawableAreaXDim * viewPort->drawableAreaYDim );
void *data = qgsMalloc( size * viewPort->drawableAreaXDim * viewPort->drawableAreaYDim );

/* Abort if out of memory */
if ( data == NULL )
Expand Down
4 changes: 2 additions & 2 deletions src/core/raster/qgsrasternuller.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ QgsRasterBlock * QgsRasterNuller::block( int bandNo, QgsRectangle const & exten
foreach ( NoData noData, mNoData )
{
if (( value >= noData.min && value <= noData.max ) ||
doubleNear( value, noData.min ) ||
doubleNear( value, noData.max ) )
qgsDoubleNear( value, noData.min ) ||
qgsDoubleNear( value, noData.max ) )
{
inputBlock->setValue( i, j, noDataValue );
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/raster/qgsrasterrange.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ bool QgsRasterRange::contains( double value, const QgsRasterRangeList &rangeList
foreach ( QgsRasterRange range, rangeList )
{
if (( value >= range.mMin && value <= range.mMax ) ||
doubleNear( value, range.mMin ) ||
doubleNear( value, range.mMax ) )
qgsDoubleNear( value, range.mMin ) ||
qgsDoubleNear( value, range.mMax ) )
{
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/raster/qgsrasterrenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ bool QgsRasterRenderer::usesTransparency( ) const
return true;
}
// TODO: nodata per band
//return ( mAlphaBand > 0 || ( mRasterTransparency && !mRasterTransparency->isEmpty( mInput->noDataValue( 1 ) ) ) || !doubleNear( mOpacity, 1.0 ) );
return ( mAlphaBand > 0 || ( mRasterTransparency && !mRasterTransparency->isEmpty() ) || !doubleNear( mOpacity, 1.0 ) );
//return ( mAlphaBand > 0 || ( mRasterTransparency && !mRasterTransparency->isEmpty( mInput->noDataValue( 1 ) ) ) || !qgsDoubleNear( mOpacity, 1.0 ) );
return ( mAlphaBand > 0 || ( mRasterTransparency && !mRasterTransparency->isEmpty() ) || !qgsDoubleNear( mOpacity, 1.0 ) );
}

void QgsRasterRenderer::setRasterTransparency( QgsRasterTransparency* t )
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterresamplefilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ QgsRasterBlock * QgsRasterResampleFilter::block( int bandNo, QgsRectangle const
return outputBlock;
}

if ( doubleNear( oversamplingX, 1.0 ) || doubleNear( oversamplingY, 1.0 ) )
if ( qgsDoubleNear( oversamplingX, 1.0 ) || qgsDoubleNear( oversamplingY, 1.0 ) )
{
QgsDebugMsg( "No oversampling." );
delete outputBlock;
Expand Down
14 changes: 7 additions & 7 deletions src/core/raster/qgsrastertransparency.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ int QgsRasterTransparency::alphaValue( double theValue, int theGlobalTransparenc
{
myTransparentPixel = mTransparentSingleValuePixelList[myListRunner];
if (( theValue >= myTransparentPixel.min && theValue <= myTransparentPixel.max ) ||
doubleNear( theValue, myTransparentPixel.min ) ||
doubleNear( theValue, myTransparentPixel.max ) )
qgsDoubleNear( theValue, myTransparentPixel.min ) ||
qgsDoubleNear( theValue, myTransparentPixel.max ) )
{
myTransparentPixelFound = true;
break;
Expand Down Expand Up @@ -186,16 +186,16 @@ bool QgsRasterTransparency::isEmpty( double nodataValue ) const
return (
( mTransparentSingleValuePixelList.isEmpty() ||
( mTransparentSingleValuePixelList.size() == 1 &&
( doubleNear( mTransparentSingleValuePixelList.at( 0 ).min, nodataValue ) ||
doubleNear( mTransparentSingleValuePixelList.at( 0 ).max, nodataValue ) ||
( qgsDoubleNear( mTransparentSingleValuePixelList.at( 0 ).min, nodataValue ) ||
qgsDoubleNear( mTransparentSingleValuePixelList.at( 0 ).max, nodataValue ) ||
( nodataValue >= mTransparentSingleValuePixelList.at( 0 ).min &&
nodataValue <= mTransparentSingleValuePixelList.at( 0 ).max ) ) ) )
&&
( mTransparentThreeValuePixelList.isEmpty() ||
( mTransparentThreeValuePixelList.size() == 1 &&
doubleNear( mTransparentThreeValuePixelList.at( 0 ).red, nodataValue ) &&
doubleNear( mTransparentThreeValuePixelList.at( 0 ).green, nodataValue ) &&
doubleNear( mTransparentThreeValuePixelList.at( 0 ).blue, nodataValue ) ) ) );
qgsDoubleNear( mTransparentThreeValuePixelList.at( 0 ).red, nodataValue ) &&
qgsDoubleNear( mTransparentThreeValuePixelList.at( 0 ).green, nodataValue ) &&
qgsDoubleNear( mTransparentThreeValuePixelList.at( 0 ).blue, nodataValue ) ) ) );
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgssinglebandgrayrenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ QgsRasterBlock* QgsSingleBandGrayRenderer::block( int bandNo, QgsRectangle cons
grayVal = 255 - grayVal;
}

if ( doubleNear( currentAlpha, 1.0 ) )
if ( qgsDoubleNear( currentAlpha, 1.0 ) )
{
outputBlock->setColor( i, qRgba( grayVal, grayVal, grayVal, 255 ) );
}
Expand Down
12 changes: 6 additions & 6 deletions src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,14 @@ void QgsEllipseSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Rend
{
rotation = mRotationExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toDouble();
}
else if ( !doubleNear( mAngle, 0.0 ) )
else if ( !qgsDoubleNear( mAngle, 0.0 ) )
{
rotation = mAngle;
}

QMatrix transform;
transform.translate( point.x(), point.y() );
if ( !doubleNear( rotation, 0.0 ) )
if ( !qgsDoubleNear( rotation, 0.0 ) )
{
transform.rotate( rotation );
}
Expand Down Expand Up @@ -265,7 +265,7 @@ void QgsEllipseSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement &el
{
if ( mRotationExpression )
angleFunc = mRotationExpression->dump();
else if ( !doubleNear( mAngle, 0.0 ) )
else if ( !qgsDoubleNear( mAngle, 0.0 ) )
angleFunc = QString::number( mAngle );
}
else if ( mRotationExpression )
Expand All @@ -274,7 +274,7 @@ void QgsEllipseSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement &el
// property set
angleFunc = QString( "%1 + %2" ).arg( angleFunc ).arg( mRotationExpression->dump() );
}
else if ( !doubleNear( mAngle, 0.0 ) )
else if ( !qgsDoubleNear( mAngle, 0.0 ) )
{
// both the symbol and the symbol layer have angle value set
bool ok;
Expand All @@ -284,7 +284,7 @@ void QgsEllipseSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement &el
// its a string (probably a property name or a function)
angleFunc = QString( "%1 + %2" ).arg( angleFunc ).arg( mAngle );
}
else if ( !doubleNear( angle + mAngle, 0.0 ) )
else if ( !qgsDoubleNear( angle + mAngle, 0.0 ) )
{
// it's a double value
angleFunc = QString::number( angle + mAngle );
Expand Down Expand Up @@ -313,7 +313,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::createFromSld( QDomElement &element )
{
bool ok;
double v = it.value().toDouble( &ok );
if ( ok && !doubleNear( v, 0.0 ) && v > 0 )
if ( ok && !qgsDoubleNear( v, 0.0 ) && v > 0 )
widthHeightFactor = v;
}
}
Expand Down
18 changes: 9 additions & 9 deletions src/core/symbology-ng/qgsfillsymbollayerv2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ void QgsImageFillSymbolLayer::renderPolygon( const QPolygonF& points, QList<QPol
_renderPolygon( p, points, rings );
}

if ( doubleNear( mAngle, 0.0 ) )
if ( qgsDoubleNear( mAngle, 0.0 ) )
{
p->setBrush( mBrush );
}
Expand Down Expand Up @@ -684,7 +684,7 @@ void QgsSVGFillSymbolLayer::applyPattern( QBrush& brush, const QString& svgFileP

QTransform brushTransform;
brushTransform.scale( 1.0 / context.renderContext().rasterScaleFactor(), 1.0 / context.renderContext().rasterScaleFactor() );
if ( !doubleNear( context.alpha(), 1.0 ) )
if ( !qgsDoubleNear( context.alpha(), 1.0 ) )
{
QImage transparentImage = fitsInCache ? patternImage.copy() : mSvgPattern->copy();
QgsSymbolLayerV2Utils::multiplyImageOpacity( &transparentImage, context.alpha() );
Expand Down Expand Up @@ -745,7 +745,7 @@ void QgsSVGFillSymbolLayer::startRender( QgsSymbolV2RenderContext& context )

QTransform brushTransform;
brushTransform.scale( 1.0 / context.renderContext().rasterScaleFactor(), 1.0 / context.renderContext().rasterScaleFactor() );
if ( !doubleNear( context.alpha(), 1.0 ) )
if ( !qgsDoubleNear( context.alpha(), 1.0 ) )
{
QImage transparentImage = fitsInCache ? patternImage.copy() : mSvgPattern->copy();
QgsSymbolLayerV2Utils::multiplyImageOpacity( &transparentImage, context.alpha() );
Expand Down Expand Up @@ -1350,7 +1350,7 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolV2RenderContext

//create image
int height, width;
if ( doubleNear( lineAngle, 0 ) || doubleNear( lineAngle, 360 ) || doubleNear( lineAngle, 90 ) || doubleNear( lineAngle, 180 ) || doubleNear( lineAngle, 270 ) )
if ( qgsDoubleNear( lineAngle, 0 ) || qgsDoubleNear( lineAngle, 360 ) || qgsDoubleNear( lineAngle, 90 ) || qgsDoubleNear( lineAngle, 180 ) || qgsDoubleNear( lineAngle, 270 ) )
{
height = outputPixelDist;
width = height; //width can be set to arbitrary value
Expand Down Expand Up @@ -1383,7 +1383,7 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolV2RenderContext
p.setPen( pen );

QPoint p1, p2, p3, p4, p5, p6;
if ( doubleNear( lineAngle, 0.0 ) || doubleNear( lineAngle, 360.0 ) || doubleNear( lineAngle, 180.0 ) )
if ( qgsDoubleNear( lineAngle, 0.0 ) || qgsDoubleNear( lineAngle, 360.0 ) || qgsDoubleNear( lineAngle, 180.0 ) )
{
p1 = QPoint( 0, height );
p2 = QPoint( width, height );
Expand All @@ -1392,7 +1392,7 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolV2RenderContext
p5 = QPoint( 0, 2 * height );
p6 = QPoint( width, 2 * height );
}
else if ( doubleNear( lineAngle, 90.0 ) || doubleNear( lineAngle, 270.0 ) )
else if ( qgsDoubleNear( lineAngle, 90.0 ) || qgsDoubleNear( lineAngle, 270.0 ) )
{
p1 = QPoint( 0, height );
p2 = QPoint( 0, 0 );
Expand Down Expand Up @@ -1424,7 +1424,7 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolV2RenderContext
p4 = QPoint( p3.x() - width, p3.y() - height ); //p4 = QPoint( -dx, dy );
}

if ( !doubleNear( mOffset, 0.0 ) ) //shift everything
if ( !qgsDoubleNear( mOffset, 0.0 ) ) //shift everything
{
QPointF tempPt;
tempPt = QgsSymbolLayerV2Utils::pointOnLineWithDistance( p1, p3, outputPixelDist + outputPixelOffset );
Expand All @@ -1449,7 +1449,7 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolV2RenderContext
p.end();

//set image to mBrush
if ( !doubleNear( context.alpha(), 1.0 ) )
if ( !qgsDoubleNear( context.alpha(), 1.0 ) )
{
QImage transparentImage = patternImage.copy();
QgsSymbolLayerV2Utils::multiplyImageOpacity( &transparentImage, context.alpha() );
Expand Down Expand Up @@ -1970,7 +1970,7 @@ void QgsPointPatternFillSymbolLayer::applyPattern( const QgsSymbolV2RenderContex
mMarkerSymbol->stopRender( pointRenderContext );
}

if ( !doubleNear( context.alpha(), 1.0 ) )
if ( !qgsDoubleNear( context.alpha(), 1.0 ) )
{
QImage transparentImage = patternImage.copy();
QgsSymbolLayerV2Utils::multiplyImageOpacity( &transparentImage, context.alpha() );
Expand Down
2 changes: 1 addition & 1 deletion src/core/symbology-ng/qgslinesymbollayerv2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,7 @@ void QgsMarkerLineSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element,
graphicStrokeElem.appendChild( gapElem );
}

if ( !doubleNear( mOffset, 0.0 ) )
if ( !qgsDoubleNear( mOffset, 0.0 ) )
{
QDomElement perpOffsetElem = doc.createElement( "se:PerpendicularOffset" );
perpOffsetElem.appendChild( doc.createTextNode( QString::number( mOffset ) ) );
Expand Down
6 changes: 3 additions & 3 deletions src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1124,8 +1124,8 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re
outputOffset = _rotatedOffset( outputOffset, angle );
p->translate( point + outputOffset );

bool rotated = !doubleNear( angle, 0 );
bool drawOnScreen = doubleNear( context.renderContext().rasterScaleFactor(), 1.0, 0.1 );
bool rotated = !qgsDoubleNear( angle, 0 );
bool drawOnScreen = qgsDoubleNear( context.renderContext().rasterScaleFactor(), 1.0, 0.1 );
if ( rotated )
p->rotate( angle );

Expand Down Expand Up @@ -1165,7 +1165,7 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re
if ( fitsInCache && img.width() > 1 )
{
//consider transparency
if ( !doubleNear( context.alpha(), 1.0 ) )
if ( !qgsDoubleNear( context.alpha(), 1.0 ) )
{
QImage transparentImage = img.copy();
QgsSymbolLayerV2Utils::multiplyImageOpacity( &transparentImage, context.alpha() );
Expand Down
4 changes: 2 additions & 2 deletions src/core/symbology-ng/qgssvgcache.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ void QgsSvgCache::cachePicture( QgsSvgCacheEntry *entry )
{
hwRatio = r.viewBoxF().height() / r.viewBoxF().width();
}
bool drawOnScreen = doubleNear( entry->rasterScaleFactor, 1.0, 0.1 );
bool drawOnScreen = qgsDoubleNear( entry->rasterScaleFactor, 1.0, 0.1 );
if ( drawOnScreen )
{
// fix to ensure rotated symbols scale with composer page (i.e. not map item) zoom
Expand Down Expand Up @@ -445,7 +445,7 @@ QgsSvgCacheEntry* QgsSvgCache::cacheEntry( const QString& file, double size, con
for ( ; entryIt != entries.end(); ++entryIt )
{
QgsSvgCacheEntry* cacheEntry = *entryIt;
if ( cacheEntry->file == file && doubleNear( cacheEntry->size, size ) && cacheEntry->fill == fill && cacheEntry->outline == outline &&
if ( cacheEntry->file == file && qgsDoubleNear( cacheEntry->size, size ) && cacheEntry->fill == fill && cacheEntry->outline == outline &&
cacheEntry->outlineWidth == outlineWidth && cacheEntry->widthScaleFactor == widthScaleFactor && cacheEntry->rasterScaleFactor == rasterScaleFactor )
{
currentEntry = cacheEntry;
Expand Down
14 changes: 7 additions & 7 deletions src/core/symbology-ng/qgssymbollayerv2utils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1434,9 +1434,9 @@ bool QgsSymbolLayerV2Utils::convertPolygonSymbolizerToPointMarker( QDomElement &
map["fill"] = fillColor.name();
map["outline"] = borderColor.name();
map["outline-width"] = QString::number( borderWidth );
if ( !doubleNear( size, 0.0 ) )
if ( !qgsDoubleNear( size, 0.0 ) )
map["size"] = QString::number( size );
if ( !doubleNear( angle, 0.0 ) )
if ( !qgsDoubleNear( angle, 0.0 ) )
map["angle"] = QString::number( angle );
if ( !offset.isNull() )
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( offset );
Expand All @@ -1450,7 +1450,7 @@ bool QgsSymbolLayerV2Utils::convertPolygonSymbolizerToPointMarker( QDomElement &
map["color"] = QgsSymbolLayerV2Utils::encodeColor( validFill ? fillColor : Qt::transparent );
if ( size > 0 )
map["size"] = QString::number( size );
if ( !doubleNear( angle, 0.0 ) )
if ( !qgsDoubleNear( angle, 0.0 ) )
map["angle"] = QString::number( angle );
if ( !offset.isNull() )
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( offset );
Expand Down Expand Up @@ -1642,7 +1642,7 @@ void QgsSymbolLayerV2Utils::lineToSld( QDomDocument &doc, QDomElement &element,
if ( pattern->size() > 0 )
{
element.appendChild( createSvgParameterElement( doc, "stroke-dasharray", encodeSldRealVector( *pattern ) ) );
if ( !doubleNear( dashOffset, 0.0 ) )
if ( !qgsDoubleNear( dashOffset, 0.0 ) )
element.appendChild( createSvgParameterElement( doc, "stroke-dashoffset", QString::number( dashOffset ) ) );
}
}
Expand Down Expand Up @@ -1846,7 +1846,7 @@ void QgsSymbolLayerV2Utils::externalMarkerToSld( QDomDocument &doc, QDomElement
markElem.appendChild( fillElem );

// <Size>
if ( !doubleNear( size, 0.0 ) && size > 0 )
if ( !qgsDoubleNear( size, 0.0 ) && size > 0 )
{
QDomElement sizeElem = doc.createElement( "se:Size" );
sizeElem.appendChild( doc.createTextNode( QString::number( size ) ) );
Expand Down Expand Up @@ -1926,7 +1926,7 @@ void QgsSymbolLayerV2Utils::wellKnownMarkerToSld( QDomDocument &doc, QDomElement
}

// <Size>
if ( !doubleNear( size, 0.0 ) && size > 0 )
if ( !qgsDoubleNear( size, 0.0 ) && size > 0 )
{
QDomElement sizeElem = doc.createElement( "se:Size" );
sizeElem.appendChild( doc.createTextNode( QString::number( size ) ) );
Expand Down Expand Up @@ -2160,7 +2160,7 @@ QString QgsSymbolLayerV2Utils::ogrFeatureStylePen( double width, double mmScaleF
}

//offset
if ( !doubleNear( offset, 0.0 ) )
if ( !qgsDoubleNear( offset, 0.0 ) )
{
penStyle.append( ",dp:" );
penStyle.append( QString::number( offset * mapUnitScaleFactor ) );
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgscomposerruler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void QgsComposerRuler::paintEvent( QPaintEvent* event )

if ( mDirection == Horizontal )
{
if ( doubleNear( width(), 0 ) )
if ( qgsDoubleNear( width(), 0 ) )
{
return;
}
Expand All @@ -77,7 +77,7 @@ void QgsComposerRuler::paintEvent( QPaintEvent* event )
}
else //vertical
{
if ( doubleNear( height(), 0 ) )
if ( qgsDoubleNear( height(), 0 ) )
{
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ QgsSymbolV2* QgsGraduatedSymbolRendererV2Widget::findSymbolForRange( double lowe
for ( QgsRangeList::const_iterator it = ranges.begin(); it != ranges.end(); ++it )
{
//range string has been created with option 'f',4
if ( doubleNear( lowerBound, it->lowerValue(), 0.0001 ) && doubleNear( upperBound, it->upperValue(), 0.0001 ) )
if ( qgsDoubleNear( lowerBound, it->lowerValue(), 0.0001 ) && qgsDoubleNear( upperBound, it->upperValue(), 0.0001 ) )
{
return it->symbol();
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/diagram_overlay/qgspiediagramfactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ QImage* QgsPieDiagramFactory::createDiagram( int size, const QgsFeature& f, cons
}
}

if ( doubleNear( sum, 0.0 ) )
if ( qgsDoubleNear( sum, 0.0 ) )
{
p.end();
delete diagramImage;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/georeferencer/qgsgeorefplugingui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,7 @@ bool QgsGeorefPluginGui::writeWorldFile( QgsPoint origin, double pixelXSize, dou
double rotationX = 0;
double rotationY = 0;

if ( !doubleNear( rotation, 0.0 ) )
if ( !qgsDoubleNear( rotation, 0.0 ) )
{
rotationX = pixelXSize * sin( rotation );
rotationY = pixelYSize * sin( rotation );
Expand Down
16 changes: 8 additions & 8 deletions src/providers/gdal/qgsgdalprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle const & theExtent,
QgsDebugMsg( QString( "tmpXMin = %1 tmpYMax = %2 tmpWidth = %3 tmpHeight = %4" ).arg( tmpXMin ).arg( tmpYMax ).arg( tmpWidth ).arg( tmpHeight ) );

// Allocate temporary block
char *tmpBlock = ( char * )QgsMalloc( dataSize * tmpWidth * tmpHeight );
char *tmpBlock = ( char * )qgsMalloc( dataSize * tmpWidth * tmpHeight );
if ( ! tmpBlock )
{
QgsDebugMsg( QString( "Coudn't allocate temporary buffer of %1 bytes" ).arg( dataSize * tmpWidth * tmpHeight ) );
Expand All @@ -582,7 +582,7 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle const & theExtent,
if ( err != CPLE_None )
{
QgsLogger::warning( "RasterIO error: " + QString::fromUtf8( CPLGetLastErrorMsg() ) );
QgsFree( tmpBlock );
qgsFree( tmpBlock );
return;
}

Expand Down Expand Up @@ -616,7 +616,7 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle const & theExtent,
y -= yRes;
}

QgsFree( tmpBlock );
qgsFree( tmpBlock );
QgsDebugMsg( QString( "resample time (ms): %1" ).arg( time.elapsed() ) );

return;
Expand Down Expand Up @@ -692,10 +692,10 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle const & theExtent,

myWarpOptions->nBandCount = 1;
myWarpOptions->panSrcBands =
( int * ) QgsMalloc( sizeof( int ) * myWarpOptions->nBandCount );
( int * ) qgsMalloc( sizeof( int ) * myWarpOptions->nBandCount );
myWarpOptions->panSrcBands[0] = theBandNo;
myWarpOptions->panDstBands =
( int * ) QgsMalloc( sizeof( int ) * myWarpOptions->nBandCount );
( int * ) qgsMalloc( sizeof( int ) * myWarpOptions->nBandCount );
myWarpOptions->panDstBands[0] = 1;

// TODO move here progressCallback and use it
Expand Down Expand Up @@ -731,8 +731,8 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle const & theExtent,
//CPLAssert( myWarpOptions->pTransformerArg != NULL );
myWarpOptions->pfnTransformer = GDALGenImgProjTransform;

myWarpOptions->padfDstNoDataReal = ( double * ) QgsMalloc( myWarpOptions->nBandCount * sizeof( double ) );
myWarpOptions->padfDstNoDataImag = ( double * ) QgsMalloc( myWarpOptions->nBandCount * sizeof( double ) );
myWarpOptions->padfDstNoDataReal = ( double * ) qgsMalloc( myWarpOptions->nBandCount * sizeof( double ) );
myWarpOptions->padfDstNoDataImag = ( double * ) qgsMalloc( myWarpOptions->nBandCount * sizeof( double ) );

myWarpOptions->padfDstNoDataReal[0] = mNoDataValue[theBandNo-1];
myWarpOptions->padfDstNoDataImag[0] = 0.0;
Expand Down Expand Up @@ -972,7 +972,7 @@ QgsRasterIdentifyResult QgsGdalProvider::identify( const QgsPoint & thePoint, Id
double value = myBlock->value( r, c );

if (( srcHasNoDataValue( i ) && useSrcNoDataValue( i ) &&
( qIsNaN( value ) || doubleNear( value, srcNoDataValue( i ) ) ) ) ||
( qIsNaN( value ) || qgsDoubleNear( value, srcNoDataValue( i ) ) ) ) ||
( QgsRasterRange::contains( value, userNoDataValue( i ) ) ) )
{
results.insert( i, QVariant() ); // null QVariant represents no data
Expand Down
2 changes: 1 addition & 1 deletion src/providers/grass/qgsgrassrasterprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ QgsRasterIdentifyResult QgsGrassRasterProvider::identify( const QgsPoint & thePo
}

// no data?
if ( qIsNaN( value ) || doubleNear( value, mInternalNoDataValue[0] ) )
if ( qIsNaN( value ) || qgsDoubleNear( value, mInternalNoDataValue[0] ) )
{
return noDataResult;
}
Expand Down
20 changes: 10 additions & 10 deletions src/providers/wcs/qgswcsprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,12 +570,12 @@ void QgsWcsProvider::readBlock( int bandNo, QgsRectangle const & viewExtent, in
// TODO: check also rotated
if ( cacheCrs.isValid() && !mFixRotate )
{
// using doubleNear is too precise, example accetable difference:
// using qgsDoubleNear is too precise, example accetable difference:
// 179.9999999306699863 x 179.9999999306700431
if ( !doubleNearSig( cacheExtent.xMinimum(), viewExtent.xMinimum(), 10 ) ||
!doubleNearSig( cacheExtent.yMinimum(), viewExtent.yMinimum(), 10 ) ||
!doubleNearSig( cacheExtent.xMaximum(), viewExtent.xMaximum(), 10 ) ||
!doubleNearSig( cacheExtent.yMaximum(), viewExtent.yMaximum(), 10 ) )
if ( !qgsDoubleNearSig( cacheExtent.xMinimum(), viewExtent.xMinimum(), 10 ) ||
!qgsDoubleNearSig( cacheExtent.yMinimum(), viewExtent.yMinimum(), 10 ) ||
!qgsDoubleNearSig( cacheExtent.xMaximum(), viewExtent.xMaximum(), 10 ) ||
!qgsDoubleNearSig( cacheExtent.yMaximum(), viewExtent.yMaximum(), 10 ) )
{
QgsDebugMsg( "cacheExtent and viewExtent differ" );
QgsMessageLog::logMessage( tr( "Received coverage has wrong extent %1 (expected %2)" ).arg( cacheExtent.toString() ).arg( viewExtent.toString() ), tr( "WCS" ) );
Expand Down Expand Up @@ -1398,10 +1398,10 @@ bool QgsWcsProvider::calculateExtent()
// extent check for rotated, TODO: verify
if ( cacheCrs.isValid() && !mFixRotate )
{
if ( !doubleNearSig( cacheExtent.xMinimum(), mCoverageExtent.xMinimum(), 10 ) ||
!doubleNearSig( cacheExtent.yMinimum(), mCoverageExtent.yMinimum(), 10 ) ||
!doubleNearSig( cacheExtent.xMaximum(), mCoverageExtent.xMaximum(), 10 ) ||
!doubleNearSig( cacheExtent.yMaximum(), mCoverageExtent.yMaximum(), 10 ) )
if ( !qgsDoubleNearSig( cacheExtent.xMinimum(), mCoverageExtent.xMinimum(), 10 ) ||
!qgsDoubleNearSig( cacheExtent.yMinimum(), mCoverageExtent.yMinimum(), 10 ) ||
!qgsDoubleNearSig( cacheExtent.xMaximum(), mCoverageExtent.xMaximum(), 10 ) ||
!qgsDoubleNearSig( cacheExtent.yMaximum(), mCoverageExtent.yMaximum(), 10 ) )
{
QgsDebugMsg( "cacheExtent and mCoverageExtent differ, mCoverageExtent cut to cacheExtent" );
mCoverageExtent = cacheExtent;
Expand Down Expand Up @@ -1700,7 +1700,7 @@ QgsRasterIdentifyResult QgsWcsProvider::identify( const QgsPoint & thePoint, Ide

// Apply no data and user no data
if (( srcHasNoDataValue( i ) && useSrcNoDataValue( i ) &&
( qIsNaN( value ) || doubleNear( value, srcNoDataValue( i ) ) ) ) ||
( qIsNaN( value ) || qgsDoubleNear( value, srcNoDataValue( i ) ) ) ) ||
( QgsRasterRange::contains( value, userNoDataValue( i ) ) ) )
{
results.insert( i, QVariant() );
Expand Down
2 changes: 1 addition & 1 deletion src/providers/wfs/qgswfsprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ QgsFeatureIterator QgsWFSProvider::getFeatures( const QgsFeatureRequest& request
// avoids unnecessary second fetch on zoom-in/zoom-out sequences
QgsRectangle olap( rect );
olap = olap.intersect( &mGetExtent );
if ( doubleNear( rect.width(), olap.width() ) && doubleNear( rect.height(), olap.height() ) )
if ( qgsDoubleNear( rect.width(), olap.width() ) && qgsDoubleNear( rect.height(), olap.height() ) )
{ //difference between canvas and layer extents is within rounding error: do not re-fetch
QgsDebugMsg( QString( "Layer %1 GetRenderedOnly: no fetch required" ).arg( mLayer->name() ) );
}
Expand Down
4 changes: 2 additions & 2 deletions tests/src/core/testqgsrastersublayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ void TestQgsRasterSubLayer::checkStats()

QVERIFY( sublayer->width() == width );
QVERIFY( sublayer->height() == height );
QVERIFY( doubleNear( myStatistics.minimumValue, min ) );
QVERIFY( doubleNear( myStatistics.maximumValue, max ) );
QVERIFY( qgsDoubleNear( myStatistics.minimumValue, min ) );
QVERIFY( qgsDoubleNear( myStatistics.maximumValue, max ) );
mReport += "<p>Passed</p>";
delete sublayer;
}
Expand Down