Skip to content

Commit 010331d

Browse files
author
jef
committed
fix some warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk@13080 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent f6e507c commit 010331d

File tree

2 files changed

+5
-39
lines changed

2 files changed

+5
-39
lines changed

src/analysis/interpolation/Vector3D.h

+2-36
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
class ANALYSIS_EXPORT Vector3D
2727
/**
28-
Class Vector3D represents a 3D-Vector, capable to store x-,y- and z-coordinates in double values. In fact, the class is the same as Point3D. The name 'vector' makes it easier to understand the programs.
29-
*/
28+
Class Vector3D represents a 3D-Vector, capable to store x-,y- and z-coordinates in double values. In fact, the class is the same as Point3D. The name 'vector' makes it easier to understand the programs.
29+
*/
3030

3131
{
3232
protected:
@@ -117,37 +117,3 @@ inline void Vector3D::setZ( double z )
117117
}
118118

119119
#endif
120-
121-
122-
123-
124-
125-
126-
127-
128-
129-
130-
131-
132-
133-
134-
135-
136-
137-
138-
139-
140-
141-
142-
143-
144-
145-
146-
147-
148-
149-
150-
151-
152-
153-

src/analysis/vector/qgszonalstatistics.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ int QgsZonalStatistics::calculateStatistics( QProgressDialog* p )
137137

138138
while ( vectorProvider->nextFeature( f ) )
139139
{
140-
qWarning( QString::number( featureCounter ).toLocal8Bit().data() );
140+
qWarning( "%d", featureCounter );
141141
if ( p )
142142
{
143143
p->setValue( featureCounter );
@@ -338,7 +338,7 @@ void QgsZonalStatistics::statisticsFromMiddlePointTest_improved( void* band, Qgs
338338
}
339339

340340
//debug
341-
char* scanLineIntersectionType = GEOSGeomType( scanLineIntersection );
341+
//char* scanLineIntersectionType = GEOSGeomType( scanLineIntersection );
342342

343343
int numGeoms = GEOSGetNumGeometries( scanLineIntersection );
344344
if ( numGeoms < 1 )
@@ -372,7 +372,7 @@ void QgsZonalStatistics::statisticsFromMiddlePointTest_improved( void* band, Qgs
372372
{
373373
//error
374374
}
375-
for ( int k = 0; k < scanLineIntersectionSize; ++k )
375+
for ( unsigned int k = 0; k < scanLineIntersectionSize; ++k )
376376
{
377377
GEOSCoordSeq_getX( scanLineCoordSequence, k, &currentValue );
378378
scanLineList.push_back( currentValue );

0 commit comments

Comments
 (0)