fixed merge-conflicts

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

4 files changed, 5 insertions, 54 deletions

diff --git a/examples/00_opencv_haarcascade+pix_image/00_opencv_haarcascade+pix_image.pd b/examples/00_opencv_haarcascade+pix_image/00_opencv_haarcascade+pix_image.pd
index 17184cb..05cf7cf 100644
--- a/examples/00_opencv_haarcascade+pix_image/00_opencv_haarcascade+pix_image.pd
+++ b/examples/00_opencv_haarcascade+pix_image/00_opencv_haarcascade+pix_image.pd
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 #N canvas 52 71 946 685 8;
-=======
-#N canvas 563 174 946 685 8;
 #X declare -path ../../;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X obj 277 1021 pix_texture;
 #X obj 277 1048 rectangle 4 3;
 #X obj 277 347 pix_rgba;
@@ -46,11 +42,7 @@
 #X connect 6 0 0 0;
 #X connect 7 0 0 0;
 #X restore 304 94 pd gemwin;
-<<<<<<< HEAD
 #X msg 304 61 create;
-=======
-#X msg 304 61 destroy;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X obj -190 155 cnv 15 600 180 empty empty empty 20 12 0 14 -260097
 -66577 0;
 #X text -167 194 2.- Setup your camera;
@@ -132,10 +124,7 @@ change the size of the image accorrding;
 #X obj 394 860 translateXYZ 0 0 0.2;
 #X obj 454 629 -;
 #X obj 484 626 * 2;
-<<<<<<< HEAD
-=======
 #X obj 503 87 declare -path ../../;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X connect 0 0 1 0;
 #X connect 2 0 14 0;
 #X connect 3 0 8 0;
diff --git a/examples/02_opencv_motempl+particle_system/02_opencv_motempl+particle_system.pd b/examples/02_opencv_motempl+particle_system/02_opencv_motempl+particle_system.pd
index c884257..91eaf5c 100644
--- a/examples/02_opencv_motempl+particle_system/02_opencv_motempl+particle_system.pd
+++ b/examples/02_opencv_motempl+particle_system/02_opencv_motempl+particle_system.pd
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 #N canvas 0 25 1259 669 10;
-=======
-#N canvas 3 80 1259 669 10;
 #X declare -path ../..;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X obj 422 769 route -1 0 1 2 3 4;
 #X floatatom 425 849 5 0 0 0 - - -;
 #X floatatom 460 849 5 0 0 0 - - -;
@@ -218,21 +214,14 @@ want or also to a generalized solution.;
 0 1;
 #X obj 173 1422 spigot;
 #X obj 206 1396 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
-<<<<<<< HEAD
 0 1;
-=======
-1 1;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X text -174 1438 This example is the typical video projection to the
 floor following the movement of the people. So image to project must
 be just a black background with the particles.;
 #X obj 228 1395 loadbang;
 #X text 222 1296 show/hide analysis ->;
 #X text 39 1394 show/hide original image ->;
-<<<<<<< HEAD
-=======
 #X obj 735 273 declare -path ../..;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X connect 0 0 13 0;
 #X connect 0 1 14 0;
 #X connect 0 2 15 0;
diff --git a/examples/05_perspective_correction/05_perspective_correction.pd b/examples/05_perspective_correction/05_perspective_correction.pd
index a013a19..ff02cee 100644
--- a/examples/05_perspective_correction/05_perspective_correction.pd
+++ b/examples/05_perspective_correction/05_perspective_correction.pd
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-#N canvas 737 110 900 736 10;
-=======
-#N canvas 745 86 900 736 10;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
+#N canvas 37 31 900 736 10;
 #X declare -path ../../;
 #X obj 180 76 gemhead;
 #X obj 180 96 pix_share_read 666 640 480 1;
@@ -59,11 +55,7 @@ positives;
 #X obj 70 619 scaleXYZ 0.5 0.5 0;
 #X msg 113 517 5.3333 320;
 #X msg 189 517 4 240;
-<<<<<<< HEAD
 #N canvas 1 110 450 300 format 0;
-=======
-#N canvas 3 79 450 300 format 0;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X obj 93 7 inlet;
 #X obj 118 140 outlet;
 #X msg 108 68 \$1 \$4 0 \$7 \$2 \$5 0 \$8 0 0 1 0 \$3 \$6 0 \$9;
@@ -148,11 +140,7 @@ matrix between srcMatrix and dstMatrix;
 #X text 502 594 pix_opencv_findchessboardcorners finds chessboard corners
 in the incomming image stream and send out corners coordinates as a
 list trought its second outlet;
-<<<<<<< HEAD
-#N canvas 737 406 715 644 generates_coords 0;
-=======
-#N canvas 743 388 715 644 generates_coords 1;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
+#N canvas 37 40 715 644 generates_coords 0;
 #X obj 58 2 inlet;
 #X obj 78 251 until;
 #X obj 78 358 f;
@@ -270,22 +258,13 @@ scrMatrix for pix_opencv_warpperspective;
 with pix_opencv_warpperspective and pix_opencv_findchessboardcorners
 ;
 #X text -18 0 declare path to be sure externals were found...;
-<<<<<<< HEAD
-#X text 354 95 <-- receive image from subprocess.pd;
-#X obj 224 198 pix_flip;
-=======
 #X text 508 440 use the other patch to move the chessboard;
 #X text 354 95 <-- receive image from subprocess.pd;
 #X obj 207 159 pix_flip;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X text 102 162 the flip flag;
 #X text 102 172 this is a bug;
 #X text 184 159 -->;
 #X obj 180 136 t a a;
-<<<<<<< HEAD
-#X text 508 440 use subprocess patch to move the chessboard;
-=======
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X connect 0 0 1 0;
 #X connect 1 0 13 0;
 #X connect 2 0 74 0;
@@ -301,11 +280,7 @@ with pix_opencv_warpperspective and pix_opencv_findchessboardcorners
 #X connect 11 0 10 0;
 #X connect 12 0 2 0;
 #X connect 12 0 70 0;
-<<<<<<< HEAD
-#X connect 13 0 91 0;
-=======
 #X connect 13 0 92 0;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X connect 16 0 17 0;
 #X connect 16 1 18 0;
 #X connect 19 0 20 0;
@@ -348,9 +323,5 @@ with pix_opencv_warpperspective and pix_opencv_findchessboardcorners
 #X connect 75 0 74 1;
 #X connect 76 0 75 0;
 #X connect 76 0 73 1;
-<<<<<<< HEAD
-#X connect 91 0 2 0;
-=======
 #X connect 92 0 2 0;
 #X connect 92 1 88 0;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
diff --git a/examples/05_perspective_correction/subprocess.pd b/examples/05_perspective_correction/subprocess.pd
index 55b53ac..8f6a239 100644
--- a/examples/05_perspective_correction/subprocess.pd
+++ b/examples/05_perspective_correction/subprocess.pd
@@ -1,4 +1,5 @@
-#N canvas 745 670 837 384 10;
+#N canvas 528 380 837 384 10;
+#X declare -lib Gem;
 #X obj 313 153 gemhead;
 #X obj 313 198 pix_image;
 #X msg 374 162 open pattern.png;
@@ -42,6 +43,7 @@ move in the 05_perspective_correction window;
 -262144 -1 -1 12.15 256;
 #X obj 667 141 nbx 5 14 -1e+37 1e+37 0 1 empty empty rotZ 0 -8 0 10
 -262144 -1 -1 -157.27 256;
+#X obj 179 63 declare -lib Gem;
 #X connect 0 0 1 0;
 #X connect 1 0 3 0;
 #X connect 2 0 1 0;