DRY in ImageND

PDLPorters · Mar 2, 2024 · 2c24771 · 2c24771
1 parent dbf1528
commit 2c24771
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/Libtmp/ImageND/imagend.pd b/Libtmp/ImageND/imagend.pd
@@ -666,7 +666,7 @@ sub PDL::convolveND {
 
   ###
   # Pad the array to include boundary conditions
-  my $adims = pdl($x->dims);
+  my $adims = $x->shape;
   my $koff = ($kdims/2)->ceil - 1;
 
   my $aa = $x->range( -$koff, $adims + $kdims, $opt->{Boundary} )
@@ -680,10 +680,7 @@ sub PDL::convolveND {
     # FFT works best on doubles; do our work there then cast back
     # at the end.  
     $aa = double($aa);
-    my $aai = $aa->zeroes;
-
-    my $kk = $aa->zeroes;
-    my $kki = $aa->zeroes;
+    $_ = $aa->zeroes for my ($aai, $kk, $kki);
     my $tmp;  # work around new perl -d "feature"
     ($tmp = $kk->range( - ($kdims/2)->floor, $kdims, 'p')) .= $k;
     PDL::fftnd($kk, $kki);

diff --git a/Libtmp/ImageND/t/imagend.t b/Libtmp/ImageND/t/imagend.t
@@ -40,7 +40,7 @@ my $pb = pdl( [-1,0],[0,1] );
 	my $pc = convolveND($pa,$pb,{m=>'d',b=>'e'});
 	ok( all PDL::approx($pc,$ans_e, $eps) ) or diag $pc;
 	$pc = convolveND($pa,$pb,{m=>'f',b=>'e'});
-	ok( all PDL::approx($pc,$ans_e, $eps) );
+	ok( all PDL::approx($pc,$ans_e, $eps) ) or diag $pc;
 }
 
 {

diff --git a/Libtmp/Minuit/minuit.pd b/Libtmp/Minuit/minuit.pd
@@ -555,7 +555,7 @@ Example:
   $iflag = mn_excm('set strategy',$arglist);
 
   # each command can be specified by a minimal string that uniquely
-  # identifies it (see Chapter 4 of Minuit manual). The comannd above
+  # identifies it (see Chapter 4 of Minuit manual). The command above
   # is equivalent to:
   $iflag = mn_excm('set stra',$arglis);