a few fixes for opencv 2.0

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

1 files changed, 53 insertions, 134 deletions

diff --git a/pix_opencv_contours_convexity-help.pd b/pix_opencv_contours_convexity-help.pd
index 46c20bf..8af1aef 100644
--- a/pix_opencv_contours_convexity-help.pd
+++ b/pix_opencv_contours_convexity-help.pd
@@ -1,15 +1,8 @@
-#N canvas 210 25 1257 664 10;
+#N canvas 179 49 1257 664 10;
 #X obj 598 605 cnv 15 255 67 empty empty empty 20 12 0 14 -24198 -66577
 0;
 #X obj 616 648 pix_opencv_contours_convexity;
-#X floatatom 782 842 5 0 0 0 - - -;
-#X floatatom 981 998 5 0 0 0 - - -;
-#X floatatom 884 841 5 0 0 0 - - -;
-#X floatatom 1066 1002 5 0 0 0 - - -;
-#X floatatom 939 843 5 0 0 0 - - -;
-#X floatatom 1126 1003 5 0 0 0 - - -;
-#X floatatom 1030 844 5 0 0 0 - - -;
-#X floatatom 1203 1004 5 0 0 0 - - -;
+#X floatatom 804 807 5 0 0 0 - - -;
 #X floatatom 1767 815 5 0 0 0 - - -;
 #X floatatom 1801 815 5 0 0 0 - - -;
 #X text 1775 834 Depth point (X -Y);
@@ -61,7 +54,7 @@ be analyzed..;
 #X connect 10 0 7 0;
 #X connect 10 2 9 0;
 #X restore 63 104 pd gemwin;
-#X msg 63 86 destroy;
+#X msg 63 86 create;
 #X obj 464 858 pix_texture;
 #X obj 464 886 square 2;
 #X obj 616 391 separator;
@@ -114,7 +107,7 @@ be analyzed..;
 #X connect 11 1 9 0;
 #X connect 11 1 6 0;
 #X restore 557 319 pd vswitch;
-#X obj 625 319 tgl 15 0 empty load empty 17 7 0 10 -262144 -1 -1 1
+#X obj 625 319 tgl 15 0 empty load empty 17 7 0 10 -262144 -1 -1 0
 1;
 #X obj 498 247 pix_video;
 #X obj 498 59 gemhead;
@@ -127,129 +120,55 @@ be analyzed..;
 #X floatatom 763 492 5 0 0 0 - - -;
 #X obj 616 534 pix_opencv_morphology;
 #X floatatom 764 533 5 0 0 0 - - -;
-#X obj 620 513 pix_separator;
-#X obj 616 881 square 4;
-#X floatatom 579 958 5 0 0 0 - - -;
-#X floatatom 613 958 5 0 0 0 - - -;
-#X obj 443 975 gemhead;
-#X obj 446 1026 translateXYZ;
-#X obj 447 1066 square 0.2;
-#X obj 582 1011 - 160;
-#X obj 583 1042 / 40;
-#X obj 629 1012 - 120;
-#X obj 629 1043 / 30;
-#X obj 442 999 colorRGB 0 1 0;
 #X obj 815 778 unpack 0 0;
-#X obj 888 779 unpack 0 0;
-#X obj 973 779 unpack 0 0;
-#X obj 1064 780 unpack 0 0;
-#X floatatom 1111 847 5 0 0 0 - - -;
-#X floatatom 1310 1003 5 0 0 0 - - -;
-#X floatatom 1213 846 5 0 0 0 - - -;
-#X floatatom 1395 1007 5 0 0 0 - - -;
-#X floatatom 1268 848 5 0 0 0 - - -;
-#X floatatom 1455 1008 5 0 0 0 - - -;
-#X floatatom 1359 849 5 0 0 0 - - -;
-#X floatatom 1532 1009 5 0 0 0 - - -;
-#X obj 1144 783 unpack 0 0;
-#X obj 1217 784 unpack 0 0;
-#X obj 1302 784 unpack 0 0;
-#X obj 1393 785 unpack 0 0;
 #X obj 809 695 route 0 1 2 3 4 5 6 7;
