mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-16 02:19:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,768 Commits 6 Branches 127 Tags 3 GiB
8ba70194b1
Commit Graph

212 Commits

Author SHA1 Message Date
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up 
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
 2013-03-13 17:26:56 +04:00
Andrey Kamaev
fb76095378 Merge pull request #610 from AoD314:webp2 2013-03-11 21:13:36 +04:00
AoD314
63d9ee9523 This code is based on https://github.com/prasannatsm/opencv code. 
- added webp (lossy and lossless without alpha channel)
- added tests
 2013-03-11 11:51:38 +04:00
Andrey Kamaev
9e12b7c3c2 Merge release 2.4.4 2013-03-04 19:43:49 +04:00
Vladislav Vinogradov
df456245e7 fixed ffmpeg destination folder for NMake generator 2013-02-28 10:16:41 +04:00
Alexander Smorkalov
75191e8f2f Smartek Giganetix Cameras support (Patch #2192) integrated to master. 2013-02-01 16:54:00 +04:00
Andrey Kamaev
7572b4d400 Merge branch '2.4' 2013-01-30 15:12:50 +04:00
Andrey Kamaev
86b4b30a6d Merge pull request #358 from taka-no-me:objc_exceptions 2013-01-30 14:40:32 +04:00
Andrey Kamaev
0b1fe53a46 Add -fobjc-exceptions flag to ObjectiveC sources if supported (bug #2657) 2013-01-29 17:09:23 +04:00
Patrick Welche
d90b8d615c NetBSD video(4) support, patch 1 of 3 
The video(4) driver provides a Video4Linux2 compatible API for
various video peripherals. This patch propagates HAVE_VIDEOIO if
the sys/videoio.h include file is found, which is the signature of
video(4).
 2013-01-28 17:11:36 +04:00
Andrey Kamaev
ae5649d3f7 Drop unsupported imageio from grfmt 2012-12-03 09:56:09 +04:00
Andrey Kamaev
00fbf58902 Revert incompletely applied patch from #2192 
This reverts commit 2e7656dbdf.
 2012-12-03 09:55:53 +04:00
Evgeny Talanin
2e7656dbdf #2192 patch apply 2012-10-12 13:03:43 +04:00
Andrey Kamaev
354b77e2e1 Applied fix from bug #2324: ocv_list_unique makes for incorrect linking 2012-10-10 19:40:55 +04:00
Andrey Kamaev
cabddaeb4f Revert "Issue #2035 Calling cv::namedWindow crashes on Android fixed." 
This reverts commit 36135fc59d.
 2012-10-10 13:24:49 +04:00
Alexander Smorkalov
36135fc59d Issue #2035 Calling cv::namedWindow crashes on Android fixed. 
Window-related functions is guarded from calls from application code.
Old implementations with "no-gui" exception are stell compiled and linked to OpenCV library for binary compatibility.
 2012-10-10 12:40:36 +04:00
Andrey Kamaev
867777f825 Added OpenEXR library v1.7.1 2012-09-02 20:44:04 +04:00
Sergiu Dotenco
85eae7b30d win32: always link to vfw32 2012-08-30 14:52:39 +02:00
Vadim Pisarevsky
a6e2acbfee added a few missing images for tutorials; integrated pull request #26 2012-08-30 16:23:18 +04:00
Vadim Pisarevsky
8efb84b5a4 added ios camera support in highgui. turned on optimization in opencv2.framework (ticket #2232) 2012-08-20 19:36:36 +04:00
Vadim Pisarevsky
82cb2ab556 fixed bug in SVD, ticket #2027; fixed building highgui with ffmpeg support on MacOSX 2012-06-28 19:45:13 +00:00
Andrey Kamaev
69b5972e03 Fixed MSVC build with Qt enabled #2096 2012-06-26 21:05:15 +00:00
Andrey Kamaev
55567582a6 added XIMEA support for linux (by Igor Kuzmin) #2085 2012-06-26 11:48:58 +00:00
Andrey Kamaev
827d7ba2e9 fixed highgui configuration with QT enabled 2012-06-13 11:49:27 +00:00
Andrey Kamaev
694f0e954f Added linking against AppKit framework when OpenCV is configured with WITH_QUICKTIME=OFF 2012-06-13 10:43:03 +00:00
Andrey Kamaev
c5aba337e9 Fixed number of warnings. Fixed mingw64 build. 2012-06-12 14:46:12 +00:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Andrey Kamaev
79df8db76f Fixed recently introduced build problems on some platforms 2012-06-08 06:19:17 +00:00
Andrey Kamaev
f62028dc16 Fixed mingw build. 2012-06-08 03:15:08 +00:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Andrey Kamaev
e161f428a0 Fixed PvAPI search on Windows #1927 2012-05-24 20:10:13 +00:00
Vadim Pisarevsky
fd68cc768a fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876) 2012-05-21 14:56:07 +00:00
Andrey Kamaev
ac8f61ee91 Fixed Linux build 2012-05-21 08:53:38 +00:00
Andrey Kamaev
decd6c0fab Restored QuartzCore framework for OS X 2012-05-20 19:05:36 +00:00
Andrey Kamaev
0716ebb7a6 Refactored highgui libraries search (tested on Windows only) 2012-05-20 18:49:57 +00:00
Andrey Kamaev
8d135e8ea1 Shortened CMake script for opencv_world. Fixed opencv_world link with non-Visual Studio generators on Windows. 2012-05-13 09:34:33 +00:00
Vadim Pisarevsky
6dde56faf4 fixed building opencv_world with VS2010 2012-05-12 16:27:40 +00:00
Vadim Pisarevsky
9bbcebd6b0 added opencv_world module that combines all the other [selected by user] OpenCV modules, except for opencv_python and opencv_gpu. 2012-05-12 13:54:26 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
3228599a35 fixed some more GCC warnings 2012-03-19 11:21:01 +00:00
Alexander Reshetnikov
e0b772a392 Added a first version of new ffmpeg wrapper 2012-03-12 17:07:54 +00:00
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Andrey Kamaev
8141a5026c Refactored cmake for 3rdparty libs 2012-02-24 13:53:22 +00:00
Andrey Kamaev
a8f0c93379 Modified zlib search. Use system zlib on Android by default 2012-02-24 12:23:34 +00:00
Andrey Kamaev
691d392312 Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005. 2012-02-16 20:29:35 +00:00
Alexander Reshetnikov
edc9d4f951 fixed compiling error under Windows; updated test_video_io.cpp 2012-02-13 12:41:27 +00:00
Andrey Kamaev
68a54e7f3c Fixed incorrectly merged patch. 2012-02-09 20:22:36 +00:00
Leonid Beynenson
3ef5bfa185 Applied the patch, received from akamaev. Also made some changes in CMake files to fix Android camera issue. 2012-02-09 15:02:21 +00:00
Andrey Kamaev
aa9735f9b5 Fixed mingw build 2012-02-06 13:29:48 +00:00
Andrey Kamaev
eac055a27e Fixed ticket #1580 2012-02-04 18:57:41 +00:00
Andrey Kamaev
984eb99428 Global CMake reorganization: 
[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
 2012-02-03 11:26:49 +00:00
Ethan Rublee
b254358d35 highgui headers were not being installed... 2012-01-30 19:07:14 +00:00
Andrey Kamaev
82ae0b2c0c Attempt to fix build on Mac OS X 2012-01-25 10:58:55 +00:00
Andrey Kamaev
9d5c24cdc8 Updating opencv module definition in cmake (continued) 2012-01-25 09:04:49 +00:00
Andrey Kamaev
13f4e70e95 Updating opencv module definition in cmake 2012-01-24 16:55:47 +00:00
Andrey Kamaev
5cce038958 Performance testing branch is merged back into trunk 2011-09-06 15:30:28 +00:00
Artem Myagkov
3a3bc18381 modified capturing building ligic for iOS 2011-08-24 10:53:57 +00:00
Artem Myagkov
8c6782300a modified highgui and ts modules and cmakelists for ios cross-compiling, added ios toolchains, added ios build tutorial 2011-08-23 11:19:58 +00:00
Vadim Pisarevsky
d1588c0439 added support for Ximea cameras (missing parts in the prev. commit) 2011-08-11 18:06:09 +00:00
Andrey Kamaev
3aea74d408 Fixed precompiled headers support (fixed formatting, fixed dependencies generation) 2011-07-24 19:22:58 +00:00
Vadim Pisarevsky
b33224f0b6 merged the latest fixes in 2.3 to trunk 2011-07-04 16:18:12 +00:00
Andrey Kamaev
730622178b Turned off android camera and java wrappers for low Android API levels (android-8 is required for these components) 2011-07-04 11:41:39 +00:00
Andrey Kamaev
68f5a5a904 Reverted change from r5802 (it breaks install target for Android platform) 2011-07-01 06:58:53 +00:00
Ethan Rublee
08d3dcc709 minor edits to cmake. 2011-07-01 00:57:00 +00:00
Ethan Rublee
6259c9ac6a First pass at name mangling based on version number, to support 
side by side installs of OpenCV2.3.0 OpenCV2.3.1 OpenCV2.4.x, etc...
 2011-06-28 16:02:09 +00:00
Andrey Kamaev
c1940b4ec7 Modified install layout for Android 2011-06-24 15:40:27 +00:00
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