a few fixes for opencv 2.0

svn path=/trunk/externals/pix_opencv/; revision=13743

1 files changed, 45 insertions, 41 deletions

diff --git a/pix_opencv_floodfill-help.pd b/pix_opencv_floodfill-help.pd
index 7da304f..5adaa14 100644
--- a/pix_opencv_floodfill-help.pd
+++ b/pix_opencv_floodfill-help.pd
@@ -1,4 +1,4 @@
-#N canvas 409 124 1171 685 10;
+#N canvas 265 148 1171 685 10;
 #X obj -96 -15 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577
 0;
 #N canvas 0 22 454 304 gemwin 0;
@@ -40,7 +40,7 @@
 #X connect 10 2 11 0;
 #X connect 11 0 6 0;
 #X restore -89 31 pd gemwin;
-#X msg -88 9 create;
+#X msg -88 9 destroy;
 #X text -88 -12 Create window and render;
 #X obj 288 360 cnv 15 600 350 empty empty empty 20 12 0 14 -24198 -66577
 0;
@@ -67,9 +67,6 @@ specific color;
 #X text 485 534 activate color mode ( default : on );
 #X msg 381 461 fillcolor 1 255 0 123;
 #X text 519 462 fillcolor of nth component ( 1 < n < 10 );
-#X text 425 372 mark %x %y : mark a component;
-#X text 425 384 ( 0 <= %x <= 1 );
-#X text 426 395 ( 0 <= %y <= 1 );
 #X msg 365 414 delete 1;
 #X msg 379 436 clear;
 #X text 425 414 delete a component ( 1 <= index <= 10 );
@@ -101,13 +98,13 @@ specific color;
 #X msg 505 65 open \$1;
 #X obj 493 174 pix_film;
 #X msg 511 108 auto \$1;
-#X obj 511 90 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1
+#X obj 511 90 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1
 ;
 #X msg 606 91 colorspace RGBA;
 #X msg 711 91 colorspace RGB;
 #X msg 815 91 colorspace Grey;
 #X obj 606 63 loadbang;
-#N canvas 0 0 450 300 vswitch 0;
+#N canvas 4 49 450 300 vswitch 0;
 #X obj 144 263 outlet;
 #X obj 36 26 inlet;
 #X obj 260 29 inlet;
@@ -145,9 +142,15 @@ specific color;
 #X msg 281 43 dialog;
 #X msg 286 73 device /dev/dv1394-0;
 #X obj 315 764 rectangle 5.3 4;
+#X floatatom 743 233 5 0 0 0 - - -;
+#X floatatom 791 232 5 0 0 0 - - -;
+#X text 424 386 mark x y : mark a component;
+#X obj 315 318 pix_resize 320 240;
 #X connect 1 0 2 0;
 #X connect 2 0 1 0;
+#X connect 5 0 68 0;
 #X connect 5 0 7 1;
+#X connect 5 1 69 0;
 #X connect 5 1 6 1;
 #X connect 5 2 10 0;
 #X connect 6 0 9 1;
@@ -157,45 +160,46 @@ specific color;
 #X connect 9 0 19 0;
 #X connect 10 0 11 0;
 #X connect 11 0 8 0;
-#X connect 12 0 49 0;
-#X connect 12 1 35 0;
+#X connect 12 0 46 0;
+#X connect 12 1 32 0;
 #X connect 17 0 12 1;
 #X connect 18 0 12 2;
 #X connect 19 0 12 0;
 #X connect 20 0 12 0;
 #X connect 21 0 20 0;
 #X connect 23 0 12 0;
-#X connect 28 0 12 0;
-#X connect 29 0 12 0;
-#X connect 35 0 40 0;
-#X connect 40 0 36 0;
-#X connect 40 1 37 0;
-#X connect 40 2 38 0;
-#X connect 40 3 39 0;
-#X connect 46 0 12 0;
-#X connect 47 0 12 0;
-#X connect 48 0 55 0;
-#X connect 49 0 70 0;
-#X connect 50 0 53 0;
+#X connect 25 0 12 0;
+#X connect 26 0 12 0;
+#X connect 32 0 37 0;
+#X connect 37 0 33 0;
+#X connect 37 1 34 0;
+#X connect 37 2 35 0;
+#X connect 37 3 36 0;
+#X connect 43 0 12 0;
+#X connect 44 0 12 0;
+#X connect 45 0 52 0;
+#X connect 46 0 67 0;
+#X connect 47 0 50 0;
+#X connect 48 0 49 0;
+#X connect 49 0 52 1;
+#X connect 50 0 51 0;
 #X connect 51 0 52 0;
-#X connect 52 0 55 1;
-#X connect 53 0 54 0;
-#X connect 54 0 55 0;
-#X connect 55 0 62 1;
-#X connect 55 2 51 0;
-#X connect 56 0 55 0;
-#X connect 57 0 56 0;
+#X connect 52 0 59 1;
+#X connect 52 2 48 0;
+#X connect 53 0 52 0;
+#X connect 54 0 53 0;
+#X connect 55 0 52 0;
+#X connect 55 0 61 0;
+#X connect 56 0 52 0;
+#X connect 57 0 52 0;
 #X connect 58 0 55 0;
-#X connect 58 0 64 0;
-#X connect 59 0 55 0;
-#X connect 60 0 55 0;
-#X connect 61 0 58 0;
-#X connect 61 0 57 0;
-#X connect 62 0 12 0;
-#X connect 63 0 62 2;
-#X connect 64 0 62 0;
-#X connect 65 0 64 0;
-#X connect 66 0 64 0;
-#X connect 67 0 64 0;
-#X connect 68 0 64 0;
-#X connect 69 0 64 0;
+#X connect 58 0 54 0;
+#X connect 59 0 71 0;
+#X connect 60 0 59 2;
+#X connect 61 0 59 0;
+#X connect 62 0 61 0;
+#X connect 63 0 61 0;
+#X connect 64 0 61 0;
+#X connect 65 0 61 0;
+#X connect 66 0 61 0;
+#X connect 71 0 12 0;