Commit Graph

12880 Commits

Author SHA1 Message Date
Roman Donchenko
c9a4a82667 Merge pull request #2358 from rohitgirdhar:rotatedRect 2014-02-25 17:43:48 +04:00
Ilya Lavrenov
ce0557ebb8 fixed defects from Xcode 2014-02-25 17:33:12 +04:00
Elena Gvozdeva
45cc8a5300 fixed 2014-02-25 16:43:52 +04:00
Roman Donchenko
1db1a83410 Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix 2014-02-25 15:04:24 +04:00
Roman Donchenko
48432502b6 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
Roman Donchenko
3693facd9e Merge pull request #2412 from arunjvs:master 2014-02-25 14:21:12 +04:00
Ilya Lavrenov
fe38aab84a core tapi optimization 2014-02-25 14:14:42 +04:00
Arun JVS
31fb7c4fec Fixed Bug #3568: Build fails with WITH_OPENGL=ON 2014-02-25 14:34:32 +05:30
Elena Gvozdeva
48e7bc6b30 fixed 2014-02-25 12:59:33 +04:00
Roman Donchenko
7dc549f166 Merge pull request #2411 from asmorkalov:android_mat_leak_fix 2014-02-25 12:37:01 +04:00
Alexander Smorkalov
c78142acb0 Bug #3391 org.opencv.android.NativeCameraView crashes after latest OpenCV Manager update fixed.
The crash was cased by massive Mat objects leak in NativeCameraView class.
2014-02-25 11:54:03 +04:00
vbystricky
ff8b8ef24c Remove implementation of CvCapture interface for Intel PerC camera. Add IVideoCapture interface and implementation of this one for Intel PerC camera 2014-02-25 10:59:35 +04:00
Alexander Smorkalov
dbb7aa7856 Highgui_Tiff.decode_tile16384x16384 disabled for Android.
Last changes in test leads to SIGKILL on Android.
SIGKILL is called by out of memory killer.
2014-02-25 10:36:20 +04:00
Andrey Pavlenko
d695d4a0bf Merge pull request #2406 from ilya-lavrenov:abf 2014-02-25 09:12:32 +04:00
juanmanpr
540a60fca7 Replaced calls to cout from photo module, by CV_Assert 2014-02-25 00:29:07 +01:00
Ilya Lavrenov
653b99c9bd new scheme of sqrSum 2014-02-25 00:38:44 +04:00
Ilya Lavrenov
e1a598c5b3 disabled ABF tests 2014-02-24 23:26:01 +04:00
mlyashko
e75a257f92 changed epsilon for test passing 2014-02-24 17:47:56 +04:00
Andrey Pavlenko
73dfc4cb8c Merge pull request #2402 from ilya-lavrenov:amd_libs 2014-02-24 16:56:40 +04:00
Andrey Pavlenko
3845b96f6c Merge pull request #2388 from alalek:coverity_bug_fix 2014-02-24 16:54:44 +04:00
Andrey Pavlenko
52a339cba5 Merge pull request #2401 from akarsakov:fix_elem_size 2014-02-24 16:22:28 +04:00
Andrey Pavlenko
0f43345f9e Merge pull request #2394 from ilya-lavrenov:tapi_memop_fix 2014-02-24 16:21:41 +04:00
Ilya Lavrenov
16bfdbd22a dump AMD Blas/Fft 2014-02-24 15:12:42 +04:00
Alexander Karsakov
6d83048ec3 Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale. 2014-02-24 15:10:00 +04:00
Roman Donchenko
681a8c6e18 Merge pull request #2398 from nghiaho12:integral_doc 2014-02-24 14:26:41 +04:00
Nghia Ho
ced8e7a813 Typo 2014-02-24 20:06:20 +11:00
Roman Donchenko
2b0c3eb170 Merge pull request #2389 from SpecLad:ios-big-endian 2014-02-24 12:44:36 +04:00
Roman Donchenko
1cf75c0cab Hardcode iOS's endianness, since the TestBigEndian module doesn't work there 2014-02-24 12:13:35 +04:00
Martin Dlouhy
8f6ebc2427 fixed rotated rectangle (center instead of corner) 2014-02-24 07:54:08 +01:00
Ilya Lavrenov
32eb38ec98 fixed defects from coverity.com 2014-02-23 20:21:08 +04:00
Ilya Lavrenov
0406898b9a int2 -> ulong; to work properly with 3 channels 2014-02-23 15:12:38 +04:00
Ilya Lavrenov
0ef16125ae improved cv::matchTemplate OpenCL part 2014-02-22 14:30:19 +04:00
Rohit Girdhar
fd4461d543 addressed issues 2014-02-22 09:54:16 +05:30
Roman Donchenko
0a90d6dde6 Merge pull request #2266 from vpisarev:ipp_norm_fix 2014-02-21 19:11:57 +04:00
Vadim Pisarevsky
51dafc780b fixed hint type declaration 2014-02-21 18:07:01 +04:00
Roman Donchenko
51421098dd Merge pull request #2201 from mattip:2.4 2014-02-21 17:57:36 +04:00
Matti Picus
dc50dc7254 fix merge 2014-02-21 13:54:58 +02:00
Andrey Pavlenko
3e5890694e Merge pull request #2384 from ilya-lavrenov:perf_match 2014-02-21 15:14:12 +04:00
Alexander Alekhin
9b3c76a3db TAPI: coverity bug fix 2014-02-21 14:04:01 +04:00
Matti Picus
f5330a44e8 merge with origin 2014-02-21 11:59:49 +02:00
Ilya Lavrenov
c7857e8c13 small fixes 2014-02-21 12:19:08 +04:00
Rohit Girdhar
347a3dc520 added randomized test 2014-02-21 12:47:01 +05:30
Matti Picus
31c8f2ec57 fix code, it turns out only TIFFReadRGBATile needs buffer pointer mangling 2014-02-20 22:12:22 +02:00
Matti Picus
46d128e073 add test (needs updated opencv_extra repo) 2014-02-20 22:10:22 +02:00
Andrey Pavlenko
9c5bd85247 Merge pull request #2375 from akarsakov:fix_getGradient 2014-02-20 21:41:43 +04:00
Andrey Pavlenko
b96923d5fa Merge pull request #2377 from alalek:tapi_warpers_perf_test 2014-02-20 21:40:28 +04:00
Andrey Pavlenko
f04a158268 Merge pull request #2383 from ilya-lavrenov:perf_match_template 2014-02-20 21:36:30 +04:00
Ilya Lavrenov
aa5311ea9f backport of master-based perf tests for matchTemplate to 2.4 2014-02-20 18:58:32 +04:00
Ilya Lavrenov
804b70b72f ported 2.4 perf tests for matchTemplate 2014-02-20 18:11:56 +04:00
Elena Gvozdeva
7b552c0493 fixed 2014-02-20 17:34:51 +04:00