Vadim Pisarevsky
e02d6e2c8f
Merge pull request #3766 from StevenPuttemans:add_GPU_old_models
2015-03-02 10:49:38 +00:00
Vadim Pisarevsky
7458dfc082
Merge pull request #3765 from jet47:gpu-hog-fix
2015-03-02 10:34:51 +00:00
Vladislav Vinogradov
4f5d30a865
fix GpuMat::setTo implementation
...
previous implementation was not thread/stream safe, since it used constant
memory
new implementation doesn't use any global objects, so it is thread/stream safe
2015-02-27 16:28:06 +03:00
StevenPuttemans
2c0ef660bf
Add GPU models in seperate folder, only old models are supported and they were replaced to make the CPU interface work.
...
This solves the undesired consequence of breaking the GPU interface.
2015-02-27 14:15:30 +01:00
Vladislav Vinogradov
21bbed7baf
fix gpu HOG implementation:
...
move hog::set_up_constants from constructor to compute method
if user changed CUDA device between constructor and computation,
some variables were uninitialized
2015-02-27 14:28:12 +03:00
Alexander Smorkalov
f73a97b53b
Merge pull request #3751 from jet47:gpu-bmoptflow-test-epsilon
2015-02-25 11:54:44 +00:00
Vladislav Vinogradov
c147ab1e85
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
2015-02-25 13:16:36 +03:00
Maksim Shabunin
d56dd0e091
Merge pull request #3727 from StevenPuttemans:fix_3714_2.4
2015-02-24 10:08:43 +00:00
Maksim Shabunin
baabd95f30
Merge pull request #3740 from StevenPuttemans:fix_3028_2.4
2015-02-24 10:06:20 +00:00
StevenPuttemans
720fd144ef
add fit ellipse technique notice
2015-02-23 14:59:40 +01:00
Andrey Pavlenko
c059f7ddcd
Merge pull request #3726 from asmorkalov:ocv_version_inc4
2015-02-20 16:11:58 +00:00
Vadim Pisarevsky
85fd599939
Merge pull request #3588 from vpradeep07:feature/deterministic_pnpransac
2015-02-20 12:32:35 +00:00
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
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
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
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
Vadim Pisarevsky
6a3a6416d7
Merge pull request #3698 from SpecLad:avcodec-free-frame
2015-02-16 11:33:00 +00: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
Andrew Senin
b9a6edfe3d
Fixing XIMEA parameters mapping (issue #4176 )
2015-02-09 15:15:23 +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
5253265342
Merge pull request #3671 from jet47:disable-gpu-match-template-tests
2015-02-04 13:17:26 +00:00
Vladislav Vinogradov
7bb8c50080
disable gpu::matchTemplate tests
2015-02-04 11:21:17 +03: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
7e1068919b
Merge pull request #3587 from vpradeep07:fix/pnpransac_race_cond
2015-01-29 12:12:18 +00: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
9a6a046caf
Merge pull request #3613 from asmorkalov:aarch64_tiff
2015-01-20 12:36:38 +00:00
Vadim Pisarevsky
07c9a88d9c
Merge pull request #3621 from asmorkalov:ts_master_comapat_header
2015-01-19 12:33:58 +00:00
Alexander Smorkalov
9e9327e2f8
Added OpenCV 3.0 compat header for TS module.
2015-01-18 21:32:19 +03:00
Craig Reynolds
72d90ba8d2
In cvAddText, construct QString from "text" using fromUtf8.
2015-01-16 14:57:11 -08:00
Alexander Smorkalov
d277a1ba75
TIFF support hack for aarch64 reverted.
2015-01-17 01:25:58 +03:00
Vijay Pradeep
1292fdf71a
Now using default arg instead of overloads
2015-01-13 11:25:01 -08:00
Vijay Pradeep
964d5a20e9
Whitespace fix
2015-01-09 10:44:19 -08:00
Vijay Pradeep
177478a8ad
overload instead of default arg for ABI backwards compatibility. rng_seed is now 'int' to support python port
2015-01-09 10:18:08 -08:00
Vijay Pradeep
a1c5740044
solvePnPRansac now accepts a seed and is deterministic
2015-01-08 18:24:55 -08:00
Vijay Pradeep
042ff210d5
Fixing race condition by expanding resultsMutex lock section
2015-01-08 15:26:15 -08:00
Alexander Smorkalov
c778011f14
More accurate AVX and AVX2 control.
...
- Previous version just checked option support, but not enable it.
- Also OpenCV tests reports invalid AVX and AVX2 support status.
2015-01-04 23:41:14 +03:00
Maksim Shabunin
e23ba9215d
Fixed memory leak in ML module
...
"int * CvMLData::sample_idx" was not freed
2014-12-30 15:20:24 +03:00
Alexander Smorkalov
8acd4c3ff4
More accurate fix for libtiff and aarch64.
2014-12-28 12:44:24 +03:00
Alexander Smorkalov
c0a8d4e1ef
Fix of HaarCascade GPU test for aarch64.
2014-12-28 11:49:25 +03:00
Vadim Pisarevsky
a5969aec96
Merge pull request #3534 from taka-no-me:build_fixes
2014-12-26 14:34:13 +00:00
Vladislav Vinogradov
d00f36ec75
fix tests for gpu::matchTemplate:
...
use ASSERT_FLOAT_EQ to compare float values, it is more robust for
large values
2014-12-25 17:43:13 +03:00
Andrey Kamaev
c105b72945
Assorted fixes:
...
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
2014-12-25 12:41:16 +03:00
Roman Donchenko
034ff3ce13
Merge pull request #3497 from SpecLad:fs-open-fail-leak
2014-12-24 08:59:53 +00:00
Roman Donchenko
08da247a87
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
...
... before any exceptions occur.
2014-12-22 18:54:39 +03:00