stop global-destruction errors in driver DESTROY

PDLPorters · Apr 20, 2024 · 99f32ba · 99f32ba
1 parent 9df26e7
commit 99f32ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/PDL/Graphics/Simple/PGPLOT.pm b/lib/PDL/Graphics/Simple/PGPLOT.pm
@@ -324,7 +324,9 @@ sub plot {
 sub DESTROY {
     my $me = shift;
 
-    $me->{obj}->release;
+    eval { # in case of global destruction
+      $me->{obj}->release;
+    };
 
     if (defined $me->{type} and $me->{type} =~ m/^f/i) {
 	eval { $me->{obj}->close; };

diff --git a/lib/PDL/Graphics/Simple/Prima.pm b/lib/PDL/Graphics/Simple/Prima.pm
@@ -155,9 +155,6 @@ sub new {
 
 sub DESTROY {
     my $me = shift;
-
-    print "DESTROYING $me\n";
-
     if($me->{type} =~ m/f/i) {
 	##############################
 	# File-saving code...
@@ -242,8 +239,10 @@ sub DESTROY {
 	}
     }
 
-    $me->{obj}->hide;
-    $me->{obj}->destroy;
+    eval { # in case of global destruction
+      $me->{obj}->hide;
+      $me->{obj}->destroy;
+    };
 }
 
 ##############################
@@ -263,7 +262,7 @@ sub PDL::Graphics::Simple::Prima::Sepia_Palette::apply {
     $min = $data->min unless(defined($min));
     $max = $data->max unless(defined($max));
 
-    my $g = ($min==$max)?$ data->zeroes : (($data->double - $min)/($max-$min))->clip(0,1);
+    my $g = ($min==$max)? $data->zeroes : (($data->double - $min)/($max-$min))->clip(0,1);
     my $r = $g->sqrt;
     my $b = $g*$g;
 
@@ -478,7 +477,6 @@ sub plot {
 	$yscale = ($pmax-$pmin)/($dmax-$dmin);
 
 	my $ratio = $yscale / $xscale;
-	print "ratio=$ratio\n";
 	if($ratio > 1) {
 	    # More Y pixels per datavalue than X pixels.  Hence we expand the Y range.
 	    my $ycen = ($dmax+$dmin)/2;