fix extension for pix_opencv_matchshape and pix_opencv_contours

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

3 files changed, 16 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 4d607b1..69c9f1f 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ endif
 
 .SUFFIXES = $(EXTENSION)
 
-SOURCES = pix_opencv_edge.cc pix_opencv_laplace.cc pix_opencv_morphology.cc pix_opencv_distrans.cc pix_opencv_motempl.cc pix_opencv_haarcascade.cc pix_opencv_contours_boundingrect.cc pix_opencv_bgsubstract.cc pix_opencv_contours_convexity.cc pix_opencv_dft.cc pix_opencv_lk.cc pix_opencv_hist_compare.cc pix_opencv_knear.cc pix_opencv_threshold.cc pix_opencv_floodfill.cc pix_opencv_athreshold.cc pix_opencv_bgstats.cc pix_opencv_camshift.cc pix_opencv_hu_compare.cc pix_opencv_pgh_compare.cc pix_opencv_hough_circles.cc pix_opencv_hough_lines.cc pix_opencv_hu_moments.cc pix_opencv_contours_convexhull.cc pix_opencv_colorfilt.cc pix_opencv_of_bm.cc pix_opencv_of_hs.cc pix_opencv_of_lk.cc pix_opencv_calibration.cc pix_opencv_warpperspective.cc pix_opencv_findchessboardcorners.cc pix_opencv_contours.cc pix_opencv_matchshape.cc 
+SOURCES = pix_opencv_edge.cc pix_opencv_laplace.cc pix_opencv_morphology.cc pix_opencv_distrans.cc pix_opencv_motempl.cc pix_opencv_haarcascade.cc pix_opencv_contours_boundingrect.cc pix_opencv_bgsubstract.cc pix_opencv_contours_convexity.cc pix_opencv_dft.cc pix_opencv_lk.cc pix_opencv_hist_compare.cc pix_opencv_knear.cc pix_opencv_threshold.cc pix_opencv_floodfill.cc pix_opencv_athreshold.cc pix_opencv_bgstats.cc pix_opencv_camshift.cc pix_opencv_hu_compare.cc pix_opencv_pgh_compare.cc pix_opencv_hough_circles.cc pix_opencv_hough_lines.cc pix_opencv_hu_moments.cc pix_opencv_contours_convexhull.cc pix_opencv_colorfilt.cc pix_opencv_of_bm.cc pix_opencv_of_hs.cc pix_opencv_of_lk.cc pix_opencv_calibration.cc pix_opencv_warpperspective.cc pix_opencv_findchessboardcorners.cc pix_opencv_contours.cc pix_opencv_matchshape.cc
 
 all: $(SOURCES:.cc=.$(EXTENSION)) $(SOURCES_OPT:.cc=.$(EXTENSION)) blobtrack
 
diff --git a/Makefile.in b/Makefile.in
index 991a306..d3ef6fb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,7 +31,7 @@ endif
 
 .SUFFIXES = $(EXTENSION)
 
-SOURCES = pix_opencv_edge.cc pix_opencv_laplace.cc pix_opencv_morphology.cc pix_opencv_distrans.cc pix_opencv_motempl.cc pix_opencv_haarcascade.cc pix_opencv_contours_boundingrect.cc pix_opencv_bgsubstract.cc pix_opencv_contours_convexity.cc pix_opencv_dft.cc pix_opencv_lk.cc pix_opencv_hist_compare.cc pix_opencv_knear.cc pix_opencv_threshold.cc pix_opencv_floodfill.cc pix_opencv_athreshold.cc pix_opencv_bgstats.cc pix_opencv_camshift.cc pix_opencv_hu_compare.cc pix_opencv_pgh_compare.cc pix_opencv_hough_circles.cc pix_opencv_hough_lines.cc pix_opencv_hu_moments.cc pix_opencv_contours_convexhull.cc pix_opencv_colorfilt.cc pix_opencv_of_bm.cc pix_opencv_of_hs.cc pix_opencv_of_lk.cc pix_opencv_calibration.cc pix_opencv_warpperspective.cc pix_opencv_findchessboardcorners.cc pix_opencv_contours.cpp pix_opencv_matchshape.cpp 
+SOURCES = pix_opencv_edge.cc pix_opencv_laplace.cc pix_opencv_morphology.cc pix_opencv_distrans.cc pix_opencv_motempl.cc pix_opencv_haarcascade.cc pix_opencv_contours_boundingrect.cc pix_opencv_bgsubstract.cc pix_opencv_contours_convexity.cc pix_opencv_dft.cc pix_opencv_lk.cc pix_opencv_hist_compare.cc pix_opencv_knear.cc pix_opencv_threshold.cc pix_opencv_floodfill.cc pix_opencv_athreshold.cc pix_opencv_bgstats.cc pix_opencv_camshift.cc pix_opencv_hu_compare.cc pix_opencv_pgh_compare.cc pix_opencv_hough_circles.cc pix_opencv_hough_lines.cc pix_opencv_hu_moments.cc pix_opencv_contours_convexhull.cc pix_opencv_colorfilt.cc pix_opencv_of_bm.cc pix_opencv_of_hs.cc pix_opencv_of_lk.cc pix_opencv_calibration.cc pix_opencv_warpperspective.cc pix_opencv_findchessboardcorners.cc pix_opencv_contours.cc pix_opencv_matchshape.cc
 
 all: $(SOURCES:.cc=.$(EXTENSION)) $(SOURCES_OPT:.cc=.$(EXTENSION)) blobtrack
 
@@ -39,7 +39,6 @@ all: $(SOURCES:.cc=.$(EXTENSION)) $(SOURCES_OPT:.cc=.$(EXTENSION)) blobtrack
 	gcc $(LDFLAGS) -o $*.$(EXTENSION) $*.o $(LIBS)
 
 .cc.o:
-	echo .cc.o target
 	g++ $(CPPFLAGS) $(INCLUDES) -o $*.o -c $*.cc
 
 .c.o:
diff --git a/pix_opencv_contours-help.pd b/pix_opencv_contours-help.pd
index 815165d..c845e1d 100644
--- a/pix_opencv_contours-help.pd
+++ b/pix_opencv_contours-help.pd
@@ -1,4 +1,4 @@
-#N canvas 699 401 836 479 10;
+#N canvas 804 301 836 479 10;
 #X obj 472 38 cnv 15 220 250 empty empty empty 20 12 0 14 -228992 -66577
 0;
 #X obj 11 56 cnv 15 450 100 empty empty empty 20 12 0 14 -233017 -66577
@@ -23,7 +23,7 @@ image \, simplifies it according to the epsilon value and outputs contours
 with area greater than area value on second outlet;
 #X obj 487 171 pix_gray;
 #X obj 487 141 pix_buf;
-#N canvas 870 278 919 782 drawcontours 0;
+#N canvas 868 284 919 782 drawcontours 0;
 #X obj 249 179 list split 2;
 #X obj 241 640 GEMglEnd;
 #X obj 371 637 GEMglVertex2d;
@@ -138,7 +138,7 @@ with area greater than area value on second outlet;
 #X connect 9 0 5 0;
 #X restore 575 331 pd color;
 #X obj 249 117 t a b;
-#X obj 500 425 GEMglLineWidth 2;
+#X obj 500 424 GEMglLineWidth 2;
 #X obj 500 394 scaleXYZ 1 1 1;
 #X obj 412 592 * 10.6666;
 #X obj 412 612 - 5.33333;
@@ -227,11 +227,11 @@ with area greater than area value on second outlet;
 #X connect 6 0 0 0;
 #X connect 7 0 0 0;
 #X restore 359 254 pd gemwin;
-#X msg 359 235 create;
+#X msg 359 235 destroy;
 #X text 355 214 Create window:;
 #X text 31 224 Inlet 1: binarized image;
 #X msg 625 141 2;
-#N canvas 1199 177 474 845 draw_rotrect 0;
+#N canvas 1197 183 474 845 draw_rotrect 0;
 #X obj 71 506 GEMglVertex2d;
 #X obj 71 586 GEMglVertex2d;
 #X obj 71 666 GEMglVertex2d;
@@ -243,7 +243,7 @@ with area greater than area value on second outlet;
 #X obj 177 198 list split 8;
 #X msg 363 324 0 0 0 0 0 0 0 0;
 #X obj 71 300 color 1 0 0 1;
-#N canvas 712 325 619 726 color 0;
+#N canvas 710 331 619 726 color 0;
 #X obj 201 -38 inlet;
 #X obj 158 66 f;
 #X msg 302 10 0;
@@ -370,7 +370,8 @@ with area greater than area value on second outlet;
 #X floatatom 342 463 5 0 0 0 - - -;
 #X obj 342 442 list length;
 #X obj 71 400 GEMglLineWidth 1;
-#X floatatom 145 261 5 0 0 0 - - -;
+#X obj 71 327 translateXYZ -5.3333 4 0;
+#X obj 71 361 scaleXYZ 10.6666 -8 0;
 #X connect 0 0 1 0;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
@@ -378,8 +379,9 @@ with area greater than area value on second outlet;
 #X connect 5 0 10 0;
 #X connect 6 1 8 0;
 #X connect 7 0 0 0;
+#X connect 8 0 20 0;
 #X connect 9 0 20 0;
-#X connect 10 0 36 0;
+#X connect 10 0 37 0;
 #X connect 11 0 10 1;
 #X connect 12 0 33 0;
 #X connect 13 0 5 0;
@@ -419,6 +421,8 @@ with area greater than area value on second outlet;
 #X connect 33 1 16 0;
 #X connect 35 0 34 0;
 #X connect 36 0 7 0;
+#X connect 37 0 38 0;
+#X connect 38 0 36 0;
 #X restore 673 315 pd draw_rotrect;
 #X text 31 353 <contour area> <rotrect corners coordinates (8 floats)>
 <rotrect center position (2 floats)> <rotrect size (2 floats)> <angle>
@@ -430,7 +434,7 @@ with area greater than area value on second outlet;
 #X text 31 403 <number of segments> <2> <x \, y corner coordinate pairs>
 ;
 #X obj 575 265 route contour;
-#X obj 673 265 route info;
+#X obj 672 265 route info;
 #X obj 487 240 pix_opencv_contours;
 #X text 26 302 Outlet 2: contour output;
 #X text 26 292 Outlet 1: gemlist output;
@@ -456,5 +460,6 @@ with area greater than area value on second outlet;
 #X connect 32 0 31 0;
 #X connect 35 0 22 0;
 #X connect 43 0 18 0;
+#X connect 44 0 36 0;
 #X connect 45 1 43 0;
 #X connect 45 2 44 0;