diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp index 792cb30cca8c..b5ed3a5c2def 100644 --- a/src/app/legend/qgslegend.cpp +++ b/src/app/legend/qgslegend.cpp @@ -2541,7 +2541,7 @@ void QgsLegend::groupSelectedLayers() //avoid multiple refreshes of map canvas because of itemChanged signal blockSignals( true ); - QTreeWidgetItem * parent; + QTreeWidgetItem * parent = 0; foreach( QTreeWidgetItem* item, selectedItems() ) { parent = item->parent(); diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp index 0fc079867c2f..e07c5378f891 100644 --- a/src/core/qgsprojectfiletransform.cpp +++ b/src/core/qgsprojectfiletransform.cpp @@ -498,7 +498,7 @@ void QgsProjectFileTransform::convertRasterProperties( QDomDocument& doc, QDomNo if ( !transparencyElem.isNull() ) { double transparency = transparencyElem.text().toInt(); - rasterRendererElem.setAttribute( "opacity", transparency / 255.0 ); + rasterRendererElem.setAttribute( "opacity", QString::number( transparency / 255.0 ) ); } //alphaBand was not saved until now (bug) diff --git a/src/core/raster/qgsbilinearrasterresampler.h b/src/core/raster/qgsbilinearrasterresampler.h index f2359d1a13f5..d469454dfd8d 100644 --- a/src/core/raster/qgsbilinearrasterresampler.h +++ b/src/core/raster/qgsbilinearrasterresampler.h @@ -21,7 +21,7 @@ #include "qgsrasterresampler.h" #include -class QgsBilinearRasterResampler: public QgsRasterResampler +class CORE_EXPORT QgsBilinearRasterResampler: public QgsRasterResampler { public: QgsBilinearRasterResampler(); diff --git a/src/core/raster/qgscubicrasterresampler.h b/src/core/raster/qgscubicrasterresampler.h index bb3df2d7efa5..f21273f39518 100644 --- a/src/core/raster/qgscubicrasterresampler.h +++ b/src/core/raster/qgscubicrasterresampler.h @@ -21,7 +21,7 @@ #include "qgsrasterresampler.h" #include -class QgsCubicRasterResampler: public QgsRasterResampler +class CORE_EXPORT QgsCubicRasterResampler: public QgsRasterResampler { public: QgsCubicRasterResampler(); diff --git a/src/core/raster/qgsmultibandcolorrenderer.cpp b/src/core/raster/qgsmultibandcolorrenderer.cpp index 677b86aad243..9677dd10bd63 100644 --- a/src/core/raster/qgsmultibandcolorrenderer.cpp +++ b/src/core/raster/qgsmultibandcolorrenderer.cpp @@ -115,17 +115,17 @@ void QgsMultiBandColorRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort, && mAlphaBand < 1 && !mRedContrastEnhancement && !mGreenContrastEnhancement && !mBlueContrastEnhancement && !mInvertColor ); - QgsRasterDataProvider::DataType redType; + QgsRasterDataProvider::DataType redType = QgsRasterDataProvider::UnknownDataType; if ( mRedBand > 0 ) { redType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mRedBand ); } - QgsRasterDataProvider::DataType greenType; + QgsRasterDataProvider::DataType greenType = QgsRasterDataProvider::UnknownDataType; if ( mGreenBand > 0 ) { greenType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mGreenBand ); } - QgsRasterDataProvider::DataType blueType; + QgsRasterDataProvider::DataType blueType = QgsRasterDataProvider::UnknownDataType; if ( mBlueBand > 0 ) { blueType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mBlueBand ); @@ -136,7 +136,7 @@ void QgsMultiBandColorRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort, transparencyType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mAlphaBand ); } - double oversamplingX, oversamplingY; + double oversamplingX = 1.0, oversamplingY = 1.0; QSet bands; if ( mRedBand > 0 ) { diff --git a/src/core/raster/qgsmultibandcolorrenderer.h b/src/core/raster/qgsmultibandcolorrenderer.h index f15003e3c03c..bb89002e9361 100644 --- a/src/core/raster/qgsmultibandcolorrenderer.h +++ b/src/core/raster/qgsmultibandcolorrenderer.h @@ -24,7 +24,7 @@ class QgsContrastEnhancement; class QDomElement; /**Renderer for multiband images with the color components*/ -class QgsMultiBandColorRenderer: public QgsRasterRenderer +class CORE_EXPORT QgsMultiBandColorRenderer: public QgsRasterRenderer { public: QgsMultiBandColorRenderer( QgsRasterDataProvider* provider, int redBand, int greenBand, int blueBand, diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/src/core/raster/qgspalettedrasterrenderer.cpp index 805986f3bfad..3d69c3d60b7e 100644 --- a/src/core/raster/qgspalettedrasterrenderer.cpp +++ b/src/core/raster/qgspalettedrasterrenderer.cpp @@ -42,8 +42,8 @@ QgsRasterRenderer* QgsPalettedRasterRenderer::create( const QDomElement& elem, Q } int bandNumber = elem.attribute( "band", "-1" ).toInt(); - int nColors; - QColor* colors; + int nColors = 0; + QColor* colors = 0; QDomElement paletteElem = elem.firstChildElement( "colorPalette" ); if ( !paletteElem.isNull() ) @@ -118,7 +118,7 @@ void QgsPalettedRasterRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort, //rendering is faster without considering user-defined transparency bool hasTransparency = usesTransparency( viewPort->mSrcCRS, viewPort->mDestCRS ); - void* transparencyData; + void* transparencyData = 0; while ( readNextRasterPart( mBandNumber, oversamplingX, oversamplingY, viewPort, nCols, nRows, nRasterCols, nRasterRows, &rasterData, topLeftCol, topLeftRow ) ) diff --git a/src/core/raster/qgspalettedrasterrenderer.h b/src/core/raster/qgspalettedrasterrenderer.h index a5a21280a679..1357d5b8cf5f 100644 --- a/src/core/raster/qgspalettedrasterrenderer.h +++ b/src/core/raster/qgspalettedrasterrenderer.h @@ -23,7 +23,7 @@ class QColor; class QDomElement; -class QgsPalettedRasterRenderer: public QgsRasterRenderer +class CORE_EXPORT QgsPalettedRasterRenderer: public QgsRasterRenderer { public: /**Renderer owns color array*/ diff --git a/src/core/raster/qgsrasterrenderer.cpp b/src/core/raster/qgsrasterrenderer.cpp index 93ebf0e954f1..d58e3162f1c9 100644 --- a/src/core/raster/qgsrasterrenderer.cpp +++ b/src/core/raster/qgsrasterrenderer.cpp @@ -105,7 +105,7 @@ void QgsRasterRenderer::startRasterRead( int bandNumber, QgsRasterViewPort* view int totalMemoryUsage = pInfo.nCols * oversamplingX * pInfo.nRows * oversamplingY * mProvider->dataTypeSize( bandNumber ); int parts = totalMemoryUsage / 100000000 + 1; - int nPartsPerDimension = sqrt( parts ); + int nPartsPerDimension = sqrt(( double ) parts ); pInfo.nColsPerPart = pInfo.nCols / nPartsPerDimension; pInfo.nRowsPerPart = pInfo.nRows / nPartsPerDimension; pInfo.currentCol = 0; @@ -246,7 +246,7 @@ void QgsRasterRenderer::drawImage( QPainter* p, QgsRasterViewPort* viewPort, con } //get QgsRasterProjector - QgsRasterProjector* prj; + QgsRasterProjector* prj = 0; QMap::const_iterator partInfoIt = mRasterPartInfos.constBegin(); if ( partInfoIt != mRasterPartInfos.constEnd() ) { @@ -326,9 +326,9 @@ void QgsRasterRenderer::_writeXML( QDomDocument& doc, QDomElement& rasterRendere } rasterRendererElem.setAttribute( "type", mType ); - rasterRendererElem.setAttribute( "opacity", mOpacity ); + rasterRendererElem.setAttribute( "opacity", QString::number( mOpacity ) ); rasterRendererElem.setAttribute( "alphaBand", mAlphaBand ); - rasterRendererElem.setAttribute( "maxOversampling", mMaxOversampling ); + rasterRendererElem.setAttribute( "maxOversampling", QString::number( mMaxOversampling ) ); rasterRendererElem.setAttribute( "invertColor", mInvertColor ); if ( mZoomedInResampler ) { diff --git a/src/core/raster/qgsrasterrenderer.h b/src/core/raster/qgsrasterrenderer.h index 944a4f60fb2f..a6cf46e8ace1 100644 --- a/src/core/raster/qgsrasterrenderer.h +++ b/src/core/raster/qgsrasterrenderer.h @@ -26,11 +26,11 @@ class QgsMapToPixel; class QgsRasterResampler; class QgsRasterProjector; class QgsRasterTransparency; -class QgsRasterViewPort; +struct QgsRasterViewPort; class QDomElement; -class QgsRasterRenderer +class CORE_EXPORT QgsRasterRenderer { public: //Stores information about reading of a raster band. Columns and rows are in unsampled coordinates diff --git a/src/core/raster/qgsrasterrendererregistry.h b/src/core/raster/qgsrasterrendererregistry.h index ed1f83295a9f..d63af0d9173e 100644 --- a/src/core/raster/qgsrasterrendererregistry.h +++ b/src/core/raster/qgsrasterrendererregistry.h @@ -30,7 +30,7 @@ class QgsRasterRendererWidget; typedef QgsRasterRenderer*( *QgsRasterRendererCreateFunc )( const QDomElement&, QgsRasterDataProvider* provider ); typedef QgsRasterRendererWidget*( *QgsRasterRendererWidgetCreateFunc )( QgsRasterLayer* ); -struct QgsRasterRendererRegistryEntry +struct CORE_EXPORT QgsRasterRendererRegistryEntry { QgsRasterRendererRegistryEntry( const QString& theName, const QString& theVisibleName, QgsRasterRendererCreateFunc rendererFunction, QgsRasterRendererWidgetCreateFunc widgetFunction ); @@ -41,7 +41,7 @@ struct QgsRasterRendererRegistryEntry QgsRasterRendererWidgetCreateFunc widgetCreateFunction; //pointer to create function for renderer widget }; -class QgsRasterRendererRegistry +class CORE_EXPORT QgsRasterRendererRegistry { public: static QgsRasterRendererRegistry* instance(); diff --git a/src/core/raster/qgsrastershader.cpp b/src/core/raster/qgsrastershader.cpp index c28b8e76381d..d6cc3c878c50 100644 --- a/src/core/raster/qgsrastershader.cpp +++ b/src/core/raster/qgsrastershader.cpp @@ -147,7 +147,7 @@ void QgsRasterShader::writeXML( QDomDocument& doc, QDomElement& parent ) const { QDomElement itemElem = doc.createElement( "item" ); itemElem.setAttribute( "label", itemIt->label ); - itemElem.setAttribute( "value", itemIt->value ); + itemElem.setAttribute( "value", QString::number( itemIt->value ) ); itemElem.setAttribute( "color", itemIt->color.name() ); colorRampShaderElem.appendChild( itemElem ); } diff --git a/src/core/raster/qgssinglebandgrayrenderer.h b/src/core/raster/qgssinglebandgrayrenderer.h index 60b93d10de03..f86cdb7409d9 100644 --- a/src/core/raster/qgssinglebandgrayrenderer.h +++ b/src/core/raster/qgssinglebandgrayrenderer.h @@ -23,7 +23,7 @@ class QgsContrastEnhancement; class QDomElement; -class QgsSingleBandGrayRenderer: public QgsRasterRenderer +class CORE_EXPORT QgsSingleBandGrayRenderer: public QgsRasterRenderer { public: QgsSingleBandGrayRenderer( QgsRasterDataProvider* provider, int grayBand ); diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp index fbcf9de6ad61..b394a50612c2 100644 --- a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp +++ b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp @@ -89,7 +89,7 @@ void QgsSingleBandPseudoColorRenderer::draw( QPainter* p, QgsRasterViewPort* vie int topLeftCol = 0; int topLeftRow = 0; void* rasterData; - void* transparencyData; + void* transparencyData = 0; double currentOpacity = mOpacity; QgsRasterDataProvider::DataType rasterType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mBand ); int red, green, blue; diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.h b/src/core/raster/qgssinglebandpseudocolorrenderer.h index 2c4743e5ef43..cb7f0c7f94bc 100644 --- a/src/core/raster/qgssinglebandpseudocolorrenderer.h +++ b/src/core/raster/qgssinglebandpseudocolorrenderer.h @@ -23,7 +23,7 @@ class QDomElement; class QgsRasterShader; -class QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer +class CORE_EXPORT QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer { public: /**Note: takes ownership of QgsRasterShader*/ diff --git a/src/gui/raster/qgsmultibandcolorrendererwidget.h b/src/gui/raster/qgsmultibandcolorrendererwidget.h index 99413c2f833e..4bbb2182bc96 100644 --- a/src/gui/raster/qgsmultibandcolorrendererwidget.h +++ b/src/gui/raster/qgsmultibandcolorrendererwidget.h @@ -27,7 +27,7 @@ class QgsRasterDataProvider; class QgsRasterLayer; class QLineEdit; -class QgsMultiBandColorRendererWidget: public QgsRasterRendererWidget, private Ui::QgsMultiBandColorRendererWidgetBase +class GUI_EXPORT QgsMultiBandColorRendererWidget: public QgsRasterRendererWidget, private Ui::QgsMultiBandColorRendererWidgetBase { Q_OBJECT diff --git a/src/gui/raster/qgspalettedrendererwidget.h b/src/gui/raster/qgspalettedrendererwidget.h index c42a09cb5680..4b7a4f1a6485 100644 --- a/src/gui/raster/qgspalettedrendererwidget.h +++ b/src/gui/raster/qgspalettedrendererwidget.h @@ -23,7 +23,7 @@ class QgsRasterLayer; -class QgsPalettedRendererWidget: public QgsRasterRendererWidget, private Ui::QgsPalettedRendererWidgetBase +class GUI_EXPORT QgsPalettedRendererWidget: public QgsRasterRendererWidget, private Ui::QgsPalettedRendererWidgetBase { Q_OBJECT diff --git a/src/gui/raster/qgsrasterrendererwidget.h b/src/gui/raster/qgsrasterrendererwidget.h index c4b2e27d5377..d815f5d79cf1 100644 --- a/src/gui/raster/qgsrasterrendererwidget.h +++ b/src/gui/raster/qgsrasterrendererwidget.h @@ -23,7 +23,7 @@ class QgsRasterLayer; class QgsRasterRenderer; -class QgsRasterRendererWidget: public QWidget +class GUI_EXPORT QgsRasterRendererWidget: public QWidget { public: QgsRasterRendererWidget( QgsRasterLayer* layer ) { mRasterLayer = layer; } diff --git a/src/gui/raster/qgssinglebandgrayrendererwidget.h b/src/gui/raster/qgssinglebandgrayrendererwidget.h index c5b833307300..3b2926c6f456 100644 --- a/src/gui/raster/qgssinglebandgrayrendererwidget.h +++ b/src/gui/raster/qgssinglebandgrayrendererwidget.h @@ -21,7 +21,7 @@ #include "qgsrasterrendererwidget.h" #include "ui_qgssinglebandgrayrendererwidgetbase.h" -class QgsSingleBandGrayRendererWidget: public QgsRasterRendererWidget, private Ui::QgsSingleBandGrayRendererWidgetBase +class GUI_EXPORT QgsSingleBandGrayRendererWidget: public QgsRasterRendererWidget, private Ui::QgsSingleBandGrayRendererWidgetBase { Q_OBJECT public: diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.h b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.h index 6b58c958f648..d509e8baf372 100644 --- a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.h +++ b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.h @@ -22,7 +22,7 @@ #include "qgscolorrampshader.h" #include "ui_qgssinglebandpseudocolorrendererwidgetbase.h" -class QgsSingleBandPseudoColorRendererWidget: public QgsRasterRendererWidget, +class GUI_EXPORT QgsSingleBandPseudoColorRendererWidget: public QgsRasterRendererWidget, private Ui::QgsSingleBandPseudoColorRendererWidgetBase { Q_OBJECT diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp index 49a6238b63fc..744f30625a21 100644 --- a/src/providers/wms/qgswmsprovider.cpp +++ b/src/providers/wms/qgswmsprovider.cpp @@ -2548,6 +2548,7 @@ void QgsWmsProvider::parseWMTSContents( QDomElement const &e ) metersPerUnit = 111319.49079327358; break; + default: case QGis::UnknownUnit: QgsDebugMsg( "Unknown CRS units - assuming meters" ); metersPerUnit = 1.0;