Roman Donchenko
|
3d46c1f960
|
Don't install documentation if it isn't built
The HAVE_DOC_GENERATOR variable was always true.
|
2015-02-12 16:51:26 +03:00 |
|
Roman Donchenko
|
0387f8ad56
|
Don't use ${CMAKE_INSTALL_PREFIX} as an install destination
Absolute destinations are not necessary, and prevent CPack from working.
|
2015-02-10 19:43:29 +03:00 |
|
Vadim Pisarevsky
|
9a62173a5b
|
Merge pull request #3689 from jet47:test-script-optional-color-2.4
|
2015-02-10 12:00:44 +00:00 |
|
Vladislav Vinogradov
|
682fdcfc9b
|
make color output in run_test script optional
|
2015-02-09 15:23:34 +03:00 |
|
Andrew Senin
|
b9a6edfe3d
|
Fixing XIMEA parameters mapping (issue #4176)
|
2015-02-09 15:15:23 +03:00 |
|
Vadim Pisarevsky
|
606a646435
|
Merge pull request #3680 from jet47:fix-run-tests-script-2.4
|
2015-02-08 17:07:11 +00:00 |
|
Vladislav Vinogradov
|
94d14c637f
|
fix opencv_run_all_tests_unix.sh script:
use `bash` shell instead of `sh`, since on Ubuntu `sh` by default is `dash`,
and `dash` doesn't support `PIPESTATUS` feature used in this sctipt
|
2015-02-06 12:34:50 +03:00 |
|
Vadim Pisarevsky
|
cd1ca7b08b
|
Merge pull request #3667 from AfterEight:cap_ximea_setResolution_bugfix
|
2015-02-05 07:48:43 +00:00 |
|
Vadim Pisarevsky
|
98f9a013d1
|
Merge pull request #3674 from jet47:colorize-run-test-script-2.4
|
2015-02-05 07:35:01 +00:00 |
|
Mansour Moufid
|
c60fa84027
|
Add back the version variables removed in ab40630f .
|
2015-02-04 10:55:38 -05:00 |
|
Vadim Pisarevsky
|
50eb661df8
|
Merge pull request #3676 from asmorkalov:changelog_for_tests
|
2015-02-04 15:13:44 +00:00 |
|
Alexander Smorkalov
|
a87ccb9ac0
|
Added Debian changelog to -tests package.
|
2015-02-04 16:52:39 +03:00 |
|
Vadim Pisarevsky
|
8e1b1a845b
|
Merge pull request #3672 from asmorkalov:debian_lower_case
|
2015-02-04 13:17:51 +00:00 |
|
Vadim Pisarevsky
|
5253265342
|
Merge pull request #3671 from jet47:disable-gpu-match-template-tests
|
2015-02-04 13:17:26 +00:00 |
|
Vladislav Vinogradov
|
2b303f38a8
|
colorize opencv_run_all_tests_unix.sh script output
|
2015-02-04 12:38:51 +03:00 |
|
Alexander Smorkalov
|
e6ac64008b
|
Debian package names replaced by lower case version to satisfy lintian.
|
2015-02-04 11:56:29 +03:00 |
|
Vladislav Vinogradov
|
7bb8c50080
|
disable gpu::matchTemplate tests
|
2015-02-04 11:21:17 +03:00 |
|
Mansour Moufid
|
8c68f1f626
|
Fix indentation of 98a157f5 .
|
2015-02-03 23:17:43 -05:00 |
|
Mansour Moufid
|
98a157f589
|
Remove Apple-specific logic in finding the FFmpeg libraries.
Thanks to SpecLad.
|
2015-02-03 23:14:11 -05:00 |
|
Mansour Moufid
|
a1cc9380e5
|
Correct the new find_library commands.
Thanks to SpecLad.
|
2015-02-02 11:54:09 -05:00 |
|
AfterEight
|
e938563de5
|
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)
|
2015-02-02 15:04:29 +01:00 |
|
Vadim Pisarevsky
|
0ab4bbf771
|
Merge pull request #3662 from StevenPuttemans:fix_models
|
2015-02-02 10:17:43 +00:00 |
|
Mansour Moufid
|
ab40630ff4
|
Use the CMake find_library command to find the FFmpeg libraries.
|
2015-02-01 15:51:33 -05:00 |
|
StevenPuttemans
|
8548a8430e
|
fixing wrong model sizes
|
2015-02-01 15:13:57 +01:00 |
|
Vadim Pisarevsky
|
06b97b7b67
|
Merge pull request #3660 from asmorkalov:samples_install_permissions
|
2015-02-01 09:14:28 +00:00 |
|
Alexander Smorkalov
|
cf852972d1
|
Fixed samples install permissions for Debian packaging.
|
2015-02-01 00:34:23 +03:00 |
|
Vadim Pisarevsky
|
1f47c22371
|
Merge pull request #3655 from asmorkalov:remove_opencv_testing_sh
|
2015-01-31 14:46:40 +00:00 |
|
Vadim Pisarevsky
|
602b034a03
|
Merge pull request #3658 from asmorkalov:numpy_dependency
|
2015-01-31 14:45:11 +00:00 |
|
Vadim Pisarevsky
|
8764b17ffc
|
Merge pull request #3659 from asmorkalov:debian_changelog_stub
|
2015-01-31 14:44:41 +00:00 |
|
Alexander Smorkalov
|
ddc1b965b6
|
Added Debian changelog installation step for Debian package generation.
|
2015-01-30 13:21:52 +03:00 |
|
Alexander Smorkalov
|
be6b847675
|
Added dependency from numpy to debian package with python bindings.
|
2015-01-30 12:27:33 +03:00 |
|
Alexander Smorkalov
|
9206ec30a2
|
opencv_testing.sh script installation is removed as run tests script does the same thing.
|
2015-01-29 19:20:18 +03:00 |
|
Vadim Pisarevsky
|
a7e9760316
|
Merge pull request #3649 from StevenPuttemans:fix_tutorials
|
2015-01-29 12:14:09 +00:00 |
|
Vadim Pisarevsky
|
7e1068919b
|
Merge pull request #3587 from vpradeep07:fix/pnpransac_race_cond
|
2015-01-29 12:12:18 +00:00 |
|
StevenPuttemans
|
30d46313ec
|
adding a universal OpenCV based annotation tool for cascade classifier training
|
2015-01-29 13:03:28 +01:00 |
|
Vadim Pisarevsky
|
c1252a1089
|
Merge pull request #3648 from SpecLad:get_policy-ts
|
2015-01-28 18:49:59 +00:00 |
|
StevenPuttemans
|
a86dc747b3
|
fixing tutorial errors
|
2015-01-28 13:52:50 +01:00 |
|
Alexander Karsakov
|
c481e06e87
|
Fixed getPolicy() method to make it thread-safe.
(cherry picked from commit 8910508b83 )
|
2015-01-27 19:20:35 +03:00 |
|
Vadim Pisarevsky
|
3bfe4f711d
|
Merge pull request #3641 from cbenhagen:patch-2
|
2015-01-26 09:45:59 +00:00 |
|
Ben Hagen
|
5245c7454c
|
Do not blacklist GStreamer on Apple
|
2015-01-23 12:59:09 +01:00 |
|
Vadim Pisarevsky
|
2fabe56bbe
|
Merge pull request #3631 from StevenPuttemans:fix_samples
|
2015-01-21 10:40:19 +00:00 |
|
Vadim Pisarevsky
|
2ca39c910d
|
Merge pull request #3468 from StevenPuttemans:fix_models
|
2015-01-20 15:25:51 +00:00 |
|
StevenPuttemans
|
cf5a7b9679
|
remove an unused #endif
|
2015-01-20 15:41:39 +01:00 |
|
Vadim Pisarevsky
|
9a6a046caf
|
Merge pull request #3613 from asmorkalov:aarch64_tiff
|
2015-01-20 12:36:38 +00:00 |
|
Vadim Pisarevsky
|
c29c52a216
|
Merge pull request #3609 from jet47:fix-ocv_add_module-2.4
|
2015-01-20 12:34:50 +00:00 |
|
Vadim Pisarevsky
|
07c9a88d9c
|
Merge pull request #3621 from asmorkalov:ts_master_comapat_header
|
2015-01-19 12:33:58 +00:00 |
|
Vadim Pisarevsky
|
f3439de480
|
Merge pull request #3623 from Trundle:fix_android_link
|
2015-01-19 10:51:12 +00:00 |
|
Vadim Pisarevsky
|
28dd3aae79
|
Merge pull request #3614 from cwreynolds:Unicode-fix-for-addText-2
|
2015-01-19 10:50:14 +00:00 |
|
Andreas Stührk
|
0a5b200da2
|
Update link to information about Android platform.
The current link does no longer seem to work.
|
2015-01-19 00:01:12 +01:00 |
|
Alexander Smorkalov
|
9e9327e2f8
|
Added OpenCV 3.0 compat header for TS module.
|
2015-01-18 21:32:19 +03:00 |
|