qgstracer.cpp: fix warning about potentially uninitialized variable (likely false positive, but not so obvious)

rouault · nyalldawson · commit e4dafb590af2 · 2020-06-15T11:17:46.000+10:00
diff --git a/src/core/qgstracer.cpp b/src/core/qgstracer.cpp
@@ -278,18 +278,17 @@ int point2vertex( const QgsTracerGraph &g, const QgsPointXY &pt, double epsilon
 
 int point2edge( const QgsTracerGraph &g, const QgsPointXY &pt, int &lineVertexAfter, double epsilon = 1e-6 )
 {
-  int vertexAfter;
-
   for ( int i = 0; i < g.e.count(); ++i )
   {
     if ( g.inactiveEdges.contains( i ) )
       continue;  // ignore temporarily disabled edges
 
     const QgsTracerGraph::E &e = g.e.at( i );
+    int vertexAfter = -1;
     double dist = closestSegment( e.coords, pt, vertexAfter, epsilon );
     if ( dist == 0 )
     {
-      lineVertexAfter = vertexAfter; //NOLINT
+      lineVertexAfter = vertexAfter;
       return i;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -278,18 +278,17 @@ int point2vertex( const QgsTracerGraph &g, const QgsPointXY &pt, double epsilon`
`278`	`278`
`279`	`279`	`int point2edge( const QgsTracerGraph &g, const QgsPointXY &pt, int &lineVertexAfter, double epsilon = 1e-6 )`
`280`	`280`	`{`
`281`		`- int vertexAfter;`
`282`		`-`
`283`	`281`	`for ( int i = 0; i < g.e.count(); ++i )`
`284`	`282`	`{`
`285`	`283`	`if ( g.inactiveEdges.contains( i ) )`
`286`	`284`	`continue; // ignore temporarily disabled edges`
`287`	`285`
`288`	`286`	`const QgsTracerGraph::E &e = g.e.at( i );`
	`287`	`+ int vertexAfter = -1;`
`289`	`288`	`double dist = closestSegment( e.coords, pt, vertexAfter, epsilon );`
`290`	`289`	`if ( dist == 0 )`
`291`	`290`	`{`
`292`		`- lineVertexAfter = vertexAfter; //NOLINT`
	`291`	`+ lineVertexAfter = vertexAfter;`
`293`	`292`	`return i;`
`294`	`293`	`}`
`295`	`294`	`}`