Skip to content
Permalink
Browse files

fix more warnings

(layers might be miscounted in qgsowsdataitems.cpp)
  • Loading branch information
jef-n committed Aug 1, 2012
1 parent ba57579 commit 5a43d7451f37e3adcdc3618c9cf253a97d99e697
@@ -26,8 +26,10 @@
// qextserialport.h includes windows.h,
// which defines min()/max() macros w/o NOMINMAX,
// which in turn breaks limits std::numeric_limits<T>::min()/max()
#ifndef NOMINMAX
#define NOMINMAX
#endif
#endif

#include "qextserialport.h"

@@ -45,9 +45,9 @@ unsigned char* QgsClipper::clippedLineWKB( unsigned char* wkb, const QgsRectangl

bool hasZValue = ( wkbType == QGis::WKBLineString25D );

double p0x, p0y, p1x, p1y; //original coordinates
double p0x, p0y, p1x = 0.0, p1y = 0.0; //original coordinates
double p1x_c, p1y_c; //clipped end coordinates
double lastClipX, lastClipY; //last successfully clipped coords
double lastClipX = 0.0, lastClipY = 0.0; //last successfully clipped coords

line.reserve( nPoints + 1 );
line.clear();
@@ -5566,7 +5566,7 @@ GEOSGeometry* QgsGeometry::reshapeLine( const GEOSGeometry* line, const GEOSGeom
return 0;
}

bool atLeastTwoIntersections;
bool atLeastTwoIntersections = false;

try
{
@@ -1598,7 +1598,7 @@ QgsVectorOverlay* QgsSLDParser::vectorOverlayFromDiagramSymbolizer( const QDomEl
QList<QgsDiagramItem> theItems;
QList<int> scalingAttributes;
QgsAttributeList factoryCategoryAttributes;
QgsDiagramRenderer::ItemInterpretation interpretation; //discrete or linear
QgsDiagramRenderer::ItemInterpretation interpretation = QgsDiagramRenderer::DISCRETE; //discrete or linear

//scale
double scaleFactor = scaleFactorFromScaleTag( diagramElem.namedItem( "Scale" ).toElement() );
@@ -283,7 +283,7 @@ void HeatmapGui::updateBBox()
mBBox = inputLayer->extent();
QgsCoordinateReferenceSystem layerCrs = inputLayer->crs();

float radiusInMapUnits;
float radiusInMapUnits = 0.0;
if ( useRadius->isChecked() )
{
float maxInField = inputLayer->maximumValue( radiusFieldCombo->itemData( radiusFieldCombo->currentIndex() ).toInt() ).toFloat();
@@ -29,7 +29,7 @@ QVector<QgsDataItem*> QgsOWSConnectionItem::createChildren()

QVector<QgsDataItem*> serviceItems;

int layerCount;
int layerCount = 0;
// Try to open with WMS,WFS,WCS
foreach( QString key, QStringList() << "wms" << "WFS" << "gdal" )
{
@@ -1821,7 +1821,8 @@ QString QgsPostgresProvider::geomParam( int offset ) const
{
QString geometry;

bool forceMulti;
bool forceMulti = false;

switch ( geometryType() )
{
case QGis::WKBPoint:
@@ -1845,7 +1846,6 @@ QString QgsPostgresProvider::geomParam( int offset ) const
break;
}


if ( forceMulti )
{
geometry += mConnectionRO->majorVersion() < 2 ? "multi(" : "st_multi(";

0 comments on commit 5a43d74

Please sign in to comment.
You can’t perform that action at this time.