Permalink
Browse files

Lower OpenCV dependency from >= 2.3 to >= 2.1

  • Loading branch information...
1 parent 1fdfc05 commit f9ce442ee95819db8505d7f417299681362a214e @codebrainz committed Nov 23, 2011
Showing with 7 additions and 7 deletions.
  1. +2 −2 README
  2. +1 −1 configure.ac
  3. +4 −4 src/main.c
View
4 README
@@ -37,12 +37,12 @@ For systems where Autotools is supported, simply use:
For Windows, install Mingw and OpenCV and make sure their `bin`
directories are the PATH environment variable. Then edit the first
variable in `win32/makefile.win32` to point to the installation prefix
-for you OpenCV installation. After, change into the `win32` directory
+for your OpenCV installation. After, change into the `win32` directory
and run `mingw32-make -f makefile.win32`. If everything went properly
there should be a `digimag.exe` file in that directory.
Dependencies
------------
-OpenCV 2.3 is used to grab frames from the webcam and process them. It
+OpenCV 2.1 is used to grab frames from the webcam and process them. It
can be optained from: http://opencv.willowgarage.com
View
@@ -9,7 +9,7 @@ AC_PROG_CC
AC_CHECK_HEADERS(ctype.h errno.h libgen.h stdio.h string.h sys/stat.h)
-PKG_CHECK_MODULES([OPENCV], [opencv >= 2.3])
+PKG_CHECK_MODULES([OPENCV], [opencv >= 2.1])
AC_CONFIG_FILES([
Makefile
View
@@ -152,11 +152,11 @@ int main(int argc, char *argv[])
open_device(conf);
#ifndef HAVE_WINDOWS
- cvNamedWindow(conf->title, CV_WINDOW_NORMAL | CV_WINDOW_KEEPRATIO);
+ cvNamedWindow(conf->title, CV_WINDOW_NORMAL);
#else
- /* Windows doesn't support fullscreen and doesn't keep aspect ration
- * even with CV_WINDOW_KEEPRATIO. */
- cvNamedWindow(conf->title, CV_WINDOW_AUTOSIZE | CV_WINDOW_KEEPRATIO);
+ /* Windows doesn't support fullscreen and doesn't maintain aspect
+ * ratio. */
+ cvNamedWindow(conf->title, CV_WINDOW_AUTOSIZE);
#endif
cvSetMouseCallback(conf->title, on_mouse_callback, conf);

0 comments on commit f9ce442

Please sign in to comment.