Skip to content

Commit 414cb77

Browse files
committed
fix warnings and link errors on windows
1 parent 9275f8e commit 414cb77

21 files changed

+31
-30
lines changed

src/app/legend/qgslegend.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2541,7 +2541,7 @@ void QgsLegend::groupSelectedLayers()
25412541
//avoid multiple refreshes of map canvas because of itemChanged signal
25422542
blockSignals( true );
25432543

2544-
QTreeWidgetItem * parent;
2544+
QTreeWidgetItem * parent = 0;
25452545
foreach( QTreeWidgetItem* item, selectedItems() )
25462546
{
25472547
parent = item->parent();

src/core/qgsprojectfiletransform.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ void QgsProjectFileTransform::convertRasterProperties( QDomDocument& doc, QDomNo
498498
if ( !transparencyElem.isNull() )
499499
{
500500
double transparency = transparencyElem.text().toInt();
501-
rasterRendererElem.setAttribute( "opacity", transparency / 255.0 );
501+
rasterRendererElem.setAttribute( "opacity", QString::number( transparency / 255.0 ) );
502502
}
503503

504504
//alphaBand was not saved until now (bug)

src/core/raster/qgsbilinearrasterresampler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "qgsrasterresampler.h"
2222
#include <QColor>
2323

24-
class QgsBilinearRasterResampler: public QgsRasterResampler
24+
class CORE_EXPORT QgsBilinearRasterResampler: public QgsRasterResampler
2525
{
2626
public:
2727
QgsBilinearRasterResampler();

src/core/raster/qgscubicrasterresampler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "qgsrasterresampler.h"
2222
#include <QColor>
2323

24-
class QgsCubicRasterResampler: public QgsRasterResampler
24+
class CORE_EXPORT QgsCubicRasterResampler: public QgsRasterResampler
2525
{
2626
public:
2727
QgsCubicRasterResampler();

src/core/raster/qgsmultibandcolorrenderer.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,17 @@ void QgsMultiBandColorRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
115115
&& mAlphaBand < 1 && !mRedContrastEnhancement && !mGreenContrastEnhancement && !mBlueContrastEnhancement
116116
&& !mInvertColor );
117117

118-
QgsRasterDataProvider::DataType redType;
118+
QgsRasterDataProvider::DataType redType = QgsRasterDataProvider::UnknownDataType;
119119
if ( mRedBand > 0 )
120120
{
121121
redType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mRedBand );
122122
}
123-
QgsRasterDataProvider::DataType greenType;
123+
QgsRasterDataProvider::DataType greenType = QgsRasterDataProvider::UnknownDataType;
124124
if ( mGreenBand > 0 )
125125
{
126126
greenType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mGreenBand );
127127
}
128-
QgsRasterDataProvider::DataType blueType;
128+
QgsRasterDataProvider::DataType blueType = QgsRasterDataProvider::UnknownDataType;
129129
if ( mBlueBand > 0 )
130130
{
131131
blueType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mBlueBand );
@@ -136,7 +136,7 @@ void QgsMultiBandColorRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
136136
transparencyType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mAlphaBand );
137137
}
138138

