Skip to content

Commit

Permalink
Avoid some (incorrect) use of uninitialized value warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jan 17, 2022
1 parent a33b56b commit f4bf9cb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
12 changes: 4 additions & 8 deletions src/core/geometry/qgsinternalgeometryengine.cpp
Expand Up @@ -2242,10 +2242,8 @@ std::unique_ptr< QgsLineString > roundWavesAlongLine( const QgsLineString *line,

int side = -1;

double xOutBuffer[4];
double yOutBuffer[4];
xOutBuffer[0] = prevX;
yOutBuffer[0] = prevY;
double xOutBuffer[4] { prevX, prevX, prevX, prevX };
double yOutBuffer[4] { prevY, prevY, prevY, prevY };
bool isFirstPart = true;

double distanceToNextPointFromStartOfSegment = wavelength / 8;
Expand Down Expand Up @@ -2369,10 +2367,8 @@ std::unique_ptr< QgsLineString > roundWavesRandomizedAlongLine( const QgsLineStr

int side = -1;

double xOutBuffer[4];
double yOutBuffer[4];
xOutBuffer[0] = prevX;
yOutBuffer[0] = prevY;
double xOutBuffer[4] { prevX, prevX, prevX, prevX };
double yOutBuffer[4] { prevY, prevY, prevY, prevY };
bool isFirstPart = true;

double amplitude = uniformDist( mt ) * ( maximumAmplitude - minimumAmplitude ) + minimumAmplitude;
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgscolorrampimpl.cpp
Expand Up @@ -62,7 +62,7 @@ static QColor _interpolateHsv( const QColor &c1, const QColor &c2, const double

qreal hue1 = c1.hsvHueF();
qreal hue2 = c2.hsvHueF();
qreal hue;
qreal hue = 0;
if ( hue1 == -1 )
hue = hue2;
else if ( hue2 == -1 )
Expand Down Expand Up @@ -119,7 +119,7 @@ static QColor _interpolateHsl( const QColor &c1, const QColor &c2, const double

qreal hue1 = c1.hslHueF();
qreal hue2 = c2.hslHueF();
qreal hue;
qreal hue = 0;
if ( hue1 == -1 )
hue = hue2;
else if ( hue2 == -1 )
Expand Down
2 changes: 1 addition & 1 deletion src/core/symbology/qgsgeometrygeneratorsymbollayer.cpp
Expand Up @@ -218,7 +218,7 @@ void QgsGeometryGeneratorSymbolLayer::drawPreviewIcon( QgsSymbolRenderContext &c
}
if ( patchShapeGeometry.isEmpty() )
{
Qgis::SymbolType originalSymbolType;
Qgis::SymbolType originalSymbolType = Qgis::SymbolType::Hybrid;
switch ( context.originalGeometryType() )
{
case QgsWkbTypes::PointGeometry:
Expand Down

0 comments on commit f4bf9cb

Please sign in to comment.