Pd-cvs October 2003

pd-cvs@lists.iem.at

7 participants
131 discussions

externals/pidip/modules Makefile,1.4,1.5 Makefile.in,1.4,1.5 pdp_canvas.c,1.2,1.3 pdp_pen.c,1.1,1.2 pdp_ripple.c,1.2,1.3
by sevyves＠users.sourceforge.net 17 Oct '03

17 Oct '03

Update of /cvsroot/pure-data/externals/pidip/modules In directory sc8-pr-cvs1:/tmp/cvs-serv31538/pidip/modules Modified Files: Makefile Makefile.in pdp_canvas.c pdp_pen.c pdp_ripple.c Log Message: Version 0.12.9 ( added pdp_shape ) Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 8 Oct 2003 14:59:54 -0000 1.4 --- Makefile 17 Oct 2003 20:54:40 -0000 1.5 *************** *** 15,19 **** pdp_juxta.o pdp_capture.o pdp_smuck.o pdp_lumafilt.o \ pdp_transition.o pdp_imgloader.o pdp_imgsaver.o pdp_cache.o \ ! pdp_canvas.o pdp_pen.o all_modules: $(OBJECTS) --- 15,19 ---- pdp_juxta.o pdp_capture.o pdp_smuck.o pdp_lumafilt.o \ pdp_transition.o pdp_imgloader.o pdp_imgsaver.o pdp_cache.o \ ! pdp_canvas.o pdp_pen.o pdp_shape.o all_modules: $(OBJECTS) Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 8 Oct 2003 15:00:06 -0000 1.4 --- Makefile.in 17 Oct 2003 20:54:40 -0000 1.5 *************** *** 15,19 **** pdp_juxta.o pdp_capture.o pdp_smuck.o pdp_lumafilt.o \ pdp_transition.o pdp_imgloader.o pdp_imgsaver.o pdp_cache.o \ ! pdp_canvas.o pdp_pen.o all_modules: $(OBJECTS) --- 15,19 ---- pdp_juxta.o pdp_capture.o pdp_smuck.o pdp_lumafilt.o \ pdp_transition.o pdp_imgloader.o pdp_imgsaver.o pdp_cache.o \ ! pdp_canvas.o pdp_pen.o pdp_shape.o all_modules: $(OBJECTS) Index: pdp_canvas.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_canvas.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pdp_canvas.c 26 Sep 2003 00:19:33 -0000 1.2 --- pdp_canvas.c 17 Oct 2003 20:54:40 -0000 1.3 *************** *** 204,208 **** X = X*x->x_owidth; Y = Y*x->x_oheight; ! // post( "pdp_canvas : drag %f %f", dx, dy ); if ( x->x_current != -1 ) { --- 204,208 ---- X = X*x->x_owidth; Y = Y*x->x_oheight; ! // post( "pdp_canvas : drag %f %f", X, Y ); if ( x->x_current != -1 ) { Index: pdp_pen.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_pen.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pdp_pen.c 8 Oct 2003 15:00:57 -0000 1.1 --- pdp_pen.c 17 Oct 2003 20:54:40 -0000 1.2 *************** *** 31,34 **** --- 31,36 ---- static char *pdp_pen_version = "pdp_pen: version 0.1, free hand drawing object written by Yves Degoyon (ydegoyon(a)free.fr)"; + static t_int nbits=0; // number of recursive calls + typedef struct pdp_pen_struct { *************** *** 121,124 **** --- 123,288 ---- } + static void pdp_pen_do_fill(t_pdp_pen *x, t_floatarg X, t_floatarg Y) + { + short int *pbY, *pbU, *pbV; + short int nX, nY; + + nbits++; + // post( "pdp_pen_do_fill : X=%d, Y=%d stack=%d", (t_int)X, (t_int)Y, nbits ); + + pbY = x->x_bdata; + pbU = (x->x_bdata+x->x_vsize); + pbV = (x->x_bdata+x->x_vsize+(x->x_vsize>>2)); + + if ( ( (t_int)X < 0 ) || ( (t_int)X >= x->x_vwidth ) || + ( (t_int)Y < 0 ) || ( (t_int)Y >= x->x_vheight ) ) + { + nbits--; + return; + } + + nX = (t_int) X; + nY = (t_int) Y; + if ( *(pbY+(t_int)Y*x->x_vwidth+(t_int)X) != 0 ) + { + nbits--; + return; + } + else + { + *(pbY+nY*x->x_vwidth+nX) = + (yuv_RGBtoY( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))<<7; + *(pbU+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoU( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + *(pbV+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoV( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + } + + nX = (t_int) X+1; + nY = (t_int) Y; + if ( (*(pbY+nY*x->x_vwidth+nX)) == 0 ) + { + pdp_pen_do_fill( x, nX, nY ); + *(pbY+nY*x->x_vwidth+nX) = + (yuv_RGBtoY( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))<<7; + *(pbU+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoU( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + *(pbV+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoV( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + } + + nX = (t_int) X-1; + nY = (t_int) Y; + if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) + { + pdp_pen_do_fill( x, nX, nY ); + *(pbY+nY*x->x_vwidth+nX) = + (yuv_RGBtoY( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))<<7; + *(pbU+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoU( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + *(pbV+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoV( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + } + + nX = (t_int) X-1; + nY = (t_int) Y-1; + if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) + { + pdp_pen_do_fill( x, nX, nY ); + *(pbY+nY*x->x_vwidth+nX) = + (yuv_RGBtoY( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))<<7; + *(pbU+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoU( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + *(pbV+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoV( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + } + + nX = (t_int) X; + nY = (t_int) Y-1; + if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) + { + pdp_pen_do_fill( x, nX, nY ); + *(pbY+nY*x->x_vwidth+nX) = + (yuv_RGBtoY( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))<<7; + *(pbU+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoU( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + *(pbV+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoV( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + } + + nX = (t_int) X+1; + nY = (t_int) Y-1; + if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) + { + pdp_pen_do_fill( x, nX, nY ); + *(pbY+nY*x->x_vwidth+nX) = + (yuv_RGBtoY( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))<<7; + *(pbU+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoU( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + *(pbV+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoV( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + } + + nX = (t_int) X-1; + nY = (t_int) Y+1; + if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) + { + pdp_pen_do_fill( x, nX, nY ); + *(pbY+nY*x->x_vwidth+nX) = + (yuv_RGBtoY( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))<<7; + *(pbU+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoU( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + *(pbV+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoV( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + } + + nX = (t_int) X; + nY = (t_int) Y+1; + if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) + { + pdp_pen_do_fill( x, nX, nY ); + *(pbY+nY*x->x_vwidth+nX) = + (yuv_RGBtoY( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))<<7; + *(pbU+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoU( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + *(pbV+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoV( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + } + + nX = (t_int) X+1; + nY = (t_int) Y+1; + if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) + { + pdp_pen_do_fill( x, nX, nY ); + *(pbY+nY*x->x_vwidth+nX) = + (yuv_RGBtoY( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))<<7; + *(pbU+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoU( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + *(pbV+(nY>>1)*(x->x_vwidth>>1)+(nX>>1)) = + (yuv_RGBtoV( (x->x_blue << 16) + (x->x_green << 8) + x->x_red ))-128<<8; + } + + nbits--; + } + + static void pdp_pen_fill(t_pdp_pen *x, t_floatarg X, t_floatarg Y) + { + X = X*x->x_vwidth; + Y = Y*x->x_vheight; + // post( "pdp_pen : draw %f %f", X, Y ); + if ( (X<0) || (X>x->x_vwidth) ) + { + // post( "pdp_pen : fill : wrong X position : %f", X ); + return; + } + if ( (Y<0) || (Y>x->x_vheight) ) + { + // post( "pdp_pen : fill : wrong Y position : %f", Y ); + return; + } + + pdp_pen_do_fill( x, X, Y ); + } + static void pdp_pen_clear(t_pdp_pen *x) { *************** *** 330,333 **** --- 494,498 ---- class_addmethod(pdp_pen_class, (t_method)pdp_pen_input_0, gensym("pdp"), A_SYMBOL, A_DEFFLOAT, A_NULL); class_addmethod(pdp_pen_class, (t_method)pdp_pen_draw, gensym("draw"), A_DEFFLOAT, A_DEFFLOAT, A_NULL); + class_addmethod(pdp_pen_class, (t_method)pdp_pen_fill, gensym("fill"), A_DEFFLOAT, A_DEFFLOAT, A_NULL); class_addmethod(pdp_pen_class, (t_method)pdp_pen_clear, gensym("clear"), A_NULL); class_addmethod(pdp_pen_class, (t_method)pdp_pen_width, gensym("width"), A_DEFFLOAT, A_NULL); Index: pdp_ripple.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_ripple.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pdp_ripple.c 17 Sep 2003 20:08:00 -0000 1.2 --- pdp_ripple.c 17 Oct 2003 20:54:40 -0000 1.3 *************** *** 29,33 **** #include <math.h> ! #define MAGIC_THRESHOLD 30 static unsigned int fastrand_val; --- 29,33 ---- #include <math.h> ! #define MAGIC_THRESHOLD 5 static unsigned int fastrand_val;

