aboutsummaryrefslogtreecommitdiff
path: root/pdp_opencv_morphology.c
diff options
context:
space:
mode:
authorN.N. <sevyves@users.sourceforge.net>2009-06-01 19:32:26 +0000
committerN.N. <sevyves@users.sourceforge.net>2009-06-01 19:32:26 +0000
commit9ba3548adf6df82ce6569949e33983c97ecaa098 (patch)
tree3cc9ec3a168318e87a874cba92eca0d090059c04 /pdp_opencv_morphology.c
parentc320c52c57d9d40d04b9a5ae46e954104348c152 (diff)
fixed help patches
svn path=/trunk/externals/pdp_opencv/; revision=11611
Diffstat (limited to 'pdp_opencv_morphology.c')
-rw-r--r--pdp_opencv_morphology.c26
1 files changed, 6 insertions, 20 deletions
diff --git a/pdp_opencv_morphology.c b/pdp_opencv_morphology.c
index c86a95a..6e4b9bc 100644
--- a/pdp_opencv_morphology.c
+++ b/pdp_opencv_morphology.c
@@ -31,8 +31,6 @@
#include "cv.h"
#endif
-
-
typedef struct pdp_opencv_morphology_struct
{
t_object x_obj;
@@ -59,14 +57,10 @@ typedef struct pdp_opencv_morphology_struct
IplImage* dst;
IplConvKernel* element;
-
-
} t_pdp_opencv_morphology;
-
-
// callback function for open/close trackbar
void pdp_opencv_morphology_OpenClose(t_pdp_opencv_morphology *x, int pos)
{
@@ -84,7 +78,6 @@ void pdp_opencv_morphology_OpenClose(t_pdp_opencv_morphology *x, int pos)
cvErode(x->dst,x->dst,x->element,1);
}
cvReleaseStructuringElement(&x->element);
- //cvShowImage("Open/Close",dst);
}
// callback function for erode/dilate trackbar
@@ -102,7 +95,6 @@ void pdp_opencv_morphology_ErodeDilate(t_pdp_opencv_morphology *x, int pos)
cvDilate(x->src,x->dst,x->element,1);
}
cvReleaseStructuringElement(&x->element);
- //cvShowImage("Erode/Dilate",dst);
}
@@ -146,12 +138,10 @@ static void pdp_opencv_morphology_process_rgb(t_pdp_opencv_morphology *x)
// FEM UNA COPIA DEL PACKET A x->grey->imageData ... http://www.cs.iit.edu/~agam/cs512/lect-notes/opencv-intro/opencv-intro.html aqui veiem la estructura de IplImage
memcpy( x->src->imageData, data, x->x_size*3 );
- if (x->mode==1) pdp_opencv_morphology_OpenClose(x,x->pos);
- else pdp_opencv_morphology_ErodeDilate(x,x->pos);
-
+ if (x->mode==1) pdp_opencv_morphology_OpenClose(x,x->pos);
+ else pdp_opencv_morphology_ErodeDilate(x,x->pos);
memcpy( newdata, x->dst->imageData, x->x_size*3 );
-
return;
}
@@ -178,7 +168,7 @@ static void pdp_opencv_morphology_mode(t_pdp_opencv_morphology *x, t_floatarg f)
static void pdp_opencv_morphology_pos(t_pdp_opencv_morphology *x, t_floatarg f)
{
- x->pos = (int)f;
+ x->pos = (int)f;
}
static void pdp_opencv_morphology_sendpacket(t_pdp_opencv_morphology *x)
@@ -244,16 +234,14 @@ static void pdp_opencv_morphology_free(t_pdp_opencv_morphology *x)
pdp_queue_finish(x->x_queue_id);
pdp_packet_mark_unused(x->x_packet0);
- //cv_freeplugins(x);
- //Destroy cv_images
- cvReleaseImage( &x->src );
- cvReleaseImage( &x->dst );
+ //Destroy cv_images
+ cvReleaseImage( &x->src );
+ cvReleaseImage( &x->dst );
}
t_class *pdp_opencv_morphology_class;
-
void *pdp_opencv_morphology_new(t_floatarg f)
{
int i;
@@ -278,12 +266,10 @@ void *pdp_opencv_morphology_new(t_floatarg f)
x->mode = 0;
x->element = 0;
-
x->src = cvCreateImage( cvSize(x->x_width,x->x_height), 8, 3 );
x->dst = cvCloneImage(x->src);
-
return (void *)x;
}