Vadim Pisarevsky
99ae48f0b4
Merge pull request #3707 from alalek:fix_android_camera
2015-02-20 12:27:13 +00:00
Alexander Smorkalov
96e5300fdd
OpenCV and OpenCV Manager version++
2015-02-20 15:17:11 +03:00
StevenPuttemans
4f621de849
fix bug 3714 2.4 branch
2015-02-20 12:39:31 +01:00
Alexander Smorkalov
3649a1a179
Build fix for case without TegraDetector.
2015-02-20 13:29:58 +03:00
Alexander Smorkalov
352485fc54
Android 5 support and aarch64-related fixes for Android Manager.
2015-02-20 13:16:33 +03:00
Roman Donchenko
c1e3ca170e
Add a script to run all tests on Windows
...
It's pretty much a simplified copy of the Linux script, lacking fancy colors.
Also, I had to drop Python testing, because it's not easy to pass the Python
module location to the script, and I have no pressing need to run the Python
tests at the moment.
2015-02-20 12:38:25 +03:00
Alexander Nitsch
9665e08bac
Implement CMAKE_CURRENT_LIST_DIR for older CMake
...
The use of built-in CMAKE_CURRENT_LIST_DIR requires at least
CMake 2.8.3. This fix properly defines the variable to allow its
use in versions < 2.8.3 as well.
Fixes issue #4205 .
2015-02-20 00:55:26 +01:00
Vadim Pisarevsky
65e4df751c
Merge pull request #3705 from SpecLad:unused-nNull
2015-02-19 18:40:22 +00:00
Alexander Alekhin
4e8aac5308
Merge pull request #3683 from SeninAndrew:2.4
2015-02-18 17:15:10 +00:00
Vadim Pisarevsky
a649aea82a
Merge pull request #3699 from SpecLad:rm-component-install
2015-02-18 13:55:07 +00:00
Vadim Pisarevsky
4fcfcfd002
Merge pull request #3663 from eliteraspberries:ffmpeg-dylib
2015-02-18 12:50:10 +00:00
Vijay Pradeep
4ce31c7c1a
Merge remote-tracking branch 'itseez/2.4' into feature/deterministic_pnpransac
2015-02-17 10:16:44 -08:00
Vijay Pradeep
49bc100e51
Removing rng_seed arg in order to maintain ABI compatibility. Hardcoding seed
2015-02-17 09:19:36 -08:00
StevenPuttemans
f5a14e5594
fix message of preloaded parameters
2015-02-17 10:21:31 +01:00
Alexander Alekhin
dc21a0a6b5
Android: fix JavaCameraView implementation
...
1) Fixed deadlock if camera is started and stopped immediately
2) Invalid pattern usage of Object.wait(). Refer to "spurious wakeup": http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait
3) Fixed buffer usage:
a) fix eliminates processing of zero NV12 (green in RGB) first frame
b) latest ready frame is delivered for processing (not previous)
2015-02-17 01:28:43 +03:00
Roman Donchenko
d218f28070
cap_msmf.hpp: fix a warning about nNull being unused
...
The two functions featuring nNull are not particularly needed, so
I simply removed them.
2015-02-16 19:31:51 +03:00
Roman Donchenko
e8a7394009
Install data and test data on Windows
...
Because why not?
2015-02-16 19:24:07 +03:00
Vadim Pisarevsky
6a3a6416d7
Merge pull request #3698 from SpecLad:avcodec-free-frame
2015-02-16 11:33:00 +00:00
Vadim Pisarevsky
9e3a826263
Merge pull request #3697 from tomi44g:2.4
2015-02-16 11:28:02 +00:00
Roman Donchenko
8714219dab
Merge pull request #3695 from SpecLad:fix-hdc-tautology
2015-02-13 14:09:07 +00:00
Roman Donchenko
6c4b3c1efe
Merge pull request #3693 from SpecLad:no-absolute-destinations
2015-02-13 14:06:54 +00:00
Roman Donchenko
49fe496914
Remove useless CPACK_*_COMPONENT_INSTALL variables
...
They don't actually do anything. And even if they did, all components are
enabled by default, anyway.
2015-02-13 15:31:19 +03:00
Roman Donchenko
77578d415f
Fix a memory leak in CvCapture_FFMPEG::close
...
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
2015-02-13 15:12:52 +03:00
Thomas Gabrowski
ff4c42d182
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
2015-02-13 00:51:03 +00:00
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