Update of /cvsroot/pure-data/externals/creb/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10243/modules
Modified Files: bdiag.c diag.c dwt.c fdn.c ffpoly.c permut.c Log Message: fixed int vs t_int
Index: dwt.c =================================================================== RCS file: /cvsroot/pure-data/externals/creb/modules/dwt.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dwt.c 21 Jan 2003 10:18:19 -0000 1.1.1.1 --- dwt.c 31 Dec 2005 19:31:09 -0000 1.2 *************** *** 191,197 **** /* debug */ for(k=0; k<n; k++) ! printf("clutter[%d] = %d\n", k, ctl->c_clutter[k]); for(k=0; k<n; k++) ! printf("unclutter[%d] = %d\n", k, ctl->c_unclutter[k]);
exit(1); --- 191,197 ---- /* debug */ for(k=0; k<n; k++) ! printf("clutter[%ld] = %ld\n", k, ctl->c_clutter[k]); for(k=0; k<n; k++) ! printf("unclutter[%ld] = %ld\n", k, ctl->c_unclutter[k]);
exit(1); *************** *** 235,239 **** float *mask = NULL;
! int *length = NULL; float sum = 0;
--- 235,239 ---- float *mask = NULL;
! t_int *length = NULL; float sum = 0;
Index: bdiag.c =================================================================== RCS file: /cvsroot/pure-data/externals/creb/modules/bdiag.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bdiag.c 12 Apr 2005 06:22:12 -0000 1.3 --- bdiag.c 31 Dec 2005 19:31:09 -0000 1.4 *************** *** 27,30 **** --- 27,31 ---- #include <stdio.h> #include <stdlib.h> + #include "extlib_util.h"
#define MAXORDER 64
Index: fdn.c =================================================================== RCS file: /cvsroot/pure-data/externals/creb/modules/fdn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** fdn.c 12 Apr 2005 06:22:12 -0000 1.4 --- fdn.c 31 Dec 2005 19:31:09 -0000 1.5 *************** *** 327,331 **** int mask = x->x_ctl.c_bufsize - 1; int start = x->x_ctl.c_tap[0]; ! int *tap = x->x_ctl.c_tap; float *length = x->x_ctl.c_length; float scale = sys_getsr() * .001f; --- 327,331 ---- int mask = x->x_ctl.c_bufsize - 1; int start = x->x_ctl.c_tap[0]; ! t_int *tap = x->x_ctl.c_tap; float *length = x->x_ctl.c_length; float scale = sys_getsr() * .001f;
Index: ffpoly.c =================================================================== RCS file: /cvsroot/pure-data/externals/creb/modules/ffpoly.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ffpoly.c 21 Jan 2003 10:18:19 -0000 1.1.1.1 --- ffpoly.c 31 Dec 2005 19:31:09 -0000 1.2 *************** *** 50,54 **** int fo = x->x_field_order; int po = x->x_poly_order; ! int* c = x->x_coef; int i, out;
--- 50,54 ---- int fo = x->x_field_order; int po = x->x_poly_order; ! t_int* c = x->x_coef; int i, out;
*************** *** 136,140 **** x->x_field_order = fieldorder;
! x->x_coef = (int *)malloc((x->x_poly_order + 1) * sizeof(int));
/* set poly to f(x) = x */ --- 136,140 ---- x->x_field_order = fieldorder;
! x->x_coef = (t_int *)malloc((x->x_poly_order + 1) * sizeof(int));
/* set poly to f(x) = x */
Index: permut.c =================================================================== RCS file: /cvsroot/pure-data/externals/creb/modules/permut.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** permut.c 12 Apr 2005 06:22:12 -0000 1.3 --- permut.c 31 Dec 2005 19:31:09 -0000 1.4 *************** *** 28,32 **** { char c_type; ! int *c_permutationtable; int c_blocksize; } t_permutctl; --- 28,32 ---- { char c_type; ! t_int *c_permutationtable; int c_blocksize; } t_permutctl; *************** *** 60,64 **** int N = x->x_ctl.c_blocksize; int mask = N-1; ! int *p = x->x_ctl.c_permutationtable; int r, last = 0;
--- 60,64 ---- int N = x->x_ctl.c_blocksize; int mask = N-1; ! t_int *p = x->x_ctl.c_permutationtable; int r, last = 0;
*************** *** 101,105 **** if (x->x_ctl.c_permutationtable) free(x->x_ctl.c_permutationtable); ! x->x_ctl.c_permutationtable = (int *)malloc(sizeof(int)*size); x->x_ctl.c_blocksize = size;
--- 101,105 ---- if (x->x_ctl.c_permutationtable) free(x->x_ctl.c_permutationtable); ! x->x_ctl.c_permutationtable = (t_int *)malloc(sizeof(int)*size); x->x_ctl.c_blocksize = size;
Index: diag.c =================================================================== RCS file: /cvsroot/pure-data/externals/creb/modules/diag.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** diag.c 12 Apr 2005 06:22:12 -0000 1.3 --- diag.c 31 Dec 2005 19:31:09 -0000 1.4 *************** *** 27,30 **** --- 27,31 ---- #include <stdio.h> #include <stdlib.h> + #include "extlib_util.h"
#define MAXORDER 64