passed everything to c++ for opencv 2.0

svn path=/trunk/externals/pdp_opencv/; revision=12584

1 files changed, 0 insertions, 242 deletions

diff --git a/pdp_opencv_hu_moments.c b/pdp_opencv_hu_moments.c
deleted file mode 100755
index b64a2f5..0000000
--- a/pdp_opencv_hu_moments.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- *   Pure Data Packet module.
- *   Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dirent.h>
-#include <limits.h>
-#include <dlfcn.h>
-#include <math.h>
-
-#include "pdp.h"
-
-#ifndef _EiC
-#include "cv.h"
-#endif
-
-#define MAX_MARKERS 100
-
-typedef struct pdp_opencv_hu_moments_struct
-{
-    t_object x_obj;
-    t_float x_f;
-
-    t_outlet *x_outlet0;
-    t_outlet *x_dataout;
-    t_atom    rlist[7];
-    int x_packet0;
-    int x_packet1;
-    int x_dropped;
-    int x_queue_id;
-
-    int x_width;
-    int x_height;
-    int x_size;
-
-    int x_binary;
-
-    IplImage *image, *gray;
-    CvMoments x_moments;
-    CvHuMoments x_humoments;
-
-} t_pdp_opencv_hu_moments;
-
-static void pdp_opencv_hu_moments_process_rgb(t_pdp_opencv_hu_moments *x)
-{
-    t_pdp     *header = pdp_packet_header(x->x_packet0);
-    short int *data   = (short int *)pdp_packet_data(x->x_packet0);
-    t_pdp     *newheader = pdp_packet_header(x->x_packet1);
-    short int *newdata = (short int *)pdp_packet_data(x->x_packet1); 
-    char tindex[4];
-    int i = 0;                   // Indicator of cycles.
-    int im = 0;                  // Indicator of markers.
-
-    if ((x->x_width != (t_int)header->info.image.width) || 
-        (x->x_height != (t_int)header->info.image.height)) 
-    {
-
-    	post("pdp_opencv_hu_moments :: resizing");
-
-    	x->x_width = header->info.image.width;
-    	x->x_height = header->info.image.height;
-    	x->x_size = x->x_width*x->x_height;
-    
-    	//Destroy cv_images
-	cvReleaseImage(&x->image);
-    	cvReleaseImage(&x->gray);
-    
-	//create the orig image with new size
-        x->image = cvCreateImage(cvSize(x->x_width,x->x_height), IPL_DEPTH_8U, 3);
-    	x->gray = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 1);
-    
-    }
-    
-    newheader->info.image.encoding = header->info.image.encoding;
-    newheader->info.image.width = x->x_width;
-    newheader->info.image.height = x->x_height;
-
-    memcpy( x->image->imageData, data, x->x_size*3 );
-    
-    // Convert to grayscale
-    cvCvtColor(x->image, x->gray, CV_BGR2GRAY);
-
-    cvMoments( x->gray, &x->x_moments, x->x_binary );
-    cvGetHuMoments( &x->x_moments, &x->x_humoments );
-
-    SETFLOAT(&x->rlist[0], x->x_humoments.hu1);
-    SETFLOAT(&x->rlist[1], x->x_humoments.hu2);
-    SETFLOAT(&x->rlist[2], x->x_humoments.hu3);
-    SETFLOAT(&x->rlist[3], x->x_humoments.hu4);
-    SETFLOAT(&x->rlist[4], x->x_humoments.hu5);
-    SETFLOAT(&x->rlist[5], x->x_humoments.hu6);
-    SETFLOAT(&x->rlist[6], x->x_humoments.hu7);
-
-    outlet_list( x->x_dataout, 0, 7, x->rlist );
-
-    memcpy( newdata, x->image->imageData, x->x_size*3 );
- 
-    return;
-}
-
-static void pdp_opencv_hu_moments_sendpacket(t_pdp_opencv_hu_moments *x)
-{
-    /* release the packet */
-    pdp_packet_mark_unused(x->x_packet0);
-    x->x_packet0 = -1;
-
-    /* unregister and propagate if valid dest packet */
-    pdp_packet_pass_if_valid(x->x_outlet0, &x->x_packet1);
-}
-
-static void pdp_opencv_hu_moments_process(t_pdp_opencv_hu_moments *x)
-{
-   int encoding;
-   t_pdp *header = 0;
-   char *parname;
-   unsigned pi;
-   int partype;
-   float pardefault;
-   t_atom plist[2];
-   t_atom tlist[2];
-   t_atom vlist[2];
-
-   /* check if image data packets are compatible */
-   if ( (header = pdp_packet_header(x->x_packet0))
-	&& (PDP_BITMAP == header->type)){
-    
-	/* pdp_opencv_hu_moments_process inputs and write into active inlet */
-	switch(pdp_packet_header(x->x_packet0)->info.image.encoding){
-
-	case PDP_BITMAP_RGB:
-            x->x_packet1 = pdp_packet_clone_rw(x->x_packet0);
-            pdp_queue_add(x, pdp_opencv_hu_moments_process_rgb, pdp_opencv_hu_moments_sendpacket, &x->x_queue_id);
-	    break;
-
-	default:
-	    /* don't know the type, so dont pdp_opencv_hu_moments_process */
-	    break;
-	    
-	}
-    }
-
-}
-
-static void pdp_opencv_hu_moments_input_0(t_pdp_opencv_hu_moments *x, t_symbol *s, t_floatarg f)
-{
-    /* if this is a register_ro message or register_rw message, register with packet factory */
-
-    if (s == gensym("register_rw")) 
-       x->x_dropped = pdp_packet_convert_ro_or_drop(&x->x_packet0, (int)f, pdp_gensym("bitmap/rgb/*") );
-
-    if ((s == gensym("process")) && (-1 != x->x_packet0) && (!x->x_dropped))
-    {
-        /* add the process method and callback to the process queue */
-        pdp_opencv_hu_moments_process(x);
-    }
-}
-
-static void pdp_opencv_hu_moments_free(t_pdp_opencv_hu_moments *x)
-{
-  int i;
-
-    pdp_queue_finish(x->x_queue_id);
-    pdp_packet_mark_unused(x->x_packet0);
-    
-    //Destroy cv_images
-    cvReleaseImage(&x->image);
-    cvReleaseImage(&x->gray);
-}
-
-t_class *pdp_opencv_hu_moments_class;
-
-
-void *pdp_opencv_hu_moments_new(t_floatarg f)
-{
-    int i;
-
-    t_pdp_opencv_hu_moments *x = (t_pdp_opencv_hu_moments *)pd_new(pdp_opencv_hu_moments_class);
-
-    x->x_outlet0 = outlet_new(&x->x_obj, &s_anything); 
-    x->x_dataout = outlet_new(&x->x_obj, &s_anything); 
-
-    x->x_packet0 = -1;
-    x->x_packet1 = -1;
-    x->x_queue_id = -1;
-
-    x->x_width  = 320;
-    x->x_height = 240;
-    x->x_size   = x->x_width * x->x_height;
-
-    x->x_binary = 0;
-
-    x->image = cvCreateImage(cvSize(x->x_width,x->x_height), IPL_DEPTH_8U, 3);
-    x->gray = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 1);
-
-    //contours = 0;
-    return (void *)x;
-}
-
-static void pdp_opencv_hu_moments_binary(t_pdp_opencv_hu_moments *x, t_floatarg f)
-{
-    if ( ((int)f==1) || ((int)f==0) ) x->x_binary = (int)f;
-}
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
-void pdp_opencv_hu_moments_setup(void)
-{
-
-    post( "		pdp_opencv_hu_moments");
-    pdp_opencv_hu_moments_class = class_new(gensym("pdp_opencv_hu_moments"), (t_newmethod)pdp_opencv_hu_moments_new,
-    	(t_method)pdp_opencv_hu_moments_free, sizeof(t_pdp_opencv_hu_moments), 0, A_DEFFLOAT, A_NULL);
-
-    class_addmethod(pdp_opencv_hu_moments_class, (t_method)pdp_opencv_hu_moments_input_0, gensym("pdp"), A_SYMBOL, A_DEFFLOAT, A_NULL);
-    class_addmethod(pdp_opencv_hu_moments_class, (t_method)pdp_opencv_hu_moments_binary, gensym("binary"), A_DEFFLOAT, A_NULL);
-
-}
-
-#ifdef __cplusplus
-}
-#endif