diff options
Diffstat (limited to 'examples/00_opencv_haarcascade+pix_image/00_opencv_haarcascade+pix_image.pd')
| -rw-r--r-- | examples/00_opencv_haarcascade+pix_image/00_opencv_haarcascade+pix_image.pd | 11 |
1 files changed, 0 insertions, 11 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; |