Commit Graph

95 Commits

Author SHA1 Message Date
Vadim Pisarevsky
49467947ac propagated some fixes from 2.3 to trunk 2011-06-23 12:00:09 +00:00
Ilya Lysenkov
77be493e45 Qt: fixed keyPressEvent (ticket #803) 2011-06-17 09:26:53 +00:00
Andrey Kamaev
206aa50f86 Added Android native camera module 2011-06-16 18:00:41 +00:00
Anatoly Baksheev
8f4c7db3f6 ~40 warnings under VS2008
HAVE_CONFIG_H -> HAVE_CVCONFIG_H
2011-06-11 17:24:09 +00:00
Andrey Kamaev
c7bdf83de5 Fixed Android build 2011-06-03 12:01:55 +00:00
Alexander Shishkov
c8f0147a8b fixed problem with static compilation of highgui_tests on Windows 2011-06-02 10:02:08 +00:00
Ethan Rublee
6c437cce36 Placed the if in the wrong place. 2011-06-01 18:54:34 +00:00
Ethan Rublee
7e2221f38f Fix misspelling of a logical block endif. 2011-06-01 18:28:20 +00:00
Ethan Rublee
14f65f79f0 Wrapping the tests in an if guard. Fails to build if the BUILD_TESTS flag is
not enabled.
2011-06-01 18:04:46 +00:00
Andrey Morozov
abfc5d3405 fixed bugs for windows. added 2 tests for ffmpeg 2011-06-01 16:14:17 +00:00
Vadim Pisarevsky
bf05872929 added opencv_test_highgui 2011-06-01 14:23:55 +00:00
Alexander Shishkov
6aabf72bc5 removed OPENCV_BUILD_SHARED_LIB in favor of BUILD_SHARED_LIBS 2011-05-31 13:17:59 +00:00
Ethan Rublee
76538fbe6b Making the install and lib, bin directories consistent. 2011-05-30 22:13:32 +00:00
Vadim Pisarevsky
9336b700ba use FindZLIB(), FindJPEG() etc. on MacOSX as well to avoid possible conflicts with MacPorts. 2011-05-27 13:47:18 +00:00
Anatoly Baksheev
69f28ef65c solution folder flag disabled by default 2011-05-17 09:40:06 +00:00
Anatoly Baksheev
c49dc37761 [+] added use_folders cmake feature if cmake version is greater then 2.8.0
[~] fixed warning in featuers2d under windows (can't generate assignment operator)
2011-05-11 13:37:20 +00:00
Andrey Kamaev
727fbd5376 Android cmake toolchain file is included into OpenCV 2011-05-03 08:13:50 +00:00
Andrey Kamaev
41f5e8e3d8 Fixed output paths for some libraries and executables.
Added option to force disable precompiled headers.
2011-04-30 10:42:33 +00:00
Vadim Pisarevsky
d67e612f10 fixed highgui build on Windows 2011-04-26 16:10:26 +00:00
Vadim Pisarevsky
6985540744 moved image codecs' headers to the respective subdirectories; allow the user to use system zlib. 2011-04-26 15:46:15 +00:00
Vadim Pisarevsky
35af5dacde do not define CVAPI_EXPORTS when OpenCV is built statically (thanks to Mika Fischer for the patch) 2011-04-26 13:07:05 +00:00
Vadim Pisarevsky
0cfcb48796 bugfix for highgui crash on Windows in debug mode (ticket #752) has been propagated from branch 2.2 to trunk 2011-04-26 12:09:27 +00:00
Nils Hasler
80da1d408b removed private copy of gstappsink because appsink is now part of gstreamer base. 2011-04-23 21:24:41 +00:00
Andrey Kamaev
68534d70f3 Merged android-experimental branch back to trunk. 2011-04-06 14:31:03 +00:00
Ethan Rublee
58cb6c268e adding cap_images.cpp to android build, may fix link error, but not really address issue of reading video files on android 2011-02-20 18:53:14 +00:00
Maria Dimashova
ed77955635 moved an include dirs setting to the root cmake file 2011-02-03 09:55:17 +00:00
Maria Dimashova
3a04d08bf7 added Kinect support (initial version without settings configuration yet) and sample on usage 2011-01-21 17:00:08 +00:00
Vadim Pisarevsky
e90f197beb merged fix for x64 MSVC compile errors in highgui into trunk 2010-12-27 12:01:38 +00:00
Vadim Pisarevsky
0de9c9fd3c opencv_zlib renamed back to zlib; make static libs work on Windows 2010-12-05 01:19:36 +00:00
Vadim Pisarevsky
8b4cb1d99c make OpenCVConfig.cmake usable in the case of static libs 2010-12-04 23:02:36 +00:00
Ethan Rublee
458931613c Making highgui build for android 2010-11-09 19:19:59 +00:00
Ethan Rublee
2f3f677ffe woops, broke cmake for a bit... 2010-09-22 03:36:45 +00:00
Ethan Rublee
8ee50c422b adding some small changes to support android build,
mainly cmake stuff, but in persistance the wcstombs
is not supported on android, and in
sift.cpp there was and ifdef that affected arm and this
causes undefined symbols on android.
2010-09-22 02:16:33 +00:00
Vadim Pisarevsky
758e826d2e do not use WIN64/_WIN64 anymore - CMake did not set it anyway. Use WIN32 + __x86_64 or _M_X64 instead. Also, make VideoInput optional (WITH_VIDEOINPUT=ON/OFF) => now Mingw-dw2 can build OpenCV 2010-07-16 22:38:57 +00:00
Yannick Verdie
ddc29e08be QT new functions:
- Add toolbar
 - Clean the code
 - Window properties in progress
2010-07-16 09:12:15 +00:00
Vadim Pisarevsky
fa91788222 disabled Qt by default (until the code is stabilized) 2010-07-12 15:29:31 +00:00
Vadim Pisarevsky
609ad4e409 adjust the path in the installed dynamic libraries on MacOSX via INSTALL_NAME_DIR. 2010-07-07 15:24:21 +00:00
Vadim Pisarevsky
576adb434d removed embedded (obsolete) OpenEXR files; repaired OpenEXR bindings 2010-07-04 12:32:31 +00:00
Yannick Verdie
4bcd81f85f New functions with QT GUI:
- aspectRatio is controled by cvSet/getWindowProperty
2010-06-26 22:36:41 +00:00
Yannick Verdie
397b31e437 New functions with QT GUI:
- fix CMake OpenGL compilation
2010-06-26 14:33:14 +00:00
Yannick Verdie
9eea2a5fe6 working on QT change/get win property (stylesheet for cvTrackBar fixed !!!) 2010-06-12 16:36:46 +00:00
Yannick Verdie
802d5f9940 working on QT change/get win property 2010-06-11 07:35:36 +00:00
Yannick Verdie
c6872100db Start integrating QT GUI (GoC 2010) 2010-06-07 08:29:10 +00:00
Vadim Pisarevsky
26b7ed6901 renamed gstappsink.hpp->gstappsink.h 2010-05-12 14:51:52 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00