139-
double oversamplingX, oversamplingY;
139+
double oversamplingX = 1.0, oversamplingY = 1.0;
140140
QSet<int> bands;
141141
if ( mRedBand > 0 )
142142
{

src/core/raster/qgsmultibandcolorrenderer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class QgsContrastEnhancement;
2424
class QDomElement;
2525

2626
/**Renderer for multiband images with the color components*/
27-
class QgsMultiBandColorRenderer: public QgsRasterRenderer
27+
class CORE_EXPORT QgsMultiBandColorRenderer: public QgsRasterRenderer
2828
{
2929
public:
3030
QgsMultiBandColorRenderer( QgsRasterDataProvider* provider, int redBand, int greenBand, int blueBand,

src/core/raster/qgspalettedrasterrenderer.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ QgsRasterRenderer* QgsPalettedRasterRenderer::create( const QDomElement& elem, Q
4242
}
4343

4444
int bandNumber = elem.attribute( "band", "-1" ).toInt();
45-
int nColors;
46-
QColor* colors;
45+
int nColors = 0;
46+
QColor* colors = 0;
4747

4848
QDomElement paletteElem = elem.firstChildElement( "colorPalette" );
4949
if ( !paletteElem.isNull() )
@@ -118,7 +118,7 @@ void QgsPalettedRasterRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
118118

119119
//rendering is faster without considering user-defined transparency
120120
bool hasTransparency = usesTransparency( viewPort->mSrcCRS, viewPort->mDestCRS );
121-
void* transparencyData;
121+
void* transparencyData = 0;
122122

123123
while ( readNextRasterPart( mBandNumber, oversamplingX, oversamplingY, viewPort, nCols, nRows, nRasterCols, nRasterRows,
124124
&rasterData, topLeftCol, topLeftRow ) )

src/core/raster/qgspalettedrasterrenderer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
class QColor;
2424
class QDomElement;
2525

26-
class QgsPalettedRasterRenderer: public QgsRasterRenderer
26+
class CORE_EXPORT QgsPalettedRasterRenderer: public QgsRasterRenderer
2727
{
2828
public:
2929
/**Renderer owns color array*/

src/core/raster/qgsrasterrenderer.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void QgsRasterRenderer::startRasterRead( int bandNumber, QgsRasterViewPort* view
105105

106106
int totalMemoryUsage = pInfo.nCols * oversamplingX * pInfo.nRows * oversamplingY * mProvider->dataTypeSize( bandNumber );
107107
int parts = totalMemoryUsage / 100000000 + 1;
108-
int nPartsPerDimension = sqrt( parts );
108+
int nPartsPerDimension = sqrt(( double ) parts );
109109
pInfo.nColsPerPart = pInfo.nCols / nPartsPerDimension;
110110
pInfo.nRowsPerPart = pInfo.nRows / nPartsPerDimension;
111111
pInfo.currentCol = 0;
@@ -246,7 +246,7 @@ void QgsRasterRenderer::drawImage( QPainter* p, QgsRasterViewPort* viewPort, con
246246
}
247247

248248
//get QgsRasterProjector
249-
QgsRasterProjector* prj;
249+
QgsRasterProjector* prj = 0;
250250
QMap<int, RasterPartInfo>::const_iterator partInfoIt = mRasterPartInfos.constBegin();
251251
if ( partInfoIt != mRasterPartInfos.constEnd() )
252252
{
@@ -326,9 +326,9 @@ void QgsRasterRenderer::_writeXML( QDomDocument& doc, QDomElement& rasterRendere
326326
}
327327

328328
rasterRendererElem.setAttribute( "type", mType );
329-
rasterRendererElem.setAttribute( "opacity", mOpacity );
329+
rasterRendererElem.setAttribute( "opacity", QString::number( mOpacity ) );
330330
rasterRendererElem.setAttribute( "alphaBand", mAlphaBand );
331-
rasterRendererElem.setAttribute( "maxOversampling", mMaxOversampling );
331+
rasterRendererElem.setAttribute( "maxOversampling", QString::number( mMaxOversampling ) );
332332
rasterRendererElem.setAttribute( "invertColor", mInvertColor );
333333
if ( mZoomedInResampler )
334334
{

src/core/raster/qgsrasterrenderer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ class QgsMapToPixel;
2626
class QgsRasterResampler;
2727
class QgsRasterProjector;
2828
class QgsRasterTransparency;
29-
class QgsRasterViewPort;
29+
struct QgsRasterViewPort;
3030

3131
class QDomElement;
3232

33-
class QgsRasterRenderer
33+
class CORE_EXPORT QgsRasterRenderer
3434
{
3535
public:
3636
//Stores information about reading of a raster band. Columns and rows are in unsampled coordinates

src/core/raster/qgsrasterrendererregistry.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class QgsRasterRendererWidget;
3030
typedef QgsRasterRenderer*( *QgsRasterRendererCreateFunc )( const QDomElement&, QgsRasterDataProvider* provider );
3131
typedef QgsRasterRendererWidget*( *QgsRasterRendererWidgetCreateFunc )( QgsRasterLayer* );
3232

33-
struct QgsRasterRendererRegistryEntry
33+
struct CORE_EXPORT QgsRasterRendererRegistryEntry
3434
{
3535
QgsRasterRendererRegistryEntry( const QString& theName, const QString& theVisibleName, QgsRasterRendererCreateFunc rendererFunction,
3636
QgsRasterRendererWidgetCreateFunc widgetFunction );
@@ -41,7 +41,7 @@ struct QgsRasterRendererRegistryEntry
4141
QgsRasterRendererWidgetCreateFunc widgetCreateFunction; //pointer to create function for renderer widget
4242
};
4343

44-
class QgsRasterRendererRegistry
44+
class CORE_EXPORT QgsRasterRendererRegistry
4545
{
4646
public:
4747
static QgsRasterRendererRegistry* instance();

src/core/raster/qgsrastershader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void QgsRasterShader::writeXML( QDomDocument& doc, QDomElement& parent ) const
147147
{
148148
QDomElement itemElem = doc.createElement( "item" );
149149
itemElem.setAttribute( "label", itemIt->label );
150-
itemElem.setAttribute( "value", itemIt->value );
150+
itemElem.setAttribute( "value", QString::number( itemIt->value ) );
151151
itemElem.setAttribute( "color", itemIt->color.name() );
152152
colorRampShaderElem.appendChild( itemElem );
153153
}

src/core/raster/qgssinglebandgrayrenderer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
class QgsContrastEnhancement;
2424
class QDomElement;
2525

26-
class QgsSingleBandGrayRenderer: public QgsRasterRenderer
26+
class CORE_EXPORT QgsSingleBandGrayRenderer: public QgsRasterRenderer
2727
{
2828
public:
2929
QgsSingleBandGrayRenderer( QgsRasterDataProvider* provider, int grayBand );

src/core/raster/qgssinglebandpseudocolorrenderer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void QgsSingleBandPseudoColorRenderer::draw( QPainter* p, QgsRasterViewPort* vie
8989
int topLeftCol = 0;
9090
int topLeftRow = 0;
9191
void* rasterData;
92-
void* transparencyData;
92+
void* transparencyData = 0;
9393
double currentOpacity = mOpacity;
9494
QgsRasterDataProvider::DataType rasterType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mBand );
9595
int red, green, blue;

src/core/raster/qgssinglebandpseudocolorrenderer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
class QDomElement;
2424
class QgsRasterShader;
2525

26-
class QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer
26+
class CORE_EXPORT QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer
2727
{
2828
public:
2929
/**Note: takes ownership of QgsRasterShader*/

src/gui/raster/qgsmultibandcolorrendererwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class QgsRasterDataProvider;
2727
class QgsRasterLayer;
2828
class QLineEdit;
2929

30-
class QgsMultiBandColorRendererWidget: public QgsRasterRendererWidget, private Ui::QgsMultiBandColorRendererWidgetBase
30+
class GUI_EXPORT QgsMultiBandColorRendererWidget: public QgsRasterRendererWidget, private Ui::QgsMultiBandColorRendererWidgetBase
3131
{
3232
Q_OBJECT
3333

src/gui/raster/qgspalettedrendererwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
class QgsRasterLayer;
2525

26-
class QgsPalettedRendererWidget: public QgsRasterRendererWidget, private Ui::QgsPalettedRendererWidgetBase
26+
class GUI_EXPORT QgsPalettedRendererWidget: public QgsRasterRendererWidget, private Ui::QgsPalettedRendererWidgetBase
2727
{
2828
Q_OBJECT
2929

src/gui/raster/qgsrasterrendererwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
class QgsRasterLayer;
2424
class QgsRasterRenderer;
2525

26-
class QgsRasterRendererWidget: public QWidget
26+
class GUI_EXPORT QgsRasterRendererWidget: public QWidget
2727
{
2828
public:
2929
QgsRasterRendererWidget( QgsRasterLayer* layer ) { mRasterLayer = layer; }

src/gui/raster/qgssinglebandgrayrendererwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "qgsrasterrendererwidget.h"
2222
#include "ui_qgssinglebandgrayrendererwidgetbase.h"
2323

24-
class QgsSingleBandGrayRendererWidget: public QgsRasterRendererWidget, private Ui::QgsSingleBandGrayRendererWidgetBase
24+
class GUI_EXPORT QgsSingleBandGrayRendererWidget: public QgsRasterRendererWidget, private Ui::QgsSingleBandGrayRendererWidgetBase
2525
{
2626
Q_OBJECT
2727
public:

src/gui/raster/qgssinglebandpseudocolorrendererwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "qgscolorrampshader.h"
2323
#include "ui_qgssinglebandpseudocolorrendererwidgetbase.h"
2424

25-
class QgsSingleBandPseudoColorRendererWidget: public QgsRasterRendererWidget,
25+
class GUI_EXPORT QgsSingleBandPseudoColorRendererWidget: public QgsRasterRendererWidget,
2626
private Ui::QgsSingleBandPseudoColorRendererWidgetBase
2727
{
2828
Q_OBJECT

src/providers/wms/qgswmsprovider.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -2548,6 +2548,7 @@ void QgsWmsProvider::parseWMTSContents( QDomElement const &e )
25482548
metersPerUnit = 111319.49079327358;
25492549
break;
25502550

2551+
default:
25512552
case QGis::UnknownUnit:
25522553
QgsDebugMsg( "Unknown CRS units - assuming meters" );
25532554
metersPerUnit = 1.0;

0 commit comments

Comments
 (0)