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