mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-21 05:28:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
23,331 Commits 6 Branches 127 Tags 3 GiB
e805a55a5b
Commit Graph

689 Commits

Author SHA1 Message Date
Andrey Kamaev
13b6a3a15e Merge branch 2.4 2012-12-24 17:10:07 +04:00
marina.kolpakova
3882bbbf35 improve carma build 
- exclude system paths from library search paths
 - remove hardcoded paths to compiler
 - enable compiling with 3d-parties
 - enable build as shared libraries
 2012-12-24 14:54:57 +04:00
Vladislav Vinogradov
5138b7d209 Merge branch 'master' into cuda-dev 2012-12-24 13:48:33 +04:00
Andrey Kamaev
d6d1d20816 Show STL type in CMake status report 2012-12-22 22:52:27 +04:00
Andrey Kamaev
962884cdec Merge branch 2.4 2012-12-21 17:58:48 +04:00
Vladislav Vinogradov
2f1ca1b6b3 fixed build for CARMA: 
* added CMake toolchain file
* added WITH_NVCUVID flag
 2012-12-21 13:45:50 +04:00
Alexander Smorkalov
1555922228 OpenCV for Android SDK installation improved; 
ReadMe.txt for OpenCV Manager added;
share folder excluded from SDK.
 2012-12-19 17:28:46 +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
Alexander Smorkalov
5b148083fe Libinfo build fix; 
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
 2012-11-20 17:39:45 +04:00
Andrey Kamaev
0938358002 Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix 2012-11-13 19:47:16 +04:00
Alexander Smorkalov
dda2eb0f76 Libinfo build fix; 
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
 2012-11-12 12:57:09 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
Andrey Kamaev
4a2f626d85 Remove "-rc" suffix from version 2012-11-02 14:27:34 +04:00
Alexander Smorkalov
fc085d9dbd info library for OpenCV added. 2012-10-31 20:48:37 +04:00
Alexander Smorkalov
da31e12fed CMake for OpenCV Manager updated; 
Some repo normalization problems fixed;
Deprecated cmake keys removed;
Warning fixed.
 2012-10-31 11:47:27 +04:00
Andrey Kamaev
6f08d03322 Advance version number to 2.4.3-rc 2012-10-23 17:59:59 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
7225f89ea2 Revert opencv_videostab to the state of 2.4.2 2012-10-17 02:09:43 +04:00
Evgeny Talanin
2e7656dbdf #2192 patch apply 2012-10-12 13:03:43 +04:00
Anatoly Baksheev
1d68850cb2 Added CUDA fast math flag 2012-10-10 22:16:51 +04:00
Vadim Pisarevsky
e625d86485 added C= support; modified threading logic in threshold 2012-10-10 15:36:32 +04:00
Andrey Pavlenko
3c4917555d fixing git commit getting for Android build 2012-09-17 17:08:48 +04:00
Andrey Kamaev
f32eb05ea1 Fix AVX and other SIMD support detection 2012-09-17 13:30:28 +04:00
Andrey Kamaev
fe0d07ae53 Add experimental support for desktop Java 
Based on pull request #31 (thanks to Eric Christiansen)
Support for Java is turned off by default and can be enabled setting
BUILD_opencv_java to ON (e.g. cmake -DBUILD_opencv_java=ON ..)
 2012-09-17 13:21:20 +04:00
Andrey Kamaev
ece71d6a06 Remove misused REQUIRED keyword from CMake scripts 2012-09-17 13:21:20 +04:00
Andrey Kamaev
867777f825 Added OpenEXR library v1.7.1 2012-09-02 20:44:04 +04:00
Vadim Pisarevsky
a6e2acbfee added a few missing images for tutorials; integrated pull request #26 2012-08-30 16:23:18 +04:00
Anatoly Baksheev
0ba01afd83 added GPU bilateral filter + tests 
added GPU non local means brute force filter + tests
 2012-08-29 19:20:32 +04:00
Andrey Kamaev
bcf8dd510f Added CCache support to Android build 
To speed up rebuilds, define the NDK_CCACHE environment or CMake variable
to the path to your ccache binary. When declared, the android.cmake.toolchain
automatically uses CCache when compiling any C/C++ source file. For example:

export NDK_CCACHE=ccache
 2012-08-27 18:22:00 +04:00
Anatoly Baksheev
d3f4c9b2dc Fixed bug in BP_GPU 2012-08-24 18:38:54 +04:00
Anatoly Baksheev
290030d030 possibility to enable /mp compiler flag from cmake 
fixed MCVC warnings
 2012-08-23 16:53:53 +04:00
Andrey Kamaev
f2a02feffa Fix Windows build issues 
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
 2012-08-22 11:21:09 +04:00
