diff filter_templates.h @ 373:24a610dfbbfd

More altcvt updates from Frank.
author Ryan C. Gordon <icculus@icculus.org>
date Sat, 29 Jun 2002 04:08:17 +0000
parents 1b463ef9bcc2
children 44ed8bdeba74
line wrap: on
line diff
--- a/filter_templates.h	Tue Jun 25 17:15:29 2002 +0000
+++ b/filter_templates.h	Sat Jun 29 04:08:17 2002 +0000
@@ -70,6 +70,7 @@
     }
     return outp;
 }
+#undef sum_d
 
 /*-------------------------------------------------------------------------*/
 #define sum_h(v,dx) ((int) v[CH(dx)] + v[CH(-dx)])
@@ -109,6 +110,7 @@
     }
     return outp;
 }
+#undef sum_h
 
 /*-------------------------------------------------------------------------*/
 static Sint16* Suffix(increaseRate)( Sint16 *outp, Sint16 *inp, int length,
@@ -128,17 +130,17 @@
     {
         out = 0;
         f = filter->c[pos];
-        for( i = _fsize + 1; --i; inp+=CH(4), f+=4 )
+        for( i = _fsize + 1; --i; inp+=CH(8), f+=4 )
         {
     	    out+= f[0] * (int)inp[CH(0)];
-    	    out+= f[1] * (int)inp[CH(1)];
-    	    out+= f[2] * (int)inp[CH(2)];
-    	    out+= f[3] * (int)inp[CH(3)];
+    	    out+= f[1] * (int)inp[CH(2)];
+    	    out+= f[2] * (int)inp[CH(4)];
+    	    out+= f[3] * (int)inp[CH(6)];
         }
         outp[0] = out >> 16;
 
         pos = ( pos + filter->denominator - 1 ) % filter->denominator;
-        inp -= CH( 4 * _fsize );
+        inp -= CH( 8 * _fsize );
         inp -= CH( filter->incr[pos] );
         outp -= CH(1);
     }
@@ -185,8 +187,6 @@
 }
 
 /*-------------------------------------------------------------------------*/
-#undef sum_d
-#undef sum_h
 #undef CH
 #endif /* Suffix */