Update for c++11

qgis · May 30, 2019 · b334fc4 · b334fc4
1 parent e1bd4e9
commit b334fc4
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
@@ -1152,10 +1152,10 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition * > &lPos
     return 0;
 
   // distance calculation
-  double *path_distances = new double[mapShape->nbPoints];
+  std::unique_ptr< double [] > path_distances = qgis::make_unique<double[]>( mapShape->nbPoints );
   double total_distance = 0;
   double old_x = -1.0, old_y = -1.0;
-  for ( int i = 0; i < mapShape->nbPoints; i++ )
+  for ( std::size_t i = 0; i < mapShape->nbPoints; i++ )
   {
     if ( i == 0 )
       path_distances[i] = 0;
@@ -1169,7 +1169,6 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition * > &lPos
 
   if ( qgsDoubleNear( total_distance, 0.0 ) )
   {
-    delete[] path_distances;
     return 0;
   }
 
@@ -1181,7 +1180,6 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition * > &lPos
   {
     // label doesn't fit on this line, don't waste time trying to make candidates
     // TODO - in future allow this, and allow label to overlap end of line
-    delete[] path_distances;
     return 0;
   }
 
@@ -1208,7 +1206,7 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition * > &lPos
       orientation = 1;
     }
 
-    LabelPosition *slp = curvedPlacementAtOffset( mapShape, path_distances, orientation, 1, i, reversed, flip );
+    LabelPosition *slp = curvedPlacementAtOffset( mapShape, path_distances.get(), orientation, 1, i, reversed, flip );
     if ( !slp )
       continue;
 
@@ -1220,7 +1218,7 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition * > &lPos
       {
         delete slp;
         orientation = -orientation;
-        slp = curvedPlacementAtOffset( mapShape, path_distances, orientation, 1, i, reversed, flip );
+        slp = curvedPlacementAtOffset( mapShape, path_distances.get(), orientation, 1, i, reversed, flip );
       }
     }
     if ( !slp )
@@ -1306,8 +1304,6 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition * > &lPos
     lPos << positions.takeFirst();
   }
 
-  delete[] path_distances;
-
   return nbp;
 }