More pal cleanups

qgis · Sep 1, 2015 · e602a58 · e602a58
1 parent a19cb94
commit e602a58
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 77 deletions.
diff --git a/src/core/pal/pal.cpp b/src/core/pal/pal.cpp
@@ -442,9 +442,7 @@ namespace pal
       fFeats->append( feat );
     }
 
-    idlp = 0;
     int nbOverlaps = 0;
-    prob->labelpositions = new LabelPosition*[prob->nblp];
 
     while ( fFeats->size() > 0 ) // foreach feature
     {
@@ -472,7 +470,7 @@ namespace pal
         // make sure that candidate's cost is less than 1
         lp->validateCost();
 
-        prob->labelpositions[idlp] = lp;
+        prob->addCandidatePosition( lp );
         //prob->feat[idlp] = j;
 
         lp->getBoundingBox( amin, amax );
@@ -481,7 +479,6 @@ namespace pal
         prob->candidates->Search( amin, amax, LabelPosition::countOverlapCallback, ( void* ) lp );
 
         nbOverlaps += lp->getNumOverlaps();
-        idlp++;
       }
       delete feat;
     }