1 0

externals/pidip/doc help-pdp_ctrack.pd,1.1,1.2 help-pdp_cycle.pd,1.1,1.2 help-pdp_pen.pd,1.1,1.2
by sevyves＠users.sourceforge.net 17 Oct '03

17 Oct '03

Update of /cvsroot/pure-data/externals/pidip/doc In directory sc8-pr-cvs1:/tmp/cvs-serv31538/pidip/doc Modified Files: help-pdp_ctrack.pd help-pdp_cycle.pd help-pdp_pen.pd Log Message: Version 0.12.9 ( added pdp_shape ) Index: help-pdp_ctrack.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_ctrack.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-pdp_ctrack.pd 17 Sep 2003 20:21:11 -0000 1.1 --- help-pdp_ctrack.pd 17 Oct 2003 20:54:40 -0000 1.2 *************** *** 4,8 **** -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1; #X msg 370 44 open \$1; --- 4,8 ---- -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1; #X msg 370 44 open \$1; *************** *** 69,73 **** #X text 6 378 Set the cursor; #X msg 12 527 cursor \$1; ! #X obj 85 529 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; #X floatatom 123 591 5 0 0 0 - - -; --- 69,73 ---- #X text 6 378 Set the cursor; #X msg 12 527 cursor \$1; ! #X obj 85 529 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X floatatom 123 591 5 0 0 0 - - -; Index: help-pdp_cycle.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_cycle.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-pdp_cycle.pd 17 Sep 2003 20:21:11 -0000 1.1 --- help-pdp_cycle.pd 17 Oct 2003 20:54:40 -0000 1.2 *************** *** 4,8 **** -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1; #X msg 370 44 open \$1; --- 4,8 ---- -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1; #X msg 370 44 open \$1; *************** *** 10,14 **** #X obj 354 3 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; ! #X floatatom 316 99 5 0 0; #X msg 225 65 stop; #X obj 323 68 hsl 300 15 0 1000 0 0 empty empty empty -2 -6 0 8 -262144 --- 10,14 ---- #X obj 354 3 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; ! #X floatatom 316 99 5 0 0 0 - - -; #X msg 225 65 stop; #X obj 323 68 hsl 300 15 0 1000 0 0 empty empty empty -2 -6 0 8 -262144 *************** *** 23,31 **** #X obj 252 167 pdp_yqt; #X obj 283 243 dac~; ! #X obj 351 264 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; ! #X obj 363 286 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; ! #X obj 374 305 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; #X text 377 263 Cycle Y; --- 23,31 ---- #X obj 252 167 pdp_yqt; #X obj 283 243 dac~; ! #X obj 351 264 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 363 286 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 374 305 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X text 377 263 Cycle Y; *************** *** 33,41 **** #X text 396 306 Cycle V; #X obj 264 334 pdp_cycle; ! #X obj 469 381 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; #X obj 469 433 pdp_control; #X msg 469 406 thread \$1; ! #X floatatom 469 494 5 0 0; #X obj 469 465 route pdp_drop; #X connect 1 0 10 0; --- 33,41 ---- #X text 396 306 Cycle V; #X obj 264 334 pdp_cycle; ! #X obj 469 381 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X obj 469 433 pdp_control; #X msg 469 406 thread \$1; ! #X floatatom 469 494 5 0 0 0 - - -; #X obj 469 465 route pdp_drop; #X connect 1 0 10 0; Index: help-pdp_pen.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_pen.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-pdp_pen.pd 8 Oct 2003 15:01:52 -0000 1.1 --- help-pdp_pen.pd 17 Oct 2003 20:54:40 -0000 1.2 *************** *** 21,30 **** #X msg 432 102 stop; #X msg 517 133 open /dev/video; ! #X obj 561 456 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 561 508 pdp_control; ! #X msg 561 481 thread \$1; ! #X floatatom 561 569 5 0 0 0 - - -; ! #X obj 561 540 route pdp_drop; #X obj 239 343 pdp_pen; #X text 85 498 pdp_pen : free hand drawing object; --- 21,30 ---- #X msg 432 102 stop; #X msg 517 133 open /dev/video; ! #X obj 567 476 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 567 528 pdp_control; ! #X msg 567 501 thread \$1; ! #X floatatom 567 589 5 0 0 0 - - -; ! #X obj 567 560 route pdp_drop; #X obj 239 343 pdp_pen; #X text 85 498 pdp_pen : free hand drawing object; *************** *** 32,36 **** #X text 85 528 on request from patrick ( 11h11.com ); #X obj 238 387 pdp_xv; - #X obj 238 419 route press drag release; #X msg 282 463 draw \$1 \$2; #X msg 163 344 cursor 1; --- 32,35 ---- *************** *** 56,59 **** --- 55,67 ---- #X text 464 353 Mode ( 0=drawing \, 1=erase ); #X text 464 366 ( default=0 ); + #X obj 459 389 unpack f f; + #X obj 462 411 f; + #X obj 508 411 f; + #X msg 374 388 fill \$1 \$2; + #X obj 462 434 pack f f; + #X obj 544 390 t b b; + #X msg 593 390 bang; + #X text 633 391 Fill a region; + #X obj 238 419 route press drag release; #X connect 0 0 9 0; #X connect 1 0 10 0; *************** *** 67,71 **** #X connect 9 0 10 0; #X connect 10 0 21 0; ! #X connect 10 0 28 0; #X connect 11 0 21 0; #X connect 12 0 11 0; --- 75,79 ---- #X connect 9 0 10 0; #X connect 10 0 21 0; ! #X connect 10 0 27 0; #X connect 11 0 21 0; #X connect 12 0 11 0; *************** *** 78,97 **** #X connect 20 0 19 0; #X connect 21 0 25 0; ! #X connect 25 0 26 0; ! #X connect 26 1 27 0; ! #X connect 27 0 21 0; ! #X connect 28 0 25 0; ! #X connect 29 0 21 0; ! #X connect 31 0 21 0; ! #X connect 32 0 31 0; ! #X connect 34 0 21 0; #X connect 35 0 34 0; ! #X connect 36 0 35 0; ! #X connect 38 0 43 0; ! #X connect 39 0 41 0; ! #X connect 41 0 35 0; ! #X connect 41 1 35 2; ! #X connect 43 0 35 0; ! #X connect 43 1 35 1; ! #X connect 45 0 21 0; ! #X connect 46 0 45 0; --- 86,115 ---- #X connect 20 0 19 0; #X connect 21 0 25 0; ! #X connect 25 0 56 0; ! #X connect 26 0 21 0; ! #X connect 27 0 25 0; ! #X connect 28 0 21 0; ! #X connect 30 0 21 0; ! #X connect 31 0 30 0; ! #X connect 33 0 21 0; ! #X connect 34 0 33 0; #X connect 35 0 34 0; ! #X connect 37 0 42 0; ! #X connect 38 0 40 0; ! #X connect 40 0 34 0; ! #X connect 40 1 34 2; ! #X connect 42 0 34 0; ! #X connect 42 1 34 1; ! #X connect 44 0 21 0; ! #X connect 45 0 44 0; ! #X connect 48 0 49 1; ! #X connect 48 1 50 1; ! #X connect 49 0 52 0; ! #X connect 50 0 52 1; ! #X connect 51 0 21 0; ! #X connect 52 0 51 0; ! #X connect 53 0 49 0; ! #X connect 53 1 50 0; ! #X connect 54 0 53 0; ! #X connect 56 0 48 0; ! #X connect 56 1 26 0;

1 0

externals/pidip CHANGES.LOG,1.4,1.5 Makefile,1.1,1.2 acinclude.m4,1.1,1.2 aclocal.m4,1.1,1.2 config.log,1.1,1.2 config.status,1.1,1.2 configure,1.2,1.3 configure.ac,1.4,1.5
by sevyves＠users.sourceforge.net 17 Oct '03

17 Oct '03

Update of /cvsroot/pure-data/externals/pidip In directory sc8-pr-cvs1:/tmp/cvs-serv31538/pidip Modified Files: CHANGES.LOG Makefile acinclude.m4 aclocal.m4 config.log config.status configure configure.ac Log Message: Version 0.12.9 ( added pdp_shape ) Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/CHANGES.LOG,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CHANGES.LOG 8 Oct 2003 14:57:22 -0000 1.4 --- CHANGES.LOG 17 Oct 2003 20:54:40 -0000 1.5 *************** *** 1,2 **** --- 1,6 ---- + 0.12.9 + added pdp_shape : a shape recognition object (based on color, similar to color tracker ) + added "fill" in pdp_pen + ( on request from ben ) 0.12.8 added pdp_pen : a free hand drawing object Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 11 Aug 2003 05:20:22 -0000 1.1 --- Makefile 17 Oct 2003 20:54:40 -0000 1.2 *************** *** 9,14 **** AALIB_LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -laa -lm -L/usr/X11R6/lib -lX11 -lgpm -lslang MAGICK_CFLAGS = -I/usr/X11R6/include -g -O2 -Wall ! MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib ! PDP_PIDIP_VERSION = 0.12.4 PDP_PIDIP_DISTRO = /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION) --- 9,14 ---- AALIB_LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -laa -lm -L/usr/X11R6/lib -lX11 -lgpm -lslang MAGICK_CFLAGS = -I/usr/X11R6/include -g -O2 -Wall ! MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib ! PDP_PIDIP_VERSION = 0.12.9 PDP_PIDIP_DISTRO = /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION) *************** *** 42,45 **** --- 42,46 ---- install: cp fonts/* /usr/X11R6/lib/X11/fonts/TTF + cp -f --remove-destination doc/* $(PD_DIR)/doc/5.reference distro: clean all Index: acinclude.m4 =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/acinclude.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: aclocal.m4 =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/aclocal.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: config.log =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/config.log,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.log 11 Aug 2003 05:20:22 -0000 1.1 --- config.log 17 Oct 2003 20:54:40 -0000 1.2 *************** *** 11,22 **** ## --------- ## ! hostname = dhcp-60-101 uname -m = i686 uname -r = 2.5.7 uname -s = Linux ! uname -v = #18 SMP Thu Jul 3 02:12:40 CEST 2003 /usr/bin/uname -p = unknown ! /bin/uname -X = /bin/arch = i686 --- 11,22 ---- ## --------- ## ! hostname = dhcp-93-1541 uname -m = i686 uname -r = 2.5.7 uname -s = Linux ! uname -v = #152 SMP Sat Oct 4 21:01:57 EDT 2003 /usr/bin/uname -p = unknown ! /bin/uname -X = unknown /bin/arch = i686 *************** *** 294,298 **** $ ./config.status ! on dhcp-60-101 config.status:578: creating Makefile --- 294,298 ---- $ ./config.status ! on dhcp-93-1541 config.status:578: creating Makefile Index: config.status =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/config.status,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.status 11 Aug 2003 05:20:22 -0000 1.1 --- config.status 17 Oct 2003 20:54:40 -0000 1.2 *************** *** 446,451 **** s,@AALIB_LIBS@,-L/usr/local/lib -Wl,-rpath,/usr/local/lib -laa -lm -L/usr/X11R6/lib -lX11 -lgpm -lslang,;t t s,@AALIB_CFLAGS@,-I/usr/local/include,;t t ! s,@PDP_PIDIP_VERSION@,0.12.4,;t t ! s,@MAGICK_LIBS@,-L/usr/X11R6/lib -lMagick -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib,;t t s,@MAGICK_CFLAGS@,-I/usr/X11R6/include -g -O2 -Wall ,;t t s,@PD_DIR@,/usr/local/pd,;t t --- 446,451 ---- s,@AALIB_LIBS@,-L/usr/local/lib -Wl,-rpath,/usr/local/lib -laa -lm -L/usr/X11R6/lib -lX11 -lgpm -lslang,;t t s,@AALIB_CFLAGS@,-I/usr/local/include,;t t ! s,@PDP_PIDIP_VERSION@,0.12.9,;t t ! s,@MAGICK_LIBS@,-L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib,;t t s,@MAGICK_CFLAGS@,-I/usr/X11R6/include -g -O2 -Wall ,;t t s,@PD_DIR@,/usr/local/pd,;t t Index: configure =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure 8 Oct 2003 14:58:46 -0000 1.2 --- configure 17 Oct 2003 20:54:40 -0000 1.3 *************** *** 1155,1159 **** ! PDP_PIDIP_VERSION=0.12.8 PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 1155,1159 ---- ! PDP_PIDIP_VERSION=0.12.9 PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.ac,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.ac 8 Oct 2003 14:57:45 -0000 1.4 --- configure.ac 17 Oct 2003 20:54:40 -0000 1.5 *************** *** 2,6 **** AC_INIT ! PDP_PIDIP_VERSION=0.12.8 PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 2,6 ---- AC_INIT ! PDP_PIDIP_VERSION=0.12.9 PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp

1 0

externals/grill/py config-pd-linux.txt,1.5,1.6 makefile.pd-linux,1.4,1.5 py.vcproj,1.3,1.4
by xovo＠users.sourceforge.net 17 Oct '03

17 Oct '03

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1:/tmp/cvs-serv345 Modified Files: config-pd-linux.txt makefile.pd-linux py.vcproj Log Message: "" Index: config-pd-linux.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/config-pd-linux.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config-pd-linux.txt 4 Oct 2003 02:38:13 -0000 1.5 --- config-pd-linux.txt 17 Oct 2003 02:47:01 -0000 1.6 *************** *** 18,23 **** # where are the python header files? PYTHONINCLUDE=/usr/local/include/python${PYTHONVER} ! # where is the python library file? ! PYTHONLIB=/usr/local/lib/python${PYTHONVER}/config # where should flext libraries be built? --- 18,24 ---- # where are the python header files? PYTHONINCLUDE=/usr/local/include/python${PYTHONVER} ! # where is the python library file? ! # in most cases this need only be specified for static linking ! # PYTHONLIB=/usr/local/lib/python${PYTHONVER}/config # where should flext libraries be built? *************** *** 29,31 **** # define for shared build ! #FLEXT_SHARED=1 --- 30,32 ---- # define for shared build ! FLEXT_SHARED=1 Index: makefile.pd-linux =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/makefile.pd-linux,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.pd-linux 4 Oct 2003 02:38:13 -0000 1.4 --- makefile.pd-linux 17 Oct 2003 02:47:01 -0000 1.5 *************** *** 18,30 **** INCLUDES=$(PDPATH) $(PYTHONINCLUDE) LIBPATH=$(PYTHONLIB) ! FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS ! CFLAGS=-O2 $(UFLAGS) LIBS=util python$(PYTHONVER) ifdef FLEXT_SHARED ! CFLAGS+=-shared -DFLEXT_SHARED LIBPATH+=$(FLEXTPATH) LIBFLEXT=-lflext ifeq ($(CXX),icc) --- 18,41 ---- INCLUDES=$(PDPATH) $(PYTHONINCLUDE) LIBPATH=$(PYTHONLIB) ! FLAGS=-DFLEXT_SYS=2 ! CFLAGS=-pthread $(UFLAGS) LIBS=util python$(PYTHONVER) + ifdef DEBUG + CFLAGS+=-g -DFLEXT_DEBUG + else + CFLAGS+=-O2 + endif ifdef FLEXT_SHARED ! CFLAGS+=-shared ! FLAGS+=-DFLEXT_SHARED LIBPATH+=$(FLEXTPATH) + + ifdef DEBUG + LIBFLEXT=-lflext_d + else LIBFLEXT=-lflext + endif ifeq ($(CXX),icc) *************** *** 36,40 **** --- 47,56 ---- else + FLAGS+=-DFLEXT_THREADS + ifdef DEBUG + LIBFLEXT=$(FLEXTPATH)/libflext_td.a + else LIBFLEXT=$(FLEXTPATH)/libflext_t.a + endif endif *************** *** 66,70 **** --- 82,88 ---- $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(CXX) -shared $(LDFLAGS) -o $@ $^ $(patsubst %,-L%,$(LIBPATH)) $(LIBFLEXT) $(patsubst %,-l%,$(LIBS)) + ifndef DEBUG strip --strip-unneeded $@ + endif chmod 755 $@ Index: py.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/py.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** py.vcproj 2 Oct 2003 02:38:04 -0000 1.3 --- py.vcproj 17 Oct 2003 02:47:01 -0000 1.4 *************** *** 43,47 **** LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/programme/audio/pd/bin,..\flext\pd-msvc,f:\prog\packs\Python-2.2.1\PCbuild" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\pd-msvc\d/py.pdb" --- 43,47 ---- LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/programme/audio/pd/bin;"..\flext\pd-msvc"" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\pd-msvc\d/py.pdb" *************** *** 153,157 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source,C:\Programme\prog\Python22\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS" StringPooling="TRUE" --- 153,157 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source,C:\Programme\prog\Python23\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS" StringPooling="TRUE" *************** *** 171,175 **** LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/programme/audio/pd/bin,..\flext\pd-msvc,C:\Programme\prog\Python22\libs" ProgramDatabaseFile=".\pd-msvc\tr/py.pdb" ImportLibrary=".\pd-msvc\tr/py.lib" --- 171,175 ---- LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/programme/audio/pd/bin;"..\flext\pd-msvc";C:\Programme\prog\Python23\libs" ProgramDatabaseFile=".\pd-msvc\tr/py.pdb" ImportLibrary=".\pd-msvc\tr/py.lib" *************** *** 229,233 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="pd.lib" OutputFile=".\pd-msvc\r/py.dll" LinkIncremental="1" --- 229,233 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="pd.lib python23.lib" OutputFile=".\pd-msvc\r/py.dll" LinkIncremental="1"

1 0

externals/grill/py/source pyext.cpp,1.6,1.7
by xovo＠users.sourceforge.net 17 Oct '03

17 Oct '03

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1:/tmp/cvs-serv345/source Modified Files: pyext.cpp Log Message: "" Index: pyext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pyext.cpp 4 Jun 2003 02:38:08 -0000 1.6 --- pyext.cpp 17 Oct 2003 02:47:01 -0000 1.7 *************** *** 382,386 **** work_data *w = (work_data *)data; work(w->n,w->Header(),w->Count(),w->Atoms()); ! // delete w; } --thrcount; --- 382,386 ---- work_data *w = (work_data *)data; work(w->n,w->Header(),w->Count(),w->Atoms()); ! delete w; } --thrcount;

1 0

externals/grill/py/pd simple-3.pd,1.1.1.1,1.2 thread-1.pd,1.3,1.4
by xovo＠users.sourceforge.net 17 Oct '03

17 Oct '03

Update of /cvsroot/pure-data/externals/grill/py/pd In directory sc8-pr-cvs1:/tmp/cvs-serv345/pd Modified Files: simple-3.pd thread-1.pd Log Message: "" Index: simple-3.pd =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/pd/simple-3.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** simple-3.pd 22 Oct 2002 23:16:08 -0000 1.1.1.1 --- simple-3.pd 17 Oct 2003 02:47:01 -0000 1.2 *************** *** 1,27 **** ! #N canvas 307 249 546 386 12; ! #X msg 88 279 help; ! #X text 15 50 This demonstrates message handling. See the simple.py ! file.; ! #X msg 87 304 doc; ! #X msg 123 305 doc+; ! #X floatatom 288 345 5 0 0; ! #X text 17 22 py/pyext - Python script objects \, (C)2002 Thomas Grill ! ; ! #X floatatom 316 119 5 0 0; ! #X floatatom 399 119 5 0 0; ! #X obj 225 279 pyext simple ex3 1; ! #X msg 39 195 reload.; ! #X msg 39 223 reload -10; ! #X text 110 194 reload script and keep arguments; ! #X text 128 224 reload script with new arguments; ! #X text 281 140 triggers; ! #X text 340 344 result; ! #X text 410 140 sets argument; ! #X connect 0 0 8 0; ! #X connect 2 0 8 0; ! #X connect 3 0 8 0; ! #X connect 6 0 8 1; ! #X connect 7 0 8 2; ! #X connect 8 0 4 0; ! #X connect 9 0 8 0; ! #X connect 10 0 8 0; --- 1,27 ---- ! #N canvas 384 270 546 386 12; ! #X msg 88 279 help; ! #X text 15 50 This demonstrates message handling. See the simple.py ! file.; ! #X msg 87 304 doc; ! #X msg 123 305 doc+; ! #X floatatom 288 345 5 0 0 0 - - -; ! #X text 17 22 py/pyext - Python script objects \, (C)2002 Thomas Grill ! ; ! #X floatatom 316 119 5 0 0 0 - - -; ! #X floatatom 399 119 5 0 0 0 - - -; ! #X obj 225 279 pyext simple ex3 1; ! #X msg 39 195 reload.; ! #X msg 39 223 reload -10; ! #X text 110 194 reload script and keep arguments; ! #X text 128 224 reload script with new arguments; ! #X text 281 140 triggers; ! #X text 340 344 result; ! #X text 410 140 sets argument; ! #X connect 0 0 8 0; ! #X connect 2 0 8 0; ! #X connect 3 0 8 0; ! #X connect 6 0 8 1; ! #X connect 7 0 8 2; ! #X connect 8 0 4 0; ! #X connect 9 0 8 0; ! #X connect 10 0 8 0; Index: thread-1.pd =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/pd/thread-1.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** thread-1.pd 28 Dec 2002 04:36:13 -0000 1.3 --- thread-1.pd 17 Oct 2003 02:47:01 -0000 1.4 *************** *** 1,9 **** ! #N canvas 440 61 588 400 12; #X msg 38 265 help; #X msg 37 290 doc; #X msg 73 291 doc+; #X floatatom 145 323 5 0 0 0 - - -; - #X text 16 14 py/pyext - Python script objects \, (C)2002 Thomas Grill - ; #X text 14 44 This demonstrates threading. See the threads.py file. ; --- 1,7 ---- ! #N canvas 440 61 590 402 12; #X msg 38 265 help; #X msg 37 290 doc; #X msg 73 291 doc+; #X floatatom 145 323 5 0 0 0 - - -; #X text 14 44 This demonstrates threading. See the threads.py file. ; *************** *** 28,47 **** #X obj 145 279 pyext threads ex1; #X text 93 101 - blocking!! -; ! #X connect 0 0 21 0; ! #X connect 1 0 21 0; ! #X connect 2 0 21 0; ! #X connect 6 0 7 0; ! #X connect 7 0 21 0; ! #X connect 9 0 12 0; ! #X connect 10 0 11 0; ! #X connect 11 0 21 1; ! #X connect 11 1 21 2; ! #X connect 11 2 14 0; ! #X connect 12 0 21 1; ! #X connect 12 1 21 2; ! #X connect 12 2 13 0; ! #X connect 13 0 6 0; ! #X connect 14 0 6 0; ! #X connect 19 0 21 0; ! #X connect 21 0 3 0; ! #X connect 21 1 8 0; --- 26,47 ---- #X obj 145 279 pyext threads ex1; #X text 93 101 - blocking!! -; ! #X text 16 14 py/pyext - Python script objects \, (C)2002 \, 2003 Thomas ! Grill; ! #X connect 0 0 20 0; ! #X connect 1 0 20 0; ! #X connect 2 0 20 0; ! #X connect 5 0 6 0; ! #X connect 6 0 20 0; ! #X connect 8 0 11 0; ! #X connect 9 0 10 0; ! #X connect 10 0 20 1; ! #X connect 10 1 20 2; ! #X connect 10 2 13 0; ! #X connect 11 0 20 1; ! #X connect 11 1 20 2; ! #X connect 11 2 12 0; ! #X connect 12 0 5 0; ! #X connect 13 0 5 0; ! #X connect 18 0 20 0; ! #X connect 20 0 3 0; ! #X connect 20 1 7 0;

1 0

externals/grill/flext/source fldefs_meththr.h,1.1,1.2
by xovo＠users.sourceforge.net 17 Oct '03

17 Oct '03

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1:/tmp/cvs-serv31410/source Modified Files: fldefs_meththr.h Log Message: "" Index: fldefs_meththr.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/fldefs_meththr.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fldefs_meththr.h 20 Apr 2003 02:36:20 -0000 1.1 --- fldefs_meththr.h 17 Oct 2003 02:38:09 -0000 1.2 *************** *** 94,98 **** th->PopThread(); \ } \ ! delete (char *)data; \ } --- 94,98 ---- th->PopThread(); \ } \ ! /* delete (char *)data; */ \ }

1 0

externals/grill/flext changes.txt,1.26,1.27 config-pd-linux.txt,1.21,1.22 flext.vcproj,1.19,1.20
by xovo＠users.sourceforge.net 17 Oct '03

17 Oct '03

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1:/tmp/cvs-serv31410 Modified Files: changes.txt config-pd-linux.txt flext.vcproj Log Message: "" Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** changes.txt 2 Oct 2003 02:32:47 -0000 1.26 --- changes.txt 17 Oct 2003 02:38:09 -0000 1.27 *************** *** 35,38 **** --- 35,39 ---- - added support for patcher arguments for attributes (use # instead of $ to save them with a patch) - moved memory functions and console output from flext to super-base-class flext_root and derived all helper classes from that + - changed FLEXT_THREAD_X: wrappers doesn't delete the passed data pointer anymore -> the called method is responsible for that (and it knows the type....) 0.4.4: Index: config-pd-linux.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/config-pd-linux.txt,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** config-pd-linux.txt 3 Oct 2003 02:32:48 -0000 1.21 --- config-pd-linux.txt 17 Oct 2003 02:38:09 -0000 1.22 *************** *** 13,21 **** # where is the SndObj include directory? # (leave blank or comment out to disable SndObj support) ! SNDOBJ=/usr/local/include #/SndObj # where is the STK include directory? # (leave blank or comment out to disable STK support) ! STK=/usr/src/stk-4.1.1/include # where should flext libraries be built? --- 13,21 ---- # where is the SndObj include directory? # (leave blank or comment out to disable SndObj support) ! #SNDOBJ=/usr/local/include # where is the STK include directory? # (leave blank or comment out to disable STK support) ! #STK=/usr/src/stk-4.1.1/include # where should flext libraries be built? Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** flext.vcproj 19 Sep 2003 02:32:53 -0000 1.19 --- flext.vcproj 17 Oct 2003 02:38:09 -0000 1.20 *************** *** 226,230 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="c:\programme\audio\pd-0.37\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FLEXT_SYS=2;FLEXT_THREADS;FLEXT_USE_SIMD" StringPooling="TRUE" --- 226,230 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FLEXT_SYS=2;FLEXT_THREADS;FLEXT_USE_SIMD" StringPooling="TRUE"

1 0

pd/src makefile,1.1.1.1.14.5,NONE
by xovo＠users.sourceforge.net 16 Oct '03

16 Oct '03

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1:/tmp/cvs-serv17547 Removed Files: Tag: devel_0_37 makefile Log Message: removed makefile which should come from ./configure anyhow... --- makefile DELETED ---

1 0

pd/src m_obj.c,1.1.1.3.2.1,1.1.1.3.2.2 makefile,1.1.1.1.14.4,1.1.1.1.14.5 makefile.in,1.1.1.3.2.8,1.1.1.3.2.9
by xovo＠users.sourceforge.net 16 Oct '03

16 Oct '03

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1:/tmp/cvs-serv17122 Modified Files: Tag: devel_0_37 m_obj.c makefile makefile.in Log Message: introduced a more portable method for checking of stack overflows Index: m_obj.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_obj.c,v retrieving revision 1.1.1.3.2.1 retrieving revision 1.1.1.3.2.2 diff -C2 -d -r1.1.1.3.2.1 -r1.1.1.3.2.2 *** m_obj.c 16 Oct 2003 16:09:48 -0000 1.1.1.3.2.1 --- m_obj.c 16 Oct 2003 16:50:20 -0000 1.1.1.3.2.2 *************** *** 10,13 **** --- 10,17 ---- #include "m_imp.h" + /* T.Grill - define for a modified, more portable method to detect stack overflows */ + #define NEWSTACKMETH + + union inletunion { *************** *** 257,262 **** --- 261,272 ---- /* --------------------------- outlets ------------------------------ */ + #ifdef NEWSTACKMETH + static int stackcount = 0; + #define STACKITER 1000 + #else static char *stacklimit, *topstack; #define STACKSIZE 1000000 + #endif + static int outlet_eventno; *************** *** 264,272 **** --- 274,285 ---- for the outlet functions to check to prevent stack overflow from message recursion */ + void outlet_setstacklim(void) { + #ifndef NEWSTACKMETH char c; topstack = &c; stacklimit = (&c) - STACKSIZE; + #endif outlet_eventno++; } *************** *** 311,315 **** --- 324,330 ---- { pd_error(x->o_owner, "stack overflow"); + #ifndef NEWSTACKMETH stacklimit = topstack; + #endif } *************** *** 317,328 **** { t_outconnect *oc; ! #ifndef NOSTACKCHK char c; if (&c < stacklimit) outlet_stackerror(x); else - #endif for (oc = x->o_connections; oc; oc = oc->oc_next) pd_bang(oc->oc_to); } --- 332,348 ---- { t_outconnect *oc; ! #ifdef NEWSTACKMETH ! if(++stackcount >= STACKITER) ! #else char c; if (&c < stacklimit) + #endif outlet_stackerror(x); else for (oc = x->o_connections; oc; oc = oc->oc_next) pd_bang(oc->oc_to); + #ifdef NEWSTACKMETH + --stackcount; + #endif } *************** *** 331,340 **** t_outconnect *oc; t_gpointer gpointer; ! #ifndef NOSTACKCHK ! char c; if (&c < stacklimit) outlet_stackerror(x); else - #endif { #if 0 --- 351,362 ---- t_outconnect *oc; t_gpointer gpointer; ! #ifdef NEWSTACKMETH ! if(++stackcount >= STACKITER) ! #else ! char c; if (&c < stacklimit) + #endif outlet_stackerror(x); else { #if 0 *************** *** 349,352 **** --- 371,377 ---- #endif } + #ifdef NEWSTACKMETH + --stackcount; + #endif } *************** *** 354,365 **** { t_outconnect *oc; ! #ifndef NOSTACKCHK ! char c; if (&c < stacklimit) outlet_stackerror(x); ! else ! #endif for (oc = x->o_connections; oc; oc = oc->oc_next) pd_float(oc->oc_to, f); } --- 379,395 ---- { t_outconnect *oc; ! #ifdef NEWSTACKMETH ! if(++stackcount >= STACKITER) ! #else ! char c; if (&c < stacklimit) + #endif outlet_stackerror(x); ! else for (oc = x->o_connections; oc; oc = oc->oc_next) pd_float(oc->oc_to, f); + #ifdef NEWSTACKMETH + --stackcount; + #endif } *************** *** 367,378 **** { t_outconnect *oc; ! #ifndef NOSTACKCHK ! char c; if (&c < stacklimit) outlet_stackerror(x); ! else ! #endif for (oc = x->o_connections; oc; oc = oc->oc_next) pd_symbol(oc->oc_to, s); } --- 397,413 ---- { t_outconnect *oc; ! #ifdef NEWSTACKMETH ! if(++stackcount >= STACKITER) ! #else ! char c; if (&c < stacklimit) + #endif outlet_stackerror(x); ! else for (oc = x->o_connections; oc; oc = oc->oc_next) pd_symbol(oc->oc_to, s); + #ifdef NEWSTACKMETH + --stackcount; + #endif } *************** *** 380,391 **** { t_outconnect *oc; ! #ifndef NOSTACKCHK ! char c; if (&c < stacklimit) outlet_stackerror(x); ! else ! #endif for (oc = x->o_connections; oc; oc = oc->oc_next) pd_list(oc->oc_to, s, argc, argv); } --- 415,431 ---- { t_outconnect *oc; ! #ifdef NEWSTACKMETH ! if(++stackcount >= STACKITER) ! #else ! char c; if (&c < stacklimit) + #endif outlet_stackerror(x); ! else for (oc = x->o_connections; oc; oc = oc->oc_next) pd_list(oc->oc_to, s, argc, argv); + #ifdef NEWSTACKMETH + --stackcount; + #endif } *************** *** 393,404 **** { t_outconnect *oc; ! #ifndef NOSTACKCHK ! char c; if (&c < stacklimit) - outlet_stackerror(x); - else #endif for (oc = x->o_connections; oc; oc = oc->oc_next) typedmess(oc->oc_to, s, argc, argv); } --- 433,449 ---- { t_outconnect *oc; ! #ifdef NEWSTACKMETH ! if(++stackcount >= STACKITER) ! #else ! char c; if (&c < stacklimit) #endif + outlet_stackerror(x); + else for (oc = x->o_connections; oc; oc = oc->oc_next) typedmess(oc->oc_to, s, argc, argv); + #ifdef NEWSTACKMETH + --stackcount; + #endif } Index: makefile =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile,v retrieving revision 1.1.1.1.14.4 retrieving revision 1.1.1.1.14.5 diff -C2 -d -r1.1.1.1.14.4 -r1.1.1.1.14.5 *** makefile 15 Oct 2003 07:55:10 -0000 1.1.1.1.14.4 --- makefile 16 Oct 2003 16:50:20 -0000 1.1.1.1.14.5 *************** *** 11,15 **** MANDIR = ${prefix}/man ! MORECFLAGS = -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUSEAPI_OSS -I../portaudio/pa_common -I../portaudio/pablio -I../portaudio/portmidi-macosx -DPA_USE_ALSA -DUSEAPI_ALSA -DUSEAPI_JACK INCLUDE = -I. --- 11,15 ---- MANDIR = ${prefix}/man ! MORECFLAGS = -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUSEAPI_OSS -I../portaudio/pa_common -I../portaudio/pablio -I../portaudio/portmidi-macosx -Werror -DPA_USE_ALSA -DUSEAPI_ALSA -DUSEAPI_JACK INCLUDE = -I. *************** *** 20,29 **** LIB = -ldl -lm -lpthread -lasound ! OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer ! WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD -DUNIX ! CFLAGS = $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) # the sources --- 20,29 ---- LIB = -ldl -lm -lpthread -lasound ! OPT_CFLAGS = -g ! WARN_CFLAGS = -Wall -W -Wstrict-prototypes -Werror \ -Wno-unused -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD -DUNIX ! CFLAGS += $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) # the sources *************** *** 79,89 **** $(BIN_DIR)/pd-watchdog: s_watchdog.c ! cc -O2 $(STRIPFLAG) -o $(BIN_DIR)/pd-watchdog s_watchdog.c $(BIN_DIR)/pdsend: u_pdsend.c ! cc $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdsend u_pdsend.c $(BIN_DIR)/pdreceive: u_pdreceive.c ! cc $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c $(PDEXEC): $(OBJ) --- 79,89 ---- $(BIN_DIR)/pd-watchdog: s_watchdog.c ! $(CC) -O2 $(STRIPFLAG) -o $(BIN_DIR)/pd-watchdog s_watchdog.c $(BIN_DIR)/pdsend: u_pdsend.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdsend u_pdsend.c $(BIN_DIR)/pdreceive: u_pdreceive.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c $(PDEXEC): $(OBJ) Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.1.1.3.2.8 retrieving revision 1.1.1.3.2.9 diff -C2 -d -r1.1.1.3.2.8 -r1.1.1.3.2.9 *** makefile.in 12 Oct 2003 15:15:41 -0000 1.1.1.3.2.8 --- makefile.in 16 Oct 2003 16:50:20 -0000 1.1.1.3.2.9 *************** *** 25,29 **** ARCH_CFLAGS = -DPD -DUNIX ! CFLAGS = $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) # the sources --- 25,29 ---- ARCH_CFLAGS = -DPD -DUNIX ! CFLAGS += $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) # the sources *************** *** 79,89 **** $(BIN_DIR)/pd-watchdog: s_watchdog.c ! cc -O2 $(STRIPFLAG) -o $(BIN_DIR)/pd-watchdog s_watchdog.c $(BIN_DIR)/pdsend: u_pdsend.c ! cc $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdsend u_pdsend.c $(BIN_DIR)/pdreceive: u_pdreceive.c ! cc $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c $(PDEXEC): $(OBJ) --- 79,89 ---- $(BIN_DIR)/pd-watchdog: s_watchdog.c ! $(CC) -O2 $(STRIPFLAG) -o $(BIN_DIR)/pd-watchdog s_watchdog.c $(BIN_DIR)/pdsend: u_pdsend.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdsend u_pdsend.c $(BIN_DIR)/pdreceive: u_pdreceive.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c $(PDEXEC): $(OBJ)

1 0

← Newer
1
...
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs October 2003