@@ -654,7 +654,6 @@ namespace pal
654
654
655
655
if ( index <= 1 && distance < 0 ) // We've gone off the start, fail out
656
656
{
657
- std::cerr << " err1" << std::endl;
658
657
return NULL ;
659
658
}
660
659
@@ -666,7 +665,6 @@ namespace pal
666
665
}
667
666
if ( index >= path_positions->nbPoints )
668
667
{
669
- std::cerr << " err2" << std::endl;
670
668
return NULL ;
671
669
}
672
670
@@ -688,7 +686,6 @@ namespace pal
688
686
if ( segment_length == 0 )
689
687
{
690
688
// Not allowed to place across on 0 length segments or discontinuities
691
- std::cerr << " err3" << std::endl;
692
689
return NULL ;
693
690
}
694
691
@@ -714,7 +711,7 @@ namespace pal
714
711
if ( segment_length == 0 )
715
712
{
716
713
// Not allowed to place across on 0 length segments or discontinuities
717
- std::cerr << " err4 " << std::endl ;
714
+ delete slp ;
718
715
return NULL ;
719
716
}
720
717
@@ -743,7 +740,7 @@ namespace pal
743
740
index ++;
744
741
if ( index >= path_positions->nbPoints ) // Bail out if we run off the end of the shape
745
742
{
746
- // std::cerr << "err5" << std::endl ;
743
+ delete slp ;
747
744
return NULL ;
748
745
}
749
746
new_x = path_positions->x [index ];
@@ -777,7 +774,7 @@ namespace pal
777
774
while ( angle_delta < -M_PI ) angle_delta += 2 * M_PI;
778
775
if ( f->labelInfo ->max_char_angle_delta > 0 && fabs ( angle_delta ) > f->labelInfo ->max_char_angle_delta *( M_PI / 180 ) )
779
776
{
780
- std::cerr << " err6 " << std::endl ;
777
+ delete slp ;
781
778
return NULL ;
782
779
}
783
780
@@ -826,12 +823,14 @@ namespace pal
826
823
if ( !orientation_forced )
827
824
{
828
825
orientation = -orientation;
826
+ delete slp;
827
+ slp = NULL ;
829
828
slp = curvedPlacementAtOffset ( path_positions, path_distances, orientation, initial_index, initial_distance );
830
829
}
831
830
else
832
831
{
833
832
// Otherwise we have failed to find a placement
834
- // std::cerr << "err7" << std::endl ;
833
+ delete slp ;
835
834
return NULL ;
836
835
}
837
836
}
0 commit comments