mirror-github-bspeice/libcvautomation
1
0
Fork 0
mirror of https://github.com/bspeice/libcvautomation synced 2025-11-04 02:10:35 -05:00
Code Issues Releases Wiki Activity

Fix up the build process in preparation for release 1.0

Browse Source
This commit is contained in:
Bradlee Speice
2012-06-28 12:35:04 -04:00
parent 9dc1d24926
commit 45905d8454
12 changed files with 287 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libcvautomation/Makefile.am
View File

@ -1,4 +1,8 @@
AM_CFLAGS = -Wall -O2 -I$(top_srcdir)/include
if USEOPENCV2
AM_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include/opencv2
else
AM_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include/opencv1
endif
AM_LDFLAGS =
AM_LIBS = -shared
@ -8,4 +12,8 @@ libcvautomation_la_SOURCES = libcvautomation-opencv.c libcvautomation-opencv.h l
#libcvautomation_CFLAGS = -shared -I$(top_srcdir)/include -I$(top_srcdir)/libcvautomation -I$(top_srcdir)/include/libcvautomation
#Lists the headers to distribute
pkginclude_HEADERS = $(top_srcdir)/include/libcvautomation/libcvautomation.h $(top_srcdir)/include/libcvautomation/libcvautomation-opencv.h $(top_srcdir)/include/libcvautomation/libcvautomation-xlib.h $(top_srcdir)/include/libcvautomation/libcvautomation-xtest.h
if USEOPENCV2
pkginclude_HEADERS = $(top_srcdir)/include/opencv2/libcvautomation/libcvautomation.h $(top_srcdir)/include/opencv2/libcvautomation/libcvautomation-opencv.h $(top_srcdir)/include/opencv2/libcvautomation/libcvautomation-xlib.h $(top_srcdir)/include/opencv2/libcvautomation/libcvautomation-xtest.h
else
pkginclude_HEADERS = $(top_srcdir)/include/opencv1/libcvautomation/libcvautomation.h $(top_srcdir)/include/opencv1/libcvautomation/libcvautomation-opencv.h $(top_srcdir)/include/opencv1/libcvautomation/libcvautomation-xlib.h $(top_srcdir)/include/opencv1/libcvautomation/libcvautomation-xtest.h
endif

15
libcvautomation/libcvautomation-xtest.c
View File

@ -582,10 +582,7 @@ void xte_keyUp ( Display *displayLocation, char *key )
cvaPoint xte_commandString ( Display *displayLocation, char *commandString, int mouseButton, int searchMethod, int tolerance )
{
/* Alright, this function bears a bit of talking about.
* The way it works is that you give the **command two parameters:
* [0]: The command
* [1]: The command argument
* And what happens is that I test here for the command, and pass it off.
* What happens is that I test here for the command, and pass it off.
* This functionality was inspired by xte from xautomation,
* the original can be found at: http://hoopajoo.net/projects/xautomation.html
* Most of the code for parsing is the same, just easier to do it that way. */
@ -593,9 +590,13 @@ cvaPoint xte_commandString ( Display *displayLocation, char *commandString, int
/* Note that most of the functions don't need mouseButton, searchMethod, or tolerance,
* but they're here to make sure that they're available if needed. */
cvaPoint resultPoint;
resultPoint.x = -1;
resultPoint.y = -1;
/* Perform basic sanity checking */
if (commandString == NULL)
return;
return resultPoint;
/* And now we sanitize the input */
char *s_commandString;
@ -734,9 +735,5 @@ cvaPoint xte_commandString ( Display *displayLocation, char *commandString, int
free(keyString);
}
cvaPoint resultPoint;
resultPoint.x = -1;
resultPoint.y = -1;
return resultPoint;
}