-#X obj 807 882 max;
-#X obj 851 882 max;
-#X obj 888 883 max;
-#X obj 932 883 max;
-#X obj 987 884 max;
-#X obj 1031 884 max;
-#X floatatom 753 989 5 0 0 0 - - -;
-#X connect 1 0 20 0;
-#X connect 1 1 14 0;
-#X connect 1 2 85 0;
-#X connect 2 0 86 0;
-#X connect 3 0 60 0;
-#X connect 4 0 86 1;
-#X connect 6 0 87 1;
-#X connect 8 0 88 1;
-#X connect 19 0 32 0;
-#X connect 20 0 58 0;
-#X connect 22 0 23 0;
-#X connect 23 0 22 0;
+#X obj 616 881 square 2;
+#X text 891 779 for each point;
+#X text 808 823 X;
+#X floatatom 868 809 5 0 0 0 - - -;
+#X text 868 827 Y;
+#X connect 1 0 13 0;
+#X connect 1 1 7 0;
+#X connect 1 2 51 0;
+#X connect 12 0 25 0;
+#X connect 13 0 52 0;
+#X connect 15 0 16 0;
+#X connect 16 0 15 0;
+#X connect 17 0 18 0;
+#X connect 19 0 46 0;
+#X connect 20 0 23 0;
+#X connect 21 0 22 0;
+#X connect 22 0 25 1;
+#X connect 23 0 24 0;
 #X connect 24 0 25 0;
-#X connect 26 0 53 0;
-#X connect 27 0 30 0;
-#X connect 28 0 29 0;
-#X connect 29 0 32 1;
-#X connect 30 0 31 0;
-#X connect 31 0 32 0;
-#X connect 32 0 44 1;
-#X connect 32 2 28 0;
-#X connect 33 0 32 0;
-#X connect 34 0 33 0;
-#X connect 36 0 32 0;
-#X connect 36 0 46 0;
-#X connect 37 0 32 0;
-#X connect 38 0 32 0;
-#X connect 39 0 36 0;
-#X connect 39 0 34 0;
-#X connect 40 0 26 0;
-#X connect 41 0 43 0;
-#X connect 42 0 41 0;
-#X connect 43 0 24 0;
-#X connect 44 0 40 0;
-#X connect 45 0 44 2;
-#X connect 46 0 44 0;
-#X connect 47 0 46 0;
-#X connect 48 0 46 0;
-#X connect 49 0 46 0;
-#X connect 50 0 46 0;
-#X connect 51 0 46 0;
-#X connect 52 0 57 0;
-#X connect 53 0 52 0;
-#X connect 54 0 52 1;
-#X connect 55 0 1 0;
-#X connect 56 0 55 1;
-#X connect 57 0 55 0;
-#X connect 59 0 64 0;
-#X connect 60 0 66 0;
-#X connect 61 0 68 0;
-#X connect 62 0 63 0;
-#X connect 64 0 65 0;
-#X connect 65 0 62 1;
-#X connect 66 0 67 0;
-#X connect 67 0 62 2;
-#X connect 68 0 62 0;
-#X connect 69 0 2 0;
-#X connect 69 1 3 0;
-#X connect 70 0 4 0;
-#X connect 70 1 5 0;
-#X connect 71 0 6 0;
-#X connect 71 1 7 0;
-#X connect 72 0 8 0;
-#X connect 72 1 9 0;
-#X connect 73 0 89 1;
-#X connect 75 0 90 1;
-#X connect 77 0 91 1;
-#X connect 81 0 73 0;
-#X connect 81 1 74 0;
-#X connect 82 0 75 0;
-#X connect 82 1 76 0;
-#X connect 83 0 77 0;
-#X connect 83 1 78 0;
-#X connect 84 0 79 0;
-#X connect 84 1 80 0;
-#X connect 85 0 69 0;
-#X connect 85 1 70 0;
-#X connect 85 2 71 0;
-#X connect 85 3 72 0;
-#X connect 85 4 81 0;
-#X connect 85 5 82 0;
-#X connect 85 6 83 0;
-#X connect 85 7 84 0;
-#X connect 86 0 87 0;
-#X connect 87 0 88 0;
-#X connect 88 0 89 0;
-#X connect 89 0 90 0;
-#X connect 90 0 91 0;
-#X connect 91 0 92 0;
-#X connect 92 0 59 0;
+#X connect 25 0 37 1;
+#X connect 25 2 21 0;
+#X connect 26 0 25 0;
+#X connect 27 0 26 0;
+#X connect 29 0 25 0;
+#X connect 29 0 39 0;
+#X connect 30 0 25 0;
+#X connect 31 0 25 0;
+#X connect 32 0 29 0;
+#X connect 32 0 27 0;
+#X connect 33 0 19 0;
+#X connect 34 0 36 0;
+#X connect 35 0 34 0;
+#X connect 36 0 17 0;
+#X connect 37 0 33 0;
+#X connect 37 0 35 0;
+#X connect 38 0 37 2;
+#X connect 39 0 37 0;
+#X connect 40 0 39 0;
+#X connect 41 0 39 0;
+#X connect 42 0 39 0;
+#X connect 43 0 39 0;
+#X connect 44 0 39 0;
+#X connect 45 0 48 0;
+#X connect 46 0 45 0;
+#X connect 47 0 45 1;
+#X connect 48 0 1 0;
+#X connect 49 0 48 1;
+#X connect 50 0 2 0;
+#X connect 50 1 55 0;
+#X connect 51 0 50 0;