Skip to content

Commit 66c51e6

Browse files
author
jef
committedJan 24, 2010
fix warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk@12831 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 553e4d2 commit 66c51e6

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed
 

‎src/app/qgisappinterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ void QgisAppInterface::refreshLegend( QgsMapLayer *l )
200200

201201
void QgisAppInterface::showLayerProperties( QgsMapLayer *l )
202202
{
203-
if( l && qgis )
203+
if ( l && qgis )
204204
{
205205
qgis->showLayerProperties( l );
206206
}

‎src/core/raster/qgsrasterlayer.cpp

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,7 @@ bool QgsRasterLayer::draw( QgsRenderContext& rendererContext )
16081608
for ( int i = 0; i < numParts; ++i )
16091609
{
16101610
//fetch a small overlap of 2 pixels between two adjacent tiles to avoid white stripes
1611-
QgsRectangle rasterPartRect( myRasterExtent.xMinimum(), myRasterExtent.yMaximum() - ( currentPixelOffsetY + numRowsPerPart + 2 ) * theQgsMapToPixel.mapUnitsPerPixel(), \
1611+
QgsRectangle rasterPartRect( myRasterExtent.xMinimum(), myRasterExtent.yMaximum() - ( currentPixelOffsetY + numRowsPerPart + 2 ) * theQgsMapToPixel.mapUnitsPerPixel(),
16121612
myRasterExtent.xMaximum(), myRasterExtent.yMaximum() - currentPixelOffsetY * theQgsMapToPixel.mapUnitsPerPixel() );
16131613

16141614
int pixelHeight = rasterPartRect.height() / theQgsMapToPixel.mapUnitsPerPixel();
@@ -4410,7 +4410,8 @@ void QgsRasterLayer::drawMultiBandColor( QPainter * theQPainter, QgsRasterViewPo
44104410
blueImageBuffer.setWritingEnabled( false ); //only draw to redImageBuffer
44114411
blueImageBuffer.reset();
44124412

4413-
while ( redImageBuffer.nextScanLine( &redImageScanLine, &redRasterScanLine ) && greenImageBuffer.nextScanLine( &greenImageScanLine, &greenRasterScanLine ) \
4413+
while ( redImageBuffer.nextScanLine( &redImageScanLine, &redRasterScanLine )
4414+
&& greenImageBuffer.nextScanLine( &greenImageScanLine, &greenRasterScanLine )
44144415
&& blueImageBuffer.nextScanLine( &blueImageScanLine, &blueRasterScanLine ) )
44154416
{
44164417
for ( int i = 0; i < theRasterViewPort->drawableAreaXDim; ++i )
@@ -4419,13 +4420,21 @@ void QgsRasterLayer::drawMultiBandColor( QPainter * theQPainter, QgsRasterViewPo
44194420
myGreenValue = readValue( greenRasterScanLine, ( GDALDataType )myGreenType, i );
44204421
myBlueValue = readValue( blueRasterScanLine, ( GDALDataType )myBlueType, i );
44214422

4422-
if ( mValidNoDataValue && (( fabs( myRedValue - mNoDataValue ) <= TINY_VALUE || myRedValue != myRedValue ) || ( fabs( myGreenValue - mNoDataValue ) <= TINY_VALUE || myGreenValue != myGreenValue ) || ( fabs( myBlueValue - mNoDataValue ) <= TINY_VALUE || myBlueValue != myBlueValue ) ) )
4423+
if ( mValidNoDataValue &&
4424+
(
4425+
( fabs( myRedValue - mNoDataValue ) <= TINY_VALUE || myRedValue != myRedValue ) ||
4426+
( fabs( myGreenValue - mNoDataValue ) <= TINY_VALUE || myGreenValue != myGreenValue ) ||
4427+
( fabs( myBlueValue - mNoDataValue ) <= TINY_VALUE || myBlueValue != myBlueValue )
4428+
)
4429+
)
44234430
{
44244431
redImageScanLine[ i ] = myDefaultColor;
44254432
continue;
44264433
}
44274434

4428-
if ( !myRedContrastEnhancement->isValueInDisplayableRange( myRedValue ) || !myGreenContrastEnhancement->isValueInDisplayableRange( myGreenValue ) || !myBlueContrastEnhancement->isValueInDisplayableRange( myBlueValue ) )
4435+
if ( !myRedContrastEnhancement->isValueInDisplayableRange( myRedValue ) ||
4436+
!myGreenContrastEnhancement->isValueInDisplayableRange( myGreenValue ) ||
4437+
!myBlueContrastEnhancement->isValueInDisplayableRange( myBlueValue ) )
44294438
{
44304439
redImageScanLine[ i ] = myDefaultColor;
44314440
continue;
@@ -5531,8 +5540,8 @@ QString QgsRasterLayer::validateBandName( QString const & theBandName )
55315540
return TRSTRING_NOT_SET;
55325541
}
55335542

5534-
QgsRasterImageBuffer::QgsRasterImageBuffer( GDALRasterBandH rasterBand, QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* mapToPixel, double* geoTransform ): \
5535-
mRasterBand( rasterBand ), mPainter( p ), mViewPort( viewPort ), mMapToPixel( mapToPixel ), mValid( false ), mWritingEnabled( true ), mDrawPixelRect( false ), mCurrentImage( 0 ), mCurrentGDALData( 0 ), mGeoTransform( geoTransform )
5543+
QgsRasterImageBuffer::QgsRasterImageBuffer( GDALRasterBandH rasterBand, QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* mapToPixel, double* geoTransform ):
5544+
mRasterBand( rasterBand ), mPainter( p ), mViewPort( viewPort ), mMapToPixel( mapToPixel ), mGeoTransform( geoTransform ), mValid( false ), mWritingEnabled( true ), mDrawPixelRect( false ), mCurrentImage( 0 ), mCurrentGDALData( 0 )
55365545
{
55375546

55385547
}
@@ -5679,8 +5688,8 @@ bool QgsRasterImageBuffer::createNextPartImage()
56795688
}
56805689
mNumCurrentImageRows = ySize;
56815690
mCurrentGDALData = VSIMalloc( size * xSize * ySize );
5682-
CPLErr myErr = GDALRasterIO( mRasterBand, GF_Read, mViewPort->rectXOffset, \
5683-
mViewPort->rectYOffset + mCurrentRow, mViewPort->clippedWidth, rasterYSize, \
5691+
CPLErr myErr = GDALRasterIO( mRasterBand, GF_Read, mViewPort->rectXOffset,
5692+
mViewPort->rectYOffset + mCurrentRow, mViewPort->clippedWidth, rasterYSize,
56845693
mCurrentGDALData, xSize, ySize, type, 0, 0 );
56855694

56865695
if ( myErr != CPLE_None )

‎src/core/symbology-ng/qgsfillsymbollayerv2.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
21
#include "qgsfillsymbollayerv2.h"
32
#include "qgssymbollayerv2utils.h"
43

54
#include "qgsrendercontext.h"
5+
#include "qgsproject.h"
66

77
#include <QPainter>
8+
#include <QFile>
9+
#include <QSvgRenderer>
810

911
QgsSimpleFillSymbolLayerV2::QgsSimpleFillSymbolLayerV2( QColor color, Qt::BrushStyle style, QColor borderColor, Qt::PenStyle borderStyle, double borderWidth )
1012
: mBrushStyle( style ), mBorderColor( borderColor ), mBorderStyle( borderStyle ), mBorderWidth( borderWidth )
@@ -86,9 +88,6 @@ QgsSymbolLayerV2* QgsSimpleFillSymbolLayerV2::clone() const
8688
}
8789

8890
//QgsSVGFillSymbolLayer
89-
#include <QFile>
90-
#include <QSvgRenderer>
91-
#include "qgsproject.h" //for absolute/relative file paths
9291

9392
QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QString& svgFilePath, double width ): mPatternWidth( width ), mOutline( 0 )
9493
{
@@ -97,7 +96,7 @@ QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QString& svgFilePath, double
9796
setSubSymbol( new QgsLineSymbolV2() );
9897
}
9998

100-
QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QByteArray& svgData, double width ): mSvgData( svgData ), mPatternWidth( width ), mOutline( 0 )
99+
QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QByteArray& svgData, double width ): mPatternWidth( width ), mSvgData( svgData ), mOutline( 0 )
101100
{
102101
storeViewBox();
103102
mOutlineWidth = 0.3;
@@ -280,14 +279,12 @@ void QgsSVGFillSymbolLayer::storeViewBox()
280279

281280
bool QgsSVGFillSymbolLayer::setSubSymbol( QgsSymbolV2* symbol )
282281
{
283-
284282
if ( !symbol || symbol->type() != QgsSymbolV2::Line )
285283
{
286284
delete symbol;
287285
return false;
288286
}
289287

290-
291288
QgsLineSymbolV2* lineSymbol = dynamic_cast<QgsLineSymbolV2*>( symbol );
292289
if ( lineSymbol )
293290
{

‎src/plugins/diagram_overlay/qgsdiagramoverlayplugin.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "qgsvectoroverlayplugin.h"
2222
#include <QObject>
2323

24-
class QgisApp;
2524
class QgisInterface;
2625
class QgsApplyDialog;
2726

0 commit comments

Comments
 (0)
Please sign in to comment.