diff options
author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2008-08-27 22:27:30 +0000 |
---|---|---|
committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2008-08-27 22:27:30 +0000 |
commit | 32e228d1ca60d479025f5c10479ac866208e11ae (patch) | |
tree | cf385e8307a13586f2f4914c87830931cd98183e /modules | |
parent | 709180b16be4653de4f57964b653737c3254a0fd (diff) |
merged in relevant changes from the v0-40 pd-extended release branch
svn path=/trunk/externals/creb/; revision=10266
Diffstat (limited to 'modules')
-rw-r--r-- | modules/bmatrix~.c (renamed from modules/matrix~.c) | 0 | ||||
-rw-r--r-- | modules/bwin~.c (renamed from modules/window~.c) | 13 | ||||
-rw-r--r-- | modules/cmath~.c | 16 | ||||
-rw-r--r-- | modules/dwt~.c | 4 | ||||
-rw-r--r-- | modules/ffpoly.c | 2 |
5 files changed, 19 insertions, 16 deletions
diff --git a/modules/matrix~.c b/modules/bmatrix~.c index b59d4d6..b59d4d6 100644 --- a/modules/matrix~.c +++ b/modules/bmatrix~.c diff --git a/modules/window~.c b/modules/bwin~.c index 777c8c5..90a9e2a 100644 --- a/modules/window~.c +++ b/modules/bwin~.c @@ -157,12 +157,15 @@ static void *window_new(t_symbol *s) return (x); } -void window_tilde_setup(void) +void bwin_tilde_setup(void) { - window_class = class_new(gensym("bwin~"), (t_newmethod)window_new, (t_method)window_free, - sizeof(t_window), 0, A_DEFSYMBOL, A_NULL); + window_class = class_new(gensym("bwin~"), + (t_newmethod)window_new, (t_method)window_free, + sizeof(t_window), 0, A_DEFSYMBOL, A_NULL); CLASS_MAINSIGNALIN(window_class, t_window, x_f); - class_addmethod(window_class, (t_method)window_dsp, gensym("dsp"), A_NULL); - class_addmethod(window_class, (t_method)window_type, gensym("type"), A_SYMBOL, A_DEFFLOAT, A_NULL); + class_addmethod(window_class, (t_method)window_dsp, + gensym("dsp"), A_NULL); + class_addmethod(window_class, (t_method)window_type, + gensym("type"), A_SYMBOL, A_DEFFLOAT, A_NULL); } diff --git a/modules/cmath~.c b/modules/cmath~.c index 3bd63a9..5526b9f 100644 --- a/modules/cmath~.c +++ b/modules/cmath~.c @@ -35,8 +35,8 @@ static t_int *cmath_perform_clog(t_int *w) { t_float *inx = (float *)(w[2]); t_float *iny = (float *)(w[3]); - t_float *outx = (float *)(w[4]); - t_float *outy = (float *)(w[5]); + t_float *outx = (float *)(w[5]); // clockwize addressing + t_float *outy = (float *)(w[4]); t_int i; t_int n = (t_int)(w[1]); t_float x; @@ -61,8 +61,8 @@ static t_int *cmath_perform_cexp(t_int *w) { t_float *inx = (float *)(w[2]); t_float *iny = (float *)(w[3]); - t_float *outx = (float *)(w[4]); - t_float *outy = (float *)(w[5]); + t_float *outx = (float *)(w[5]); // clockwize addressing + t_float *outy = (float *)(w[4]); t_int i; t_int n = (t_int)(w[1]); t_float x; @@ -82,8 +82,8 @@ static t_int *cmath_perform_nfft(t_int *w) { t_float *inx = (float *)(w[2]); t_float *iny = (float *)(w[3]); - t_float *outx = (float *)(w[4]); - t_float *outy = (float *)(w[5]); + t_float *outx = (float *)(w[5]); // clockwize addressing + t_float *outy = (float *)(w[4]); t_int i; t_int n = (t_int)(w[1]); t_float x; @@ -105,8 +105,8 @@ static t_int *cmath_perform_nifft(t_int *w) { t_float *inx = (float *)(w[2]); t_float *iny = (float *)(w[3]); - t_float *outx = (float *)(w[4]); - t_float *outy = (float *)(w[5]); + t_float *outx = (float *)(w[5]); // clockwize addressing + t_float *outy = (float *)(w[4]); t_int i; t_int n = (t_int)(w[1]); t_float x; diff --git a/modules/dwt~.c b/modules/dwt~.c index 327732c..9ab3bcc 100644 --- a/modules/dwt~.c +++ b/modules/dwt~.c @@ -190,9 +190,9 @@ static void dwt_permutation(t_dwt *x, t_int n){ /* debug */ for(k=0; k<n; k++) - printf("clutter[%ld] = %ld\n", k, ctl->c_clutter[k]); + printf("clutter[%d] = %d\n", (int)k, (int)ctl->c_clutter[k]); for(k=0; k<n; k++) - printf("unclutter[%ld] = %ld\n", k, ctl->c_unclutter[k]); + printf("unclutter[%d] = %d\n", (int)k, (int)ctl->c_unclutter[k]); exit(1); } diff --git a/modules/ffpoly.c b/modules/ffpoly.c index c325969..097891c 100644 --- a/modules/ffpoly.c +++ b/modules/ffpoly.c @@ -1,6 +1,6 @@ /* * ffpoly.c - compute a finite field polynomial - * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org> + * Copyright (c) by Tom Schouten <tom@ziwzwa.be> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |