CVAM: Include the new libcvautomation.h

Fix up the libcvautomation-x11.h file

src/cva-match.c

@@ -21,7 +21,7 @@
 #include <getopt.h>
 #include <limits.h>
 
-#include "libcvautomation-opencv.h"
+#include "libcvautomation.h"
 
 #include "cva-match.h"
 

src/libcvautomation-x11.h

@@ -33,7 +33,7 @@
  *  CV_TM_CCOEFF_NORMED
  */
 
-cvPoint matchSubImage_X11(IplImage); /* Match a sub image using the X11 root window as root */
+CvPoint matchSubImage_X11( IplImage *subImage, int searchMethod, int threshold ); /* Match a sub image using the X11 root window as root */
-cvPoint matchSubImage_X11(char *, int=CV_TM_SQDIFF ); /* Match a sub image using X11 as root, from filename */
+CvPoint matchSubImage_X11_location( char *rootImage_location, int search_method, int threshold ); /* Match a sub image using X11 as root, from filename */
 
 #endif /* LIBCVAUTOMATION_X11_H */

src/libcvautomation.h

@@ -0,0 +1,24 @@
+/*
+ * =====================================================================================
+ *
+ *       Filename:  libcvautomation.h
+ *
+ *    Description:  Include wrapper for libcvautomation subsections
+ *
+ *        Version:  1.0
+ *        Created:  06/21/2012 12:20:43 PM
+ *       Revision:  none
+ *       Compiler:  gcc
+ *
+ *         Author:  Bradlee Speice (), bspeice.nc@gmail.com
+ *   Organization:  
+ *
+ * =====================================================================================
+ */
+#ifndef LIBCVAUTOMATION_H
+#define LIBCVAUTOMATION_H
+
+#include "libcvautomation-opencv.h"
+#include "libcvautomation-x11.h"
+
+#endif /* LIBCVAUTOMATION_H */