diff src/DLD-FUNCTIONS/filter.cc @ 5275:23b37da9fd5b

[project @ 2005-04-08 16:07:35 by jwe]
author jwe
date Fri, 08 Apr 2005 16:07:37 +0000
parents cda8c0a823c5
children 4c8a2e4e0717
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/filter.cc	Thu Apr 07 21:51:37 2005 +0000
+++ b/src/DLD-FUNCTIONS/filter.cc	Fri Apr 08 16:07:37 2005 +0000
@@ -53,10 +53,10 @@
 {
   MArrayN<T> y;
 
-  int a_len  = a.length ();
-  int b_len  = b.length ();
+  octave_idx_type a_len  = a.length ();
+  octave_idx_type b_len  = b.length ();
 
-  int ab_len = a_len > b_len ? a_len : b_len;
+  octave_idx_type ab_len = a_len > b_len ? a_len : b_len;
 
   b.resize (ab_len, 0.0);
   if (a_len > 1)
@@ -77,10 +77,10 @@
       return y;
     }
 
-  int x_len = x_dims(dim);
+  octave_idx_type x_len = x_dims(dim);
 
   dim_vector si_dims = si.dims ();
-  int si_len = si_dims(0);
+  octave_idx_type si_len = si_dims(0);
 
   if (si_len != ab_len - 1)
     {
@@ -94,8 +94,8 @@
       return y;
     }
 
-  int si_dim = 0;
-  for (int i = 0; i < x_dims.length (); i++)
+  octave_idx_type si_dim = 0;
+  for (octave_idx_type i = 0; i < x_dims.length (); i++)
     {
       if (i == dim)
 	continue;
@@ -125,15 +125,15 @@
   for (int i = 0; i < dim; i++)
     x_stride *= x_dims(i);
 
-  int x_num = x_dims.numel () / x_len;
-  for (int num = 0; num < x_num; num++)
+  octave_idx_type x_num = x_dims.numel () / x_len;
+  for (octave_idx_type num = 0; num < x_num; num++)
     {
-      int x_offset;
+      octave_idx_type x_offset;
       if (x_stride == 1)
 	x_offset = num * x_len;
       else
 	{
-	  int x_offset2 = 0;
+	  octave_idx_type x_offset2 = 0;
 	  x_offset = num;
 	  while (x_offset >= x_stride)
 	    {
@@ -142,7 +142,7 @@
 	    }
 	  x_offset += x_offset2 * x_stride * x_len;
 	}
-      int si_offset = num * si_len;
+      octave_idx_type si_offset = num * si_len;
 
       if (a_len > 1)
 	{
@@ -155,13 +155,13 @@
 
 	  psi += si_offset;
 
-	  for (int i = 0, idx = x_offset; i < x_len; i++, idx += x_stride)
+	  for (octave_idx_type i = 0, idx = x_offset; i < x_len; i++, idx += x_stride)
 	    {
 	      py[idx] = psi[0] + pb[0] * px[idx];
 
 	      if (si_len > 0)
 		{
-		  for (int j = 0; j < si_len - 1; j++)
+		  for (octave_idx_type j = 0; j < si_len - 1; j++)
 		    {
 		      OCTAVE_QUIT;
 
@@ -188,13 +188,13 @@
 
 	  psi += si_offset;
 
-	  for (int i = 0, idx = x_offset; i < x_len; i++, idx += x_stride)
+	  for (octave_idx_type i = 0, idx = x_offset; i < x_len; i++, idx += x_stride)
 	    {
 	      py[idx] = psi[0] + pb[0] * px[idx];
 
 	      if (si_len > 1)
 		{
-		  for (int j = 0; j < si_len - 1; j++)
+		  for (octave_idx_type j = 0; j < si_len - 1; j++)
 		    {
 		      OCTAVE_QUIT;
 
@@ -249,10 +249,10 @@
 	return MArrayN<T> ();
       }
 
-  int a_len = a.length ();
-  int b_len = b.length ();
+  octave_idx_type a_len = a.length ();
+  octave_idx_type b_len = b.length ();
 
-  int si_len = (a_len > b_len ? a_len : b_len) - 1;
+  octave_idx_type si_len = (a_len > b_len ? a_len : b_len) - 1;
   dim_vector si_dims = x.dims ();
   for (int i = dim; i > 0; i--)
     si_dims(i) = si_dims(i-1);
@@ -412,10 +412,10 @@
 
 	  if (nargin == 3 || args(3).is_empty ())
 	    {
-	      int a_len = a.length ();
-	      int b_len = b.length ();
+	      octave_idx_type a_len = a.length ();
+	      octave_idx_type b_len = b.length ();
 
-	      int si_len = (a_len > b_len ? a_len : b_len) - 1;
+	      octave_idx_type si_len = (a_len > b_len ? a_len : b_len) - 1;
 
 	      dim_vector si_dims = x.dims ();
 	      for (int i = dim; i > 0; i--)
@@ -469,10 +469,10 @@
 
 	  if (nargin == 3 || args(3).is_empty ())
 	    {
-	      int a_len = a.length ();
-	      int b_len = b.length ();
+	      octave_idx_type a_len = a.length ();
+	      octave_idx_type b_len = b.length ();
 
-	      int si_len = (a_len > b_len ? a_len : b_len) - 1;
+	      octave_idx_type si_len = (a_len > b_len ? a_len : b_len) - 1;
 
 	      dim_vector si_dims = x.dims ();
 	      for (int i = dim; i > 0; i--)