Vadim Pisarevsky
2f1cc018c9 enabled SSE3 by default; integrated SSE3-optimized bilateral filter (by Grigoriy Frolov); modified API of non-local means (use Input/OutputArrays) 2012-08-21 17:39:40 +04:00
Sergiu Dotenco
ddc7bd7659 fixed compilation errors caused by std::tuple 2012-08-19 15:30:41 +02:00
Andrey Kamaev
bd33e166d0 Use git hash instead of svn version in cmake status report 2012-08-07 14:30:36 +04:00
yao
c03ac12fcd Add dft and gemm to ocl module, using AMD's clAmdFft and clAmdBlas libraries 2012-08-07 16:33:46 +08:00
Vadim Pisarevsky
9f4efab40a merged ocl module from ocl branch (it's not quite usable yet; at least on Mac) 2012-07-16 17:08:14 +00:00
Andrey Kamaev
6a13c9efc0 Added cmake for building Android package 2012-06-28 13:42:08 +00:00
Andrey Kamaev
15e50420bc Fixed linux and android install 2012-06-27 13:52:29 +00:00
Andrey Kamaev
a323da6fd5 Fixed some warnings and install problems on linux 2012-06-27 12:02:31 +00:00
Andrey Pavlenko
3804ca3e20 changing package layout after 'make install' for Android build 2012-06-27 06:22:26 +00:00
Andrey Kamaev
55567582a6 added XIMEA support for linux (by Igor Kuzmin) #2085 2012-06-26 11:48:58 +00:00
Andrey Kamaev
a142a3b78a Fixed Android Manager build 2012-06-26 08:48:45 +00:00
Andrey Pavlenko
2984fa751e adding OpenCV Manager 2012-06-21 14:50:05 +00:00
Andrey Kamaev
37212f5e00 Fixing compiler flags checks. 2012-06-12 15:14:28 +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
5b2db8e75b Dragonfly BSD build fix #2010 (thanks to Thomas Klausner) 2012-06-04 06:19:56 +00:00
Andrey Kamaev
ca6d2fe76b Moved 3rd-party libraries detection to separate cmake files 2012-05-25 13:12:02 +00:00
Andrey Kamaev
e161f428a0 Fixed PvAPI search on Windows #1927 2012-05-24 20:10:13 +00:00
Andrey Kamaev
0716ebb7a6 Refactored highgui libraries search (tested on Windows only) 2012-05-20 18:49:57 +00:00
Andrey Kamaev
094c32ced7 Refactored CMake status report for video IO libs 2012-05-19 13:48:36 +00:00
Andrey Kamaev
d069c062a6 Added Windows paths support to Eigen search. 2012-05-19 10:14:10 +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
Vladislav Vinogradov
91e312958b disabled WITH_OPENGL flag under MacOS 2012-05-10 09:53:57 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Alexey Spizhevoy
306248e444 Added support of Clp for Windows 2012-04-16 11:10:41 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Alexey Spizhevoy
020f9a6047 Updated Clp library related code in CMakeLists.txt 2012-04-13 11:55:12 +00:00
Alexey Spizhevoy
ae839df55d Added WITH_CLP flag support into cmake scripts. 2012-04-11 12:34:30 +00:00
Andrey Kamaev
c648de0e08 Fixed build error in Android examples when java bindings are excluded from build. 2012-03-31 12:26:03 +00:00
Andrey Kamaev
63c6e9d6d2 #1537 removed suspicious lines clearing optimization flags 2012-03-28 13:59:48 +00:00
Andrey Kamaev
3ac1f31126 Fixed Android tests and samples status in cmake report; restored java tests "coverage calculation". 2012-03-27 21:27:27 +00:00
Andrey Kamaev
e72a23243b Reworked build scripts for Android Java API, tests and examples 2012-03-27 16:05:52 +00:00
Alexander Shishkov
6412e17df6 fixed #1502 2012-03-26 18:58:01 +00:00
Andrey Kamaev
8991d323ea Refactored Java wrapper build scripts. 
Improved Android SDK search, fixed some bugs.
 2012-03-25 19:57:58 +00:00
Andrey Kamaev
9b2d7e19db Added "fat" mode for Java wrapper 2012-03-23 17:03:05 +00:00
Alexander Reshetnikov
0dd4386d77 Updated new ffmpeg wrapper; restored NEW_FFMPEG in the root cmake file 2012-03-21 18:07:34 +00:00
Andrey Kamaev
2e03e6c06c Solution folders are turned on by default for MS Visual Studio IDE. 2012-03-19 18:47:27 +00:00
Andrey Kamaev
305d024137 CMake status report: list unsatisfied dependencies for automatically disabled modules; fixed few problems with Windows-style paths 2012-03-16 09:16:31 +00:00
Vadim Pisarevsky
b5a9c9ac77 temporarily turned off the new wrapper. 2012-03-15 19:58:35 +00:00
Alexander Reshetnikov
36b2ff3cf3 Fixed compiling error under Ubuntu with ffmpeg 0.7.x and advised under Windows 2012-03-15 09:24:03 +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
Anatoly Baksheev
18933c12f7 Disabled BUILD_WITH_DEBUG_INFO flag for MSCV. Now debug info is included in debug configuration 2012-03-02 14:48:35 +00:00
Andrey Kamaev
2f4bb580fc Fixed some build warnings; slightly improved python search 2012-03-02 08:34:54 +00:00
Andrey Kamaev
8df208cf56 Fixed compiler flags for 3rdparty libs. 2012-02-24 21:54:29 +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
eec70a7793 Architecture dependent library path on unix 2012-02-22 15:29:23 +00:00
Andrey Kamaev
4ac407e76a Small refactoring of OpenCV cmake options 2012-02-22 14:04:59 +00:00
Andrey Kamaev
a8f27e4a84 Information about cmake and build platform is added to the status report 2012-02-21 12:42:51 +00:00
Andrey Kamaev
a6e8e5dd95 Fixed #1443 2012-02-17 19:09:05 +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
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
49933c798f Fixed build for desktop 2012-02-06 11:48:15 +00:00
Andrey Kamaev
23af203e00 Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts 2012-02-06 11:30:59 +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
Vadim Pisarevsky
fd084a0a7e fixed bug #1415 2012-01-27 20:36:19 +00:00
Vadim Pisarevsky
b33c9b10bc fixed bug #1566 2012-01-27 20:28:59 +00:00
Andrey Kamaev
13f4e70e95 Updating opencv module definition in cmake 2012-01-24 16:55:47 +00:00
Andrey Kamaev
6f99447fbf Fixed compiler flags caching in cmake 2012-01-24 11:46:11 +00:00
Andrey Kamaev
8cab65c173 Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options. 2012-01-03 13:48:12 +00:00
Andrey Morozov
209aaac95c fixed parallel build under Windows 2011-12-19 13:20:34 +00:00
Andrey Morozov
ca5d28d127 added experimental feature for parallel build solution under Windows 2011-12-16 07:14:55 +00:00
Vladislav Vinogradov
3afc97e67e fixed new OpenGL functionality under Qt 2011-12-12 12:52:06 +00:00
Vladislav Vinogradov
2a4fb155e1 added OpenGL support to Gtk realization of highgui 2011-11-28 08:23:26 +00:00
Vladislav Vinogradov
35e69a1ee3 fixed build with Qt 2011-11-27 10:13:08 +00:00
Vladislav Vinogradov
c2783af781 added OpenGL support to highgui under WIN32 2011-11-21 11:58:52 +00:00
Andrey Kamaev
d45f561ef5 Small improvements in cmake status report 2011-11-18 08:14:42 +00:00
Andrey Kamaev
a13dfc7f70 Fixed perf target 2011-11-18 07:57:14 +00:00
Andrey Kamaev
3bdb53e484 Android cmake toolchain is reworked for NDK r7; added experimental Android x86 support. 2011-11-16 14:32:10 +00:00
Leonid Beynenson
59d89c7a7a Added possibility to configure TBB behavior in Perf tests --- now we can set the number of TBB threads in the perf tests either as console parameter perf_tbb_nthreads or 
in a test itself using the method declare.tbb_threads(n).
 2011-10-31 16:22:05 +00:00
Vladislav Vinogradov
40ee754e28 added WITH_CUFFT and WITH_CUBLAS flags to cmake scripts 
fixed gpu module error reporting
added asynchronous version of some functions
 2011-10-19 09:53:22 +00:00
Alexander Shishkov
bb130d14bd Changed type of OPENCV_BUILD_3RDPARTY_LIBS variable to the INTERNAL on WIndows 
(see comments for #1030 ticket https://code.ros.org/trac/opencv/ticket/1030)
 2011-10-03 16:59:24 +00:00
Leonid Beynenson
fcaa587b67 CMake scripts changed a bit: added more accurate variant of the Threading Framework support (it is a lightweight analogue of TBB for ARM-s). 2011-09-27 16:25:13 +00:00
Andrey Kamaev
fb2c288627 Fixed some cmake 2.6 compatibility issues. 2011-09-18 15:30:36 +00:00
Andrey Kamaev
1917d8b006 Fixed perf target on Windows. 2011-09-08 06:27:46 +00:00
Andrey Kamaev
5cce038958 Performance testing branch is merged back into trunk 2011-09-06 15:30:28 +00:00
Andrey Kamaev
1f0035d2af Fixed native_camera library build for Androids having version in x.x format 2011-09-01 14:39:26 +00:00
Artem Myagkov
abdd342d50 modifed minimum required cmake version for ios 2011-08-31 18:42:44 +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
3b7b833a4e merged latest fixes from 2.3 branch; since 2.3.1 is out, the version in trunk is bumped to 2.3.2 2011-08-17 20:12:11 +00:00
Vadim Pisarevsky
d752c2b674 disabled fast-math by default. 2011-08-17 09:05:05 +00:00
Vadim Pisarevsky
bd0d8429ee added support for Ximea cameras (patch by Marian Zajko), fixed GCC warnings in MOG2 background subtractor. 2011-08-11 17:59:30 +00:00
Maria Dimashova
04e4eaabaf updated openni finding by cmake (#1190, #1252); updated doc on kinect 2011-08-10 14:58:55 +00:00
Vadim Pisarevsky
f9ef92d45a multilib support added (ticket #363) 2011-08-10 12:49:52 +00:00
Maria Dimashova
7f1995f19a fixed cmake status of openni 2011-08-10 11:59:37 +00:00
Andrey Kamaev
a0590273e9 Java API: fixed problems in video and ml modules; generated test stubs for all exported functions (now we have 1701 tests). 2011-08-05 08:39:28 +00:00
Andrey Kamaev
99b8e2db14 Java API: added tests for FAST feature detector 2011-08-02 14:32:43 +00:00
Vadim Pisarevsky
7c54ebfe1b corrected OpenEXR status in CMakeLists.txt 2011-07-27 20:53:19 +00:00
Andrey Kamaev
8ab16f66a8 Fixing native camera for Android 2011-07-25 11:16:32 +00:00
Andrey Kamaev
a17b693aa9 Fixed build of Android samples and tests 2011-07-24 20:44:20 +00:00
Andrey Kamaev
712ea05058 Refactored CMakeLists.txt for java module 2011-07-22 13:10:50 +00:00
Andrey Kamaev
078eae7154 Added cmake dependency on version.hpp. From now cmake will automatically rerun if version.hpp file is changed. 2011-07-21 21:44:48 +00:00
Andrey Kamaev
f503b029a7 Allowed to build html documentation without pdf documentation. 2011-07-19 20:27:58 +00:00
Andrey Kamaev
066039fd15 Improved ANDROID_SDK_TARGET detection; improved NDK detection in android.toolchain.cmake 2011-07-13 13:06:14 +00:00
Andrey Kamaev
6c668dd704 Fixed Android SDK searching 2011-07-13 09:17:41 +00:00
Andrey Kamaev
355f6d0a73 Fixed Android SDK searching 2011-07-13 09:10:21 +00:00
Andrey Kamaev
6623fe3b08 Added option INSTALL_ANDROID_EXAMPLES (default off); Added option for choosing SDK platform for Android tests and samples. 2011-07-12 15:59:31 +00:00
Vadim Pisarevsky
569b1ad582 embeded cv Python module into cv2. 2011-07-12 12:56:03 +00:00
Andrey Kamaev
2dd965b7f5 minor cmake corrections 2011-07-12 07:40:29 +00:00
Alexander Shishkov
b50428bf65 removed -static-libstdc++ flag for compatibility with old MinGW version 2011-07-08 07:10:37 +00:00
Alexander Shishkov
3a8a729a52 removed CPack 
added target package_source (tar or zip)
 2011-07-08 07:08:59 +00:00
Vadim Pisarevsky
af00cd5b75 Disabled -ffast-math in the case of GCC 4.6.x (ticket #1201) 2011-07-07 22:35:34 +00:00
Vadim Pisarevsky
db0dcaffeb fixed #1204 2011-07-07 22:10:13 +00:00
Andrey Kamaev
ff8fe39e23 removed duplicated compiler flags assignment 2011-07-05 06:42:56 +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
d96f533784 Instroduced separate option for Android examples - BUILD_ANDROID_EXAMPLES 2011-07-04 08:18:02 +00:00
Andrey Kamaev
1c96aac52e Fixed several cross-compiling issues. Fixed cmake status report. 2011-07-02 15:12:07 +00:00
Vadim Pisarevsky
f8e1e88ce2 we do not need strmiids.lib anymore 2011-07-01 14:03:03 +00:00
Andrey Kamaev
837b733a0a Modified cmake status report 2011-07-01 12:23:03 +00:00
Vadim Pisarevsky
3cbe53c5d2 got back to the old DLL naming scheme (opencv_core230_vs2001_64d.dll => opencv_core230[d].dll) 2011-07-01 12:14:51 +00:00
Ethan Rublee
08d3dcc709 minor edits to cmake. 2011-07-01 00:57:00 +00:00
Ethan Rublee
38b5d4ecc9 Adding namemangling to the opencv.pc file. 2011-07-01 00:14:09 +00:00
Andrey Kamaev
529f103456 Merged name suffixes for windows (from 2.3 branch) 2011-06-30 19:45:52 +00:00
Andrey Kamaev
092699783a Added cmake script to build Android samples 2011-06-30 13:37:56 +00:00
Andrey Kamaev
aa47802e88 Modified version section to read version number from version.hpp; 
Added search for ant and Android SDK (needed for Android tests and samples).
 2011-06-30 07:24:35 +00:00
Andrey Kamaev
96d29621b7 Fixes for path mangling feature 2011-06-29 06:27:08 +00:00
Ethan Rublee
773654e11a More work on the mangling of install paths. 2011-06-28 19:24:31 +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
f60bdb2473 Fixed Android.mk file generation 2011-06-28 08:48:23 +00:00
Andrey Kamaev
822b0bfe22 Minor bugfix 2011-06-28 07:20:30 +00:00
Andrey Kamaev
591cb1b3cf Fixed compiler options in Android build (Windows) 2011-06-28 05:51:41 +00:00
Andrey Kamaev
ba7ee71c20 Numerous small fixes in CMakeLists.txt 2011-06-28 05:18:53 +00:00
Andrey Kamaev
cf28846bce Fixed OpenCVConfig.cmake generation for windows 2011-06-27 16:55:10 +00:00
Andrey Kamaev
31fcd406e1 Eliminated cmake warning for case when python is not found. 2011-06-27 16:21:22 +00:00
Andrey Kamaev
b43ae03328 * Install path share/opencv is renamed to share/OpenCV. 
* Fixed zlib search.
* Fixed compiler/linker flags caching bug.
* Fixed OpenCVConfig.cmake generation (currently tested only on Unix).
 2011-06-27 13:59:03 +00:00
Andrey Kamaev
f0227edd2c Minor python search improvements 2011-06-27 08:24:10 +00:00
Vadim Pisarevsky
d195871904 propagated fix for ticket #1168 to trunk 2011-06-25 09:39:41 +00:00
Andrey Kamaev
c1940b4ec7 Modified install layout for Android 2011-06-24 15:40:27 +00:00
Andrey Kamaev
69b79f89c1 Updated build scripts for better Java module support 2011-06-24 07:48:04 +00:00
Andrey Kamaev
e60b8dfba0 Fixed numpy search on Windows x64 2011-06-23 09:16:55 +00:00
Andrey Kamaev
9600ebadf2 Main CMakeLists.txt merged with 2.3 branch 2011-06-22 11:53:15 +00:00
Andrey Kamaev
76bc9f8c20 Removed SWIG from Android toolchain; always search for python; find_program/find_package cmake functions wrapped for case of cross-compiling. 2011-06-22 10:38:57 +00:00
Andrey Kamaev
ea58cdc71d (trunk) Do not use prebuilt Android camera libs for armeabi hardware target 2011-06-20 15:57:42 +00:00
Andrey Kamaev
9c71134caf Added generation of OpenCV.mk file for Android development with ndk-build tool 2011-06-20 15:35:05 +00:00
Vadim Pisarevsky
151bfb2ae2 use "-O2 -DNDEBUG" in release by default in the case of MinGW 2011-06-18 13:09:57 +00:00
Alexander Shishkov
d198e39d35 set default compiler flags to "-O2" in the case of MinGW 2011-06-17 15:44:05 +00:00
Andrey Morozov
840baa2205 improved build of installer package for windows 2011-06-17 15:02:10 +00:00
Andrey Kamaev
e722cb96e7 Added cmake file to compile Android native camera wrapper if Android source tree is available 2011-06-17 13:52:55 +00:00
Alexander Shishkov
0ec452c152 turned off Python support for Windows in Debug mode 2011-06-17 13:12:21 +00:00
Alexander Shishkov
78dcb42822 fixed compilation on Linux in static case 2011-06-17 12:53:57 +00:00
Andrey Kamaev
6e8b4e646a Fixed Android install target 2011-06-17 11:10:35 +00:00
Andrey Kamaev
206aa50f86 Added Android native camera module 2011-06-16 18:00:41 +00:00
Vadim Pisarevsky
35d5a671a2 little fix: "and" => "AND" 2011-06-16 10:20:26 +00:00
Vadim Pisarevsky
17b18de531 added missing evcode.h; made videoinput optional (ticket #1142) 2011-06-16 09:51:34 +00:00
Vadim Pisarevsky
412e7a835f videoInput is now integrated into highgui and built from sources 2011-06-15 22:59:41 +00:00
Vadim Pisarevsky
4b4e30f6c1 fixed gcc dwarf2 check 2011-06-15 17:34:43 +00:00
Alexander Shishkov
13a9129d20 turned off WITH_VIDEOINPUT for mingw with dwarf2 2011-06-15 15:59:50 +00:00
Anatoly Baksheev
117ff43cc3 default cuda target flags changed 
cuda support is on by default
 2011-06-15 08:05:34 +00:00
Alexander Shishkov
6ecebb7f66 fixed #768 ticket 
renamed OPENCV_SOURCE_DIR to OpenCV_SOURCE_DIR
 2011-06-14 10:19:56 +00:00
Alexander Shishkov
ca758a9dac fixed #768 ticket 2011-06-14 10:11:16 +00:00
Anatoly Baksheev
8f4c7db3f6 ~40 warnings under VS2008 
HAVE_CONFIG_H -> HAVE_CVCONFIG_H
 2011-06-11 17:24:09 +00:00
Alexander Shishkov
97ae8f7af7 added BUILD_WITH_STATIC_CRT option for static linking with CRT on MSVC 2011-06-06 10:26:59 +00:00
Andrey Kamaev
c7bdf83de5 Fixed Android build 2011-06-03 12:01:55 +00:00
Anatoly Baksheev
e4bbcdac17 minor 2011-06-01 08:01:04 +00:00
Alexander Shishkov
6f6da53c64 added SSE compiler flags under Windows+MSVC (ticket #371) 2011-05-31 15:50:16 +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
Alexander Shishkov
33e71127f7 fixed problem with VideoInput on Windows when OpenCV compiled statically (ticket #573) 2011-05-30 13:32:57 +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
Maria Dimashova
33493f4e19 renamed WITH(HAVE)_EIGEN2 to WITH(HAVE)_EIGEN, fixed compilation error if eigen3 is used (#805) 2011-05-27 12:15:36 +00:00
Ethan Rublee
5c5cd449b3 Adding python default install path for debian vs mac. changing site-packages -> dist-packages. See python help 
for site. Also ticket #1087.
 2011-05-24 00:30:03 +00:00
Vadim Pisarevsky
306a11a7c5 fixed a few warnings from VS2010 express 2011-05-17 14:15:23 +00:00
Anatoly Baksheev
69f28ef65c solution folder flag disabled by default 2011-05-17 09:40:06 +00:00
Andrey Kamaev
9d787afe72 Small Android build fixes 2011-05-13 18:32:05 +00:00
Anatoly Baksheev
7a24dc9cb6 formatting 2011-05-11 14:45:35 +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
Vadim Pisarevsky
a7b9c31e6a repaired opencv refman & refman1 build 2011-05-09 16:50:29 +00:00
Andrey Kamaev
9f29506d2c Refactored NEON optimization usage 2011-05-06 12:24:56 +00:00
Andrey Kamaev
727fbd5376 Android cmake toolchain file is included into OpenCV 2011-05-03 08:13:50 +00:00
Vadim Pisarevsky
d02a0cab48 updated OpenCV version to 2.2.9; added missing cv::convertPointsHomogeneous for backward compatibility; fixed bug #952 2011-05-02 22:20:22 +00:00
Vadim Pisarevsky
ad84d784ee make CMAKE_INSTALL_PREFIX available on Windows as well 2011-05-02 08:13:36 +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
Leonid Beynenson
2806db93d8 Merged the branch /branches/opencv_pthread_framework/opencv into the trunk. 
The branch contains changes, concerning adding ThreadingFramework -- temporary lightweight decision for ARM instead of Intel TBB.
Also some changes in Android highgui camera class were made.
 2011-04-29 14:20:24 +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
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
e3f394af01 Fixed remaining Android compatibility issues: added compiler flag to interpret char as signed char. 2011-04-20 14:48:02 +00:00
Andrey Kamaev
b906ad3108 Test system included into Android build 2011-04-11 14:47:06 +00:00
Andrey Kamaev
68534d70f3 Merged android-experimental branch back to trunk. 2011-04-06 14:31:03 +00:00
Anatoly Baksheev
7f77f8f35a tbb search improvement 2011-04-01 19:19:03 +00:00
Vadim Pisarevsky
371aa08006 OpenCV reference manual (C++ part only for now) is now produced directly from RST, not from TeX. 2011-02-22 20:43:26 +00:00
Anatoly Baksheev
0725a31e5a default target arch modified 2011-02-16 08:42:12 +00:00
Vadim Pisarevsky
061b49e0b2 reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine. 2011-02-09 20:55:11 +00:00
Maria Dimashova
ad896ae640 refactored OpenNI integration 2011-02-04 13:41:10 +00:00
Maria Dimashova
ed77955635 moved an include dirs setting to the root cmake file 2011-02-03 09:55:17 +00:00
Alexey Spizhevoy
e303b0dd62 added CUDA_ARCH_FEATUERS define (for correct handling of BIN(PTX) cases) 2011-02-01 12:28:39 +00:00
Alexey Spizhevoy
13a6d0b92a fixed parsing GPU archs in BIN(PTX) format 2011-01-27 08:26:10 +00:00
Alexey Spizhevoy
dbff16eb85 updated cmake file to allow specifying GPU archs in BIN(PTX) format 2011-01-25 14:13:12 +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
Alexey Spizhevoy
574b3f94a1 updated gpu initialization functions, added compile-time error on CC 1.0 2011-01-20 14:13:07 +00:00
Alexey Spizhevoy
6187b97199 fixed GPU switchable tests, changed default CC's for gpu module 2011-01-20 10:15:44 +00:00
Alexey Spizhevoy
3c1227ac65 cosmetic changes 2011-01-20 09:38:45 +00:00
Alexey Spizhevoy
8779306800 updated main CMakeLists.txt gpu module section, now user can manage binary and intermediate code versions of the gpu module image 
added more functions to check version of gpu code in runtime
 2011-01-20 09:22:05 +00:00
Alexey Spizhevoy
1a0d41fb53 added checkPtxVersion into gpu module 2011-01-18 14:52:35 +00:00
Alexey Spizhevoy
f3a2656808 added hasPtxFor and isCompatibleWith functions into gpu module, added docs for them 2011-01-18 12:01:28 +00:00
Vladimir Dudnik
6309b2d08d added OpenCVFindIPP.cmake script, which will look for IPP installation at CMake configuration time. First, IPPROOT environment variable will be tested, if not found script will look at default install places. 
The script should support IPP from 5.3 up to 7.x versions (although tested on Windows for IPP 6.1 and IPP 7.0 versions only)

Preliminary optimization of HOG with IPP added too. Not yet quite efficient, code for cpu branch should be redesigned in order to have better performance.
 2010-12-31 16:45:18 +00:00
Vadim Pisarevsky
8a87c15a66 added opencv/include/CMakeLists.txt to the install package for Windows 2010-12-09 12:23:41 +00:00
Vadim Pisarevsky
9dfb15dbbd some more fixes for the static library configuration 2010-12-05 02:10:59 +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
Vadim Pisarevsky
3ec6934da3 starting to fix CMake scripts for the proper OpenCVConfig.cmake behavior 2010-12-04 20:36:59 +00:00
Vadim Pisarevsky
a7a5dd051a updated version number; removed unnecessary index.html and ChangeLog.htm 2010-12-04 19:21:45 +00:00
Vadim Pisarevsky
b0cc526b0b fixed OpenCV build on NetBSD (ticket #726) 2010-12-04 17:26:15 +00:00
Anatoly Baksheev
07e68eb0bb sigms's second patch with fix in install rules. 2010-12-02 13:43:55 +00:00
Vadim Pisarevsky
0cab986ecf applied patches by sigma (ticket #644) 2010-11-29 22:18:28 +00:00
Anatoly Baksheev
4c160acc35 GPU module: disabled compilation for CC 1.0 2010-11-28 11:25:07 +00:00
Vadim Pisarevsky
40e1fd5b1e updated installation package for Windows 2010-11-25 23:12:37 +00:00
Anatoly Baksheev
36ebf4ef0d cuda+npp version check at configure time. 2010-11-25 10:42:09 +00:00
Vadim Pisarevsky
d366c0b2fa fixed canny test; fixed mhi-global test & implementation (hopefully, for the last time); added sse 4.1 & 4.2 support (not working in Xcode for some reason); moved splineInterpolation to color.cpp; fixed a few bugs in documentation 2010-11-24 09:46:46 +00:00
Vadim Pisarevsky
de4f1aeb06 fixed some GCC 4.4 warnings 2010-11-20 12:05:28 +00:00
Vadim Pisarevsky
8a8ba57b20 fixed building Python wrappers when Numpy is not available 2010-11-03 17:57:51 +00:00
Stefano Fabri
886369069a Fixed flann linking 2010-10-25 11:32:16 +00:00
Vadim Pisarevsky
a8476d9ce6 added "-ggdb3" to GCC flags in Debug configuratin. Hopefully, it will solve problems with tracing code with debuggers 2010-10-22 12:02:39 +00:00
Ethan Rublee
244a537d54 _S happens to be a bad variable name for android 2010-10-09 02:15:08 +00:00
Vadim Pisarevsky
caa3076018 added Eigen3 support 2010-10-01 09:13:35 +00:00
Anatoly Baksheev
74c4b5a5a9 Added compilation with NPP to GPU module(FindNPP script). Tested only on win32, but it does not influence on OpenCV compilation if WITH_CUDA flag unset. 2010-09-12 15:17:37 +00:00
Andrey Morozov
bbc2015014 created build infrastructure for NPP linking in CMake. 2010-09-10 11:02:52 +00:00
Andrey Morozov
199ffc632d added flags OpenCV_COMPUTE_CAPABILITIES, which stores the version compute capability from which it is compiled opencv 
now use opencv with cuda in your application  in the such way : set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ${OpenCV_COMPUTE_CAPABILITIES})
 2010-08-25 12:49:17 +00:00
Anatoly Baksheev
97d17d8ad1 fixed warnings 
added comments in gpu.hpp
 2010-08-18 17:13:01 +00:00
Andrey Morozov
0816b49a3f added parallel build for visual studio 2010-08-18 08:16:42 +00:00
Yannick Verdie
dec6f2c393 Qt fixed bug with OpenGL, and save issue reported in #520 2010-08-14 18:36:53 +00:00
Anatoly Baksheev
f9cbb36b5e gramma ;) 2010-08-10 10:54:52 +00:00
Vadim Pisarevsky
26c6b955a8 updated ffmpeg to 0.6.0 2010-08-05 17:24:41 +00:00
Yannick Verdie
2505e7e267 Qt: disable KEEP_RATIO with OpenGL to avoid a blinking bug 
Qt: Now OpenGL rendering is ok
 2010-08-02 17:10:43 +00:00
Yannick Verdie
d6bbaea28a Qt imgRegion bug fixed 
Qt compilation pb with OpenGL flags fixed
 2010-08-02 10:58:25 +00:00
Yannick Verdie
8f8aba9c88 fixed Qt bug 2010-07-30 14:13:20 +00:00
Yannick Verdie
8f33e89d46 working on OpenGL for Windows 2010-07-28 21:55:55 +00:00
Yannick Verdie
c77e8fc638 Qt - debugging Linux and Windows 2010-07-27 17:29:22 +00:00
Yannick Verdie
21b0652c40 QT statusbar bug fixed for Windows 2010-07-27 14:17:43 +00:00
Yannick Verdie
2122cde787 2010-07-27 13:19:29 +00:00
Yannick Verdie
bb2fe87b32 2010-07-26 12:28:33 +00:00
Yannick Verdie
f2353b8523 QT new functions: 
- cvCreateOpenGLCallback: draw 3D on top of the image
 2010-07-23 15:22:04 +00:00
Anatoly Baksheev
3a3745daac disabled W4 warnings for GPU module. 2010-07-19 17:35:39 +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
Anatoly Baksheev
2c84a66ec7 added support to build without cuda. 2010-07-15 13:36:00 +00:00
Vadim Pisarevsky
fa91788222 disabled Qt by default (until the code is stabilized) 2010-07-12 15:29:31 +00:00
Yannick Verdie
c3eb7881f1 New functions with QT GUI: 
- 3 new points mostly done:
      - OpenGL support enabled (windows are rendered using GPU)
      - Save current screen (with overlay and so on...) with shortcut CTRL+S
      - Text rendering (with any system font, and possibility to set the style - normal, italic,... - the weight - normal, bold, ... - the color, the spacing between letters, and so on...)
 2010-07-12 11:04:26 +00:00
Yannick Verdie
164700161e Qt backend development: 
Fixed CMake cached variables
 2010-07-08 08:32:24 +00:00
Vadim Pisarevsky
576adb434d removed embedded (obsolete) OpenEXR files; repaired OpenEXR bindings 2010-07-04 12:32:31 +00:00
Vadim Pisarevsky
6f10d9cea8 changed WITH_EIGEN2=OFF to ON by default 2010-06-29 16:36:27 +00:00
Vadim Pisarevsky
60acd91ce1 added Eigen2 support; fixed compile errors on Ubuntu 10.04 2010-06-29 15:49:15 +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
6314cd28cf New functions with QT GUI: 
- fix zoom offset of 0.5
- fix CMake problem with QT detection
- Code optimisation
 2010-06-25 17:19:11 +00:00
Yannick Verdie
bd643ad550 New functions with QT GUI: 
Fixed memory leak
Disable QT by default
 2010-06-20 08:44:19 +00:00
Yannick Verdie
e21b4e9ca3 New functions with QT GUI 
Mouse callback return correct value during zoom/panning
 2010-06-17 20:24:11 +00:00
Vadim Pisarevsky
c11bc13126 minor fixes in CMake scripts 2010-06-10 23:38:37 +00:00
Yannick Verdie
c6872100db Start integrating QT GUI (GoC 2010) 2010-06-07 08:29:10 +00:00
Vadim Pisarevsky
8b1e3a5ebd fixed OpenCV_INCLUDE_DIRS in OpenCVConfig.cmake (thanks to borism for the patch) 2010-06-01 15:47:36 +00:00
Vadim Pisarevsky
b34aaace79 updated OpenCV version because of the recent reorganization 2010-05-18 16:42:35 +00:00
Vadim Pisarevsky
47c3e79423 added Doxygen-based documentation (draft version for now) 2010-05-18 15:41:28 +00:00
Jose Luis Blanco
4833f15b22 Tentative fix to using FIND_PACKAGE(OpenCV) from external apps after last atomic bomb commit! 
Fixed for OpenCV compiled whereever and NOT "make install"ed. This second case must be checked later, since I'm not sure of the pretended include dirs layout after "make install". 
If all include dirs go to the same target install directory, it should work as is right now.
 2010-05-14 09:35:39 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00