Update of /cvsroot/pure-data/externals/iem/iemmatrix/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9660
Modified Files: mtx_index.c mtx_sum.c Log Message: more fixes of variable shadowin; proper function declaration
Index: mtx_sum.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/mtx_sum.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mtx_sum.c 29 Mar 2006 12:07:52 -0000 1.3 --- mtx_sum.c 12 Nov 2006 12:23:08 -0000 1.4 *************** *** 50,54 ****
! static void *mtx_sum_new() { t_matrix *x = (t_matrix *)pd_new(mtx_sum_class); --- 50,54 ----
! static void *mtx_sum_new(void) { t_matrix *x = (t_matrix *)pd_new(mtx_sum_class);
Index: mtx_index.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/mtx_index.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mtx_index.c 25 Jul 2006 14:15:22 -0000 1.5 --- mtx_index.c 12 Nov 2006 12:23:08 -0000 1.6 *************** *** 100,108 **** }
! static void writeIndexedValuesIntoList (int n, int *index, t_atom *x, t_atom *y) { ! for (;n--;index++,y++) ! if (*index) ! *y = x[*index-1]; }
--- 100,108 ---- }
! static void writeIndexedValuesIntoList (int n, int *indx, t_atom *x, t_atom *y) { ! for (;n--;indx++,y++) ! if (*indx) ! *y = x[*indx-1]; }
*************** *** 166,170 **** int index_rows = mtx_index_obj->index_rows; int index_columns = mtx_index_obj->index_columns; ! int *index = mtx_index_obj->index_in;
// size check --- 166,170 ---- int index_rows = mtx_index_obj->index_rows; int index_columns = mtx_index_obj->index_columns; ! int *indx = mtx_index_obj->index_in;
// size check *************** *** 182,186 **** return; } ! if ((!index)||(mtx_index_obj->index_size == 0)) { post("mtx_index: index with what? no right matrix defined"); return; --- 182,186 ---- return; } ! if ((!indx)||(mtx_index_obj->index_size == 0)) { post("mtx_index: index with what? no right matrix defined"); return; *************** *** 189,193 **** list_out += 2; setAtomListConstFloat (mtx_index_obj->index_size, list_out, mtx_index_obj->fill_value); ! writeIndexedValuesIntoList (mtx_index_obj->index_size, index,list_in,list_out); list_out = mtx_index_obj->list_out; SETSYMBOL(list_out, gensym("matrix")); --- 189,193 ---- list_out += 2; setAtomListConstFloat (mtx_index_obj->index_size, list_out, mtx_index_obj->fill_value); ! writeIndexedValuesIntoList (mtx_index_obj->index_size, indx,list_in,list_out); list_out = mtx_index_obj->list_out; SETSYMBOL(list_out, gensym("matrix"));