mirror-github-bspeice/libcvautomation
1
0
Fork 0
mirror of https://github.com/bspeice/libcvautomation synced 2025-06-07 07:41:30 -04:00
Code Issues Releases Wiki Activity

Merge 45eaa4e580 into 78893bc975

Browse Source
This commit is contained in:
Richel Bilderbeek 2013-07-10 09:13:03 -07:00
commit 2eff07772f
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
.gitignore vendored
View File

@ -1,2 +1,49 @@
*.swp *.swp
html/ html/
Makefile
Makefile.in
aclocal.m4
autom4te.cache/
config.guess
config.log
config.status
config.sub
configure
debian/changelog
debian/copyright
depcomp
docs/Doxyfile_example
docs/Doxyfile_library
docs/Makefile
docs/Makefile.in
docs/doxyfile.stamp
docs/man/
examples/.deps/
examples/.libs/
examples/Makefile
examples/Makefile.in
examples/cva-input
examples/cva-input.o
examples/cva-match
examples/cva-match.o
include/libcvautomation/libcvautomation.h
install-sh
libcvautomation.pc
libcvautomation/.deps/
libcvautomation/.libs/
libcvautomation/Makefile
libcvautomation/Makefile.in
libcvautomation/libcvautomation.la
libcvautomation/libcvautomation_la-libcvautomation-opencv.lo
libcvautomation/libcvautomation_la-libcvautomation-opencv.o
libcvautomation/libcvautomation_la-libcvautomation-xlib.lo
libcvautomation/libcvautomation_la-libcvautomation-xlib.o
libcvautomation/libcvautomation_la-libcvautomation-xtest.lo
libcvautomation/libcvautomation_la-libcvautomation-xtest.o
libtool
ltmain.sh
missing
py-compile
python/Makefile.in
rpm/libcvautomation.spec

4
libcvautomation/libcvautomation-xlib.c
View File

@ -93,7 +93,7 @@ cvaPoint matchSubImage_X11( Display *displayLocation, IplImage *subImage, int se
X_IPL = cvCreateImage( imageSize, IPL_DEPTH_8U, 3 ); /* 3 channels - RGB */ X_IPL = cvCreateImage( imageSize, IPL_DEPTH_8U, 3 ); /* 3 channels - RGB */
/* This if block converts the X root window to an IPL image. See you on the other side! */ /* This if block converts the X root window to an IPL image. See you on the other side! */
unsigned int x, y; /* To be used later */ int x, y; /* To be used later */
if ( screen->depths->depth == 24 ) if ( screen->depths->depth == 24 )
{ {
@ -284,7 +284,7 @@ cvaPoint matchSubImage_X11_center( Display *displayLocation, IplImage *subImage,
X_IPL = cvCreateImage( imageSize, IPL_DEPTH_8U, 3 ); /* 3 channels - RGB */ X_IPL = cvCreateImage( imageSize, IPL_DEPTH_8U, 3 ); /* 3 channels - RGB */
/* This if block converts the X root window to an IPL image. See you on the other side! */ /* This if block converts the X root window to an IPL image. See you on the other side! */
unsigned int x, y; /* To be used later */ int x, y; /* To be used later */
if ( screen->depths->depth == 24 ) if ( screen->depths->depth == 24 )
{ {