mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-07 19:54:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,915 Commits 6 Branches 127 Tags 3 GiB
cc08e00876
Commit Graph

6010 Commits

Author SHA1 Message Date
Andrey Pavlenko
c820777967 Merge pull request #1596 from alalek:test_fix_run_py 2013-10-10 19:02:10 +04:00
Andrey Pavlenko
3b1c53fa8d Merge pull request #1551 from alalek:cmake_install_win 2013-10-10 18:20:35 +04:00
Alexander Alekhin
3eba2011b9 test: run.py: return valid errorCode in case of the single test run 2013-10-10 17:17:10 +04:00
Alexander Alekhin
6b9f74ae84 ocl: fix cleanup on Windows platform (for clAmdBlas/clAmdFft) 2013-10-10 16:58:45 +04:00
Andrey Pavlenko
d5723480e1 Merge pull request #1592 from alalek:ocl_program_cache_update 2013-10-10 15:55:58 +04:00
Andrey Pavlenko
a351161fd7 Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h 2013-10-10 15:55:13 +04:00
Ilya Lavrenov
9d1636daa6 catching OpenCL double not supported exceptions 2013-10-10 12:45:55 +04:00
Alexander Alekhin
d26f62569d ocl: fix compilation warnings, update openCLExecuteKernelInterop 2013-10-10 00:15:02 +04:00
Alexander Alekhin
43c638d07d ocl: remove cl.hpp dependency (it is missed on Nvidia SDK and on some platforms) 2013-10-09 23:53:25 +04:00
Alexander Alekhin
bc089bb18c cmake: update java module install rules 2013-10-09 17:49:11 +04:00
Alexander Alekhin
4adede4246 cmake: python module updates 2013-10-09 17:49:11 +04:00
Alexander Alekhin
555c505b70 update cmake 'install' target for Windows platform 
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
 2013-10-09 17:49:10 +04:00
Ilya Lavrenov
fccd37de7e changes eps for NORM_L1 2013-10-09 14:18:07 +04:00
Ilya Lavrenov
488e6aafaf fixed the PR 1582 2013-10-09 14:16:36 +04:00
Andrey Pavlenko
6b69a66c3c Merge pull request #1579 from ilya-lavrenov:ocl_norm 2013-10-09 13:52:20 +04:00
Andrey Pavlenko
ff8e5a04a4 Merge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix 2013-10-09 13:49:34 +04:00
Ilya Lavrenov
245ff93544 ocl setto fix for windows 2013-10-08 19:11:32 +04:00
Ilya Lavrenov
bdd5038da4 ocl setto fix for windows 2013-10-08 18:52:32 +04:00
Sebastian Krmer
3696174b14 fix documentation warning 2013-10-08 16:49:20 +02:00
Ilya Lavrenov
c404da784f fixed ocl::norm (previously the function used double as a work type) 2013-10-08 18:43:49 +04:00
Sebastian Krämer
4ffd3fb905 add ocl::abs 2013-10-08 15:23:24 +02:00
Sebastian Krämer
c844bbdd82 documentation update for ocl::min and ocl::max 2013-10-08 15:23:18 +02:00
Sebastian Krämer
33df7131ae add ocl::min and ocl::max (includes accuracy tests update) 2013-10-08 15:23:13 +02:00
Roman Donchenko
ae851af648 Merge pull request #1574 from alalek:svm_workaround 2013-10-08 15:31:42 +04:00
Roman Donchenko
65ec9f77d9 Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12 2013-10-08 15:15:31 +04:00
Roman Donchenko
bc3669bfb1 Merge pull request #1576 from alalek:ocl_fix_cl_double 2013-10-08 14:20:11 +04:00
Roman Donchenko
895308a811 Merge pull request #1538 from StevenPuttemans:bugfix_3283 2013-10-08 13:00:39 +04:00
Roman Donchenko
ec409a436d Merge pull request #1545 from alalek:ocl_test_fix_rng 2013-10-08 12:59:50 +04:00
Ilya Lavrenov
32f11e6f40 enabled OpenCL 1.2 branch in oclMat::setTo 2013-10-08 12:49:29 +04:00
Roman Donchenko
95b3a344d9 Merge pull request #1570 from ilya-lavrenov:ipp_warn_fix 2013-10-08 12:32:57 +04:00
Alexander Alekhin
1d6327ba2a ocl: fix Context::CL_* usage 2013-10-08 12:23:46 +04:00
Alexander Alekhin
f63b0dfaf4 svm: disable failed tests 2013-10-07 18:17:10 +04:00
Roman Donchenko
801054d611 Merge pull request #1566 from SpecLad:Wshadow-openni 2013-10-07 15:48:40 +04:00
Ilya Lavrenov
036e99d03a fixed ipp-related warnings 2013-10-05 14:54:00 +04:00
Roman Donchenko
46eeb106e2 Merge pull request #1564 from alalek:cl_runtime_fix_32bit 2013-10-04 18:29:04 +04:00
Roman Donchenko
0a13510293 Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update 2013-10-04 18:25:44 +04:00
Roman Donchenko
2660f4bc59 Merge pull request #1562 from ilya-lavrenov:ocl_integral 2013-10-04 18:12:43 +04:00
Roman Donchenko
aa80250a3d Merge pull request #1532 from alalek:stereo_csbp 2013-10-04 16:43:51 +04:00
Roman Donchenko
1b51270617 Merge pull request #1558 from SpecLad:Wparentheses-equality 2013-10-04 16:32:09 +04:00
Alexander Alekhin
de0f310e81 ocl: tests: RNG usage refactoring 2013-10-04 15:39:39 +04:00
Roman Donchenko
3cfad385ec Fix a -Wshadow warning in cap_openni.cpp. 2013-10-04 14:23:06 +04:00
Roman Donchenko
ca65fe4548 Merge pull request #1535 from asmorkalov:android_ndk_r9 2013-10-04 14:14:20 +04:00
StevenPuttemans
2f474db27f Fix of bug #3283 and bug #3301 
Added extra information for fitEllipse, minAreaRect and addapted ellipse &
ellipse2Poly parameter description.
 2013-10-04 11:19:45 +02:00
Alexander Alekhin
90df620deb ocl: stereo_csbp: divUp -> roundUp 2013-10-04 12:48:26 +04:00
Alexander Alekhin
2d1a6687f9 autogenerated code 2013-10-04 12:40:08 +04:00
Alexander Alekhin
2fdfa37ea5 ocl: runtime, fix 32-bit builds 2013-10-04 12:40:08 +04:00
Ilya Lavrenov
10d60f99dc fixed ocl::integral and enabled perf test for it 2013-10-04 12:33:14 +04:00
Ilya Lavrenov
5f81988699 refactored arithm binary operations in order to make them more scalable 2013-10-04 12:13:22 +04:00
Alexander Alekhin
d74ca7b39d ocl: update module documentation 2013-10-03 23:26:06 +04:00
Alexander Alekhin
7f0680fc8b ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp 2013-10-03 23:26:06 +04:00
Alexander Alekhin
8beb514ecf ocl: merge with upstream/2.4 2013-10-03 23:26:06 +04:00
Alexander Alekhin
16adbda4d3 ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable 2013-10-03 19:50:14 +04:00
Alexander Alekhin
dd9ff587dc ocl: file-based ProgramCache refactoring 2013-10-03 19:50:14 +04:00
Alexander Alekhin
b00f79ac5f ocl: move program names into opencl_kernels.hpp 2013-10-03 19:50:14 +04:00
Alexander Alekhin
e8d9ed8955 ocl: split initialization.cpp into 3 files: context, operations, programcache 2013-10-03 19:50:14 +04:00
Ilya Lavrenov
dafd4da031 removed ocl::minMax_buf, updated doc (operation on matrices) 2013-10-03 18:19:15 +04:00
Roman Donchenko
fa9d092c43 Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp. 2013-10-03 12:04:57 +04:00
Alexander Smorkalov
1aaeb52a4c Android NDK r9 support. x64 NDK support fix for MacOS X. 2013-10-03 11:36:12 +04:00
Ilya Lavrenov
adca219f18 fixed convertC3C4 and convertC4C3 functions in case cols == 1 2013-10-03 10:45:15 +04:00
Andrey Pavlenko
88419f8923 Merge pull request #1507 from pengx17:2.4_fix_test 2013-10-02 19:52:12 +04:00
Andrey Pavlenko
73744904a2 Merge pull request #1542 from alalek:cl_runtime 2013-10-02 19:50:35 +04:00
Alexander Alekhin
12eb340a4e removed invalid comment 2013-10-02 19:35:21 +04:00
Andrey Pavlenko
b396916cdb Merge pull request #1549 from ilya-lavrenov:ocl_perf_norm 2013-10-02 19:14:16 +04:00
Andrey Pavlenko
b2fe053f4d Merge pull request #1548 from ilya-lavrenov:ocl_bitwise_not 2013-10-02 19:14:00 +04:00
Alexander Alekhin
5ab49c4cc2 ocl: cl_runtime: added autogenerated code 2013-10-02 18:32:33 +04:00
Alexander Alekhin
212ad97100 ocl: dynamic load of OpenCL libraries 
Support functions from OpenCL 1.1 / OpenCL 1.2
 2013-10-02 18:32:33 +04:00
Ilya Lavrenov
e8b93040d6 enabled ocl::norm perf test 2013-10-02 16:57:15 +04:00
Roman Donchenko
d019344c9d Merge pull request #1547 from SpecLad:gtest-1.7 2013-10-02 16:46:19 +04:00
Ilya Lavrenov
a613a1a1da fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2 2013-10-02 16:09:29 +04:00
Roman Donchenko
e65eb4e042 Updated Google Test to 1.7.0. 2013-10-02 14:41:00 +04:00
Andrey Pavlenko
75d89f4331 Merge pull request #1533 from alalek:perf_test_update_relative_error_message 2013-10-01 20:17:52 +04:00
Andrey Pavlenko
154fe4f657 Merge pull request #1519 from ilya-lavrenov:ocl_minMax 2013-10-01 20:16:48 +04:00
Ilya Lavrenov
4322c47bb2 removed test_norm.cpp from ocl tests 2013-10-01 17:53:14 +04:00
Alexander Alekhin
a8ac3ec72a ocl: perf test: disable MOG2 (random hungs), enable upload/download 2013-10-01 16:49:11 +04:00
Alexander Alekhin
66e4aead97 perf tests: added SANITY_CHECK_NOTHING() 2013-10-01 16:49:11 +04:00
Ilya Lavrenov
065b40c6c3 fixed and extended ocl::norm 2013-10-01 13:21:43 +04:00
Alexander Alekhin
958604a68e perf test: update error message about relative error 2013-09-30 20:11:39 +04:00
Roman Donchenko
e35bc11504 Merge pull request #1457 from pengx17:2.4_oclsvm 2013-09-30 17:50:29 +04:00
Ilya Lavrenov
a562b5c985 fixed ocl::meanStddev and created accuracy test for this function 2013-09-30 17:37:19 +04:00
Roman Donchenko
54c902dccd Merge pull request #1509 from perping:2.4_docs 2013-09-30 17:37:19 +04:00
Ilya Lavrenov
7379152afb fixed ocl::setIdentity 2013-09-30 16:54:09 +04:00
Ilya Lavrenov
7edcefb2be fixed ocl::phase 2013-09-30 16:02:14 +04:00
Ilya Lavrenov
b864f48274 fixed ocl::sum, ocl::sqrSum, ocl::absSum 2013-09-30 15:12:38 +04:00
StevenPuttemans
f6c802b563 Applied fix suggested in bug 3282 and shortened code 2013-09-30 11:48:01 +02:00
peng xiao
315c054379 Fix new blank line at EOF. 2013-09-30 16:20:43 +08:00
peng xiao
422396ef6a fix build error 2013-09-30 16:17:20 +08:00
peng xiao
f69ccfa43d Add opencl svm. 2013-09-30 16:17:19 +08:00
Ilya Lavrenov
b54228fb83 fixed ocl::countNonZero 2013-09-27 17:35:06 +04:00
Ilya Lavrenov
9dca7555b4 fixed ocl::minMax 2013-09-27 16:25:10 +04:00
Alexander Smorkalov
8cb0921252 pr #1464 reverted as breaking the build for Linux without libv4l library. 2013-09-27 12:17:55 +04:00
perping
1bc20ae6f8 fix warning about addWeighted and remove magnitudeSqr(). 2013-09-27 09:50:37 +08:00
Andrey Pavlenko
0a695eb314 hortening the file names (HighDynamicRange -> HDR) 2013-09-26 17:06:06 +04:00
Andrey Pavlenko
3e91350a31 Merge pull request #1503 from ilya-lavrenov:ocl_arithm 2013-09-26 15:50:54 +04:00
Alexander Smorkalov
26a1a93295 Merge pull request #1464 from StevenPuttemans:bugfix_3186_second 2013-09-26 12:16:02 +04:00
perping
074f9e33cb fix three warning about mog, mog2 and KNearestNeighbour. 2013-09-26 15:30:44 +08:00
perping
f65286d3c6 Update the OpenCL documents. 2013-09-26 14:04:11 +08:00
peng xiao
28ac23c1a1 If device does not support double, returns immediately. 
Double floating points are not default supported by OpenCL.
 2013-09-26 12:59:21 +08:00
Ilya Lavrenov
f5af3ab851 changes in OpenCL matrix operations docs 2013-09-25 19:47:15 +04:00
Ilya Lavrenov
c8821bd909 replaced manually new/delete by AutoBuffer 2013-09-25 15:28:12 +04:00
Ilya Lavrenov
0faac595a8 fixed minMaxLoc kernel (removed compilation errors) 2013-09-25 15:14:10 +04:00
Ilya Lavrenov
544c02407e reverted and generalized original ocl::transpose 2013-09-25 14:22:37 +04:00
Jin Ma
c7c0a41e17 Resolved the bug that the work group size is not valid. 2013-09-25 17:42:56 +08:00
Alexander Smorkalov
6057414a93 Merge pull request #1199 from devernay:2.4-qtkit 2013-09-24 15:36:16 +04:00
Ilya Lavrenov
c87d2d414d removed arithm_absdiff.cl 2013-09-24 14:18:42 +04:00
Ilya Lavrenov
8aa3eb817d refactored arithm.cpp. Extended param list for all the tests 2013-09-24 14:13:10 +04:00
Ilya Lavrenov
b4ad128218 refactoed and extended ocl::transpose 2013-09-24 14:07:54 +04:00
Ilya Lavrenov
799afab23b refactored and extended ocl::exp and ocl::log 2013-09-24 14:02:01 +04:00
Ilya Lavrenov
0730963576 refactored and extended ocl::compare 2013-09-24 13:58:18 +04:00
Ilya Lavrenov
8e0e352d77 refactored and extended binary bitwise operations 2013-09-24 13:54:46 +04:00
Ilya Lavrenov
161674bff2 refactored and extended ocl::addWeighted 2013-09-24 13:51:37 +04:00
Ilya Lavrenov
b20bd470fe refactored and extended ocl::LUT 2013-09-24 13:49:38 +04:00
Ilya Lavrenov
311a7233c2 removed comments from filtering.cpp and imgproc.cpp in ocl module 2013-09-24 13:46:08 +04:00
Ilya Lavrenov
bd36e556a1 removed ocl::magnitudeSqr 2013-09-24 13:39:07 +04:00
Ilya Lavrenov
0ad03162df refactored and extended arithm operations add/sub/mul/div/absdiff 2013-09-24 13:34:55 +04:00
Ilya Lavrenov
5ff5fdd73d marked some methods of ocl::Context as const 2013-09-24 13:17:09 +04:00
Ilya Lavrenov
d64fb235f7 removed needless arithm_2_mat.cl file 2013-09-24 13:15:05 +04:00
StevenPuttemans
1b1fb131b3 Attempt at fixing bug 3186 2013-09-23 16:51:02 +02:00
Alexander Smorkalov
d6d8e96003 Merge pull request #1489 from melody-rain:2_4_knearest_neighbor 2013-09-23 13:34:39 +04:00
Alexander Smorkalov
0cd3d1f4d6 Merge pull request #1482 from ilya-lavrenov:ocl_setTO 2013-09-23 12:56:20 +04:00
Jin Ma
b88f5302e2 Removed unused constructor. 2013-09-23 15:10:00 +08:00
Jin Ma
1bfe39f485 Added knearest neighbor of OpenCL version. 
It includes the accuracy/performance test and the implementation of KNN.
 2013-09-22 10:23:54 +08:00
Jin Ma
06c33df307 Added knearest neighbor of OpenCL version. 
It includes the accuracy/performance test and the implementation of KNN.
 2013-09-22 10:22:09 +08:00
Csaba Kertesz
6fb3b4f41c Fix a memory leak in CvNormalBayesClassifier::train() 2013-09-20 22:36:49 +02:00
Ilya Lavrenov
362a67a695 fixed ocl::oclMat::setTo for 2-channel images 2013-09-20 15:57:38 +04:00
Alexander Alekhin
f1b5cbc8fe ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp 2013-09-18 01:14:41 +04:00
Alexander Smorkalov
6fae07ba88 Merge pull request #1460 from ilya-lavrenov:ocl_divUp 2013-09-17 15:37:44 +04:00
Alexander Smorkalov
14951dc387 Merge pull request #1461 from ilya-lavrenov:ocl_dataOperations 2013-09-17 15:21:34 +04:00
Alexander Smorkalov
d437183388 Merge pull request #1439 from ilya-lavrenov:convertTo 2013-09-17 15:12:02 +04:00
Alexander Smorkalov
9cf301e257 Merge pull request #1449 from SpecLad:dc1394-095 2013-09-17 14:36:30 +04:00
Alexander Smorkalov
8853d19e74 Merge pull request #1452 from alalek:fix_cv_export_templates 2013-09-17 14:35:40 +04:00
Andrey Pavlenko
b3bb42773b Merge pull request #1454 from ilya-lavrenov:ocl_pyrUp 2013-09-17 14:03:40 +04:00
Alexander Smorkalov
2dceb68a21 Merge pull request #1455 from ilya-lavrenov:ocl_test_output 2013-09-17 13:18:52 +04:00
Ilya Lavrenov
6a26c4483f added performance tests for data transfer operations 2013-09-16 23:51:36 +04:00
Ilya Lavrenov
58b84c2fc0 removed needless divUp 2013-09-16 15:48:30 +04:00
Alexander Smorkalov
06a7a1ac47 Bug #1890 Opencv 2.4.0 with QT 4.7.4 and cvcreatebutton exception fixed. 
QVector range check exception fixed.
 2013-09-16 13:42:15 +04:00
Ilya Lavrenov
e0325fe057 removed useless output 2013-09-15 22:04:22 +04:00
Ilya Lavrenov
a5c9d83617 fixed ocl::pyrUp for 2-byte types 2013-09-15 19:56:05 +04:00
Alexander Alekhin
0ee47502d9 remove CV_EXPORT from templates 2013-09-15 13:48:54 +04:00
Roman Donchenko
671e5e39b1 Dropped the HAVE_DC1394_095 configuration macro. 
We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.

Note that 1.0 doesn't have the do_extra_buffering parameter.
 2013-09-13 17:25:21 +04:00
Ilya Lavrenov
9311f84109 disabled MOG tests if no video input support 2013-09-13 12:47:25 +04:00
Roman Donchenko
e3710488a8 Merge pull request #1434 from melody-rain:Added_perf_kalman_cpp 2013-09-12 16:54:21 +04:00
Roman Donchenko
dee2a65978 Merge pull request #1440 from SpecLad:wcast-align 2013-09-12 13:56:23 +04:00
Roman Donchenko
ad52dd37a9 Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186" 
This reverts commit 41b8479d03, reversing
changes made to 531471b0aa.

Reason: breaks the build.
 2013-09-12 12:58:10 +04:00
Roman Donchenko
ac9bc6423a Merge pull request #1428 from ilya-lavrenov:ocl_pyr 2013-09-12 12:48:45 +04:00
Ilya Lavrenov
f20cc2bce8 extended ocl::convertTo 2013-09-12 12:39:03 +04:00
Roman Donchenko
fec697b390 Silenced a few -Wcast-align warnings in the headers. 
We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.
 2013-09-12 12:33:56 +04:00
Roman Donchenko
f31d06f980 Merge pull request #1418 from vpisarev:24_ipp_sepfilter_dft 2013-09-12 12:19:37 +04:00
Jin Ma
f4d0c9b13c Revised the code according to the feedback of the community. 2013-09-12 09:43:30 +08:00
Roman Donchenko
caf9fdbdc3 Merge pull request #1432 from SpecLad:unseq 2013-09-11 13:50:36 +04:00
Roman Donchenko
6fcd9e3830 Merge pull request #1431 from asmorkalov:android_recording_hint 2013-09-11 13:50:03 +04:00
Jin Ma
b9d7e67589 Removed whitespace. 2013-09-11 11:28:36 +08:00
Jin Ma
2e0f613c38 Added performance for Kalman Filter. 2013-09-11 10:19:02 +08:00
Roman Donchenko
6a21eca7e7 Merge pull request #1421 from ilya-lavrenov:ocl_bilateral 2013-09-10 18:59:41 +04:00
Alexander Smorkalov
98cb1dcc9a MediaRecorder hint enabled for all Android devices with API level 14 and above. 
It increases performance on some devices like Nexus4.
Target Android SDK version increased up to 14.
 2013-09-10 18:05:45 +04:00
Roman Donchenko
51ed1873de Eliminated unsequenced assignments to temp3 from dpstereo.cpp. 
They're unsequenced if CV_IMIN3 or CV_IMAX3 are invoked more than once
in a single expression.
 2013-09-10 18:05:23 +04:00
Ilya Lavrenov
6b9c451938 added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown 2013-09-10 17:36:18 +04:00
Roman Donchenko
747f7178ca Merge pull request #1417 from ilya-lavrenov:merge_fix 2013-09-10 11:33:25 +04:00
Roman Donchenko
68901ab471 Merge pull request #1420 from ilya-lavrenov:ocl_perf_hog 2013-09-10 11:32:35 +04:00
Roman Donchenko
260b283fb3 Merge pull request #1413 from melody-rain:2.4_kalman_filter 2013-09-10 11:28:22 +04:00
Roman Donchenko
41b8479d03 Merge pull request #1376 from StevenPuttemans:bugfix_3186 2013-09-09 18:33:11 +04:00
Ilya Lavrenov
16357418d5 increased time limit for bilateral filter performance tests 2013-09-09 18:16:53 +04:00
Ilya Lavrenov
b07b9aca5a fixed HOG perf test 2013-09-09 17:16:47 +04:00
Roman Donchenko
531471b0aa Merge pull request #1412 from jet47:gpu-match-template-nocuda 2013-09-09 16:49:33 +04:00
Roman Donchenko
84435ba741 Merge pull request #1365 from bitwangyaoyao:2.4_bilateral 2013-09-09 16:46:33 +04:00
Vadim Pisarevsky
61f2107829 added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions. 2013-09-09 16:13:39 +04:00
Ilya Lavrenov
7d8bde3330 fixed ocl::merge in case of 2 and types CV_32S and CV_32F 2013-09-09 16:12:01 +04:00
Jin Ma
a4ab3f4ea8 Removed whitespace. 2013-09-09 17:00:33 +08:00
Roman Donchenko
cb0fc230f1 Merge pull request #1387 from vpisarev:ipp_imgwarp 2013-09-09 12:54:32 +04:00
Roman Donchenko
45512a93e0 Merge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp 2013-09-09 12:39:12 +04:00
Jin Ma
2d5a1dacd0 Added Kalman Filter of OpenCL version. 2013-09-09 16:08:23 +08:00
Roman Donchenko
a03c6decaf Merge pull request #1409 from SpecLad:imgproc-test-memerr 2013-09-09 12:03:58 +04:00
Vladislav Vinogradov
c439702f0c added missing gpu::matchTemplate implementation for non-CUDA build 2013-09-09 10:51:44 +04:00
Jin Ma
2fb0d23104 Removed unnecessary process for conversion to 4-channel format. 2013-09-07 10:40:30 +08:00
Roman Donchenko
ff1eb0d582 Merge pull request #1407 from ilya-lavrenov:ocl_test_mog 2013-09-06 16:58:21 +04:00
Roman Donchenko
4f109d1292 Fixed a memory access error in CV_Remap_Test::generate_test_data. 
begin_x[1] is not the second component of the element, but the element
after the one pointed to begin_x. When begin_x points to the last
element, that line overwrites data past the end of the allocation, which,
during my tests, happened to contain the reference count for the matrix.
Hilarity ensues.
 2013-09-06 16:02:41 +04:00
Roman Donchenko
2de8487e58 Fixed a few tests that use uninitialized inputs. 2013-09-06 15:53:42 +04:00
ilya-lavrenov
27947474ec fixed data path 2013-09-06 13:25:56 +04:00
Roman Donchenko
7d62fdc62c GPU resize: removed a few parameter names to avoid unused parameter warnings. 2013-09-06 12:46:58 +04:00
Jin Ma
172242a94e Revised performance test according to the feedback of the community. 2013-09-06 13:39:41 +08:00
Ilya Lavrenov
be98cd2f7f replaced explicit __stdcall by CV_STDCALL 2013-09-05 19:25:03 +04:00
Jin Ma
1366df8250 MOG&MOG2: Modified the performance test according to the feedback of the community. 2013-09-05 19:33:27 +08:00
Roman Donchenko
70711ac6c2 Merge pull request #1400 from ilya-lavrenov:ocl_test_mog 2013-09-05 11:58:52 +04:00
Roman Donchenko
b9ae8623b2 Merge pull request #1398 from ilya-lavrenov:ocl_perf_gemm 2013-09-05 11:56:24 +04:00
ilya-lavrenov
722bdc52a0 enabled gemm and dft erf test 2013-09-04 20:02:02 +04:00
ilya-lavrenov
0f8f489658 changed data path and eps 2013-09-04 18:46:46 +04:00
Roman Donchenko
6ebfa87181 Delete a bunch more trailing whitespace that slipped through the cracks. 2013-09-04 16:13:27 +04:00
Roman Donchenko
33d8d8ffd1 Merge pull request #1392 from SpecLad:flann-uninit 2013-09-04 15:49:14 +04:00
Roman Donchenko
a9975b144a Fixed a bug in FLANN resulting in uninitialized accesses. 
This is fixed upstream in mariusmuja/flann@b615f26, but that fix
would break binary compatibility, so I had to make a different one.

Since the bug isn't quite obvious, here's an explanation. In the const
version of any::cast, if policy is a small_any_policy, its get_value
returns its input argument. So r becomes a pointer to obj, and the
return value is a reference to a local variable, which is invalidated
when the function exits.
 2013-09-04 14:06:34 +04:00
Jin Ma
dd73016c8b Removed whitespace. 2013-09-04 15:00:36 +08:00
Jin Ma
e528f39def Added the performance test for mog and mog2. 2013-09-04 14:37:46 +08:00
Roman Donchenko
c42d61e464 Merge pull request #1283 from melody-rain:new_mog_mog2 2013-09-03 18:43:03 +04:00
Roman Donchenko
b3e73cf7d6 Merge pull request #1388 from bitwangyaoyao:2.4_CLAHE 2013-09-03 18:30:15 +04:00
Roman Donchenko
e7f83619c5 Merge pull request #1378 from StevenPuttemans:bugfix_3115 2013-09-03 12:07:24 +04:00
Roman Donchenko
f50a829943 Merge pull request #1383 from pengx17:2.4_clblas 2013-09-03 12:05:01 +04:00
yao
a70bdfc13f a little fix to tests and sample 2013-09-03 15:02:18 +08:00
pengxiao
ea16539448 Fix a crash of ocl program if clAmdBlas is not linked. 2013-09-03 10:30:37 +08:00
peng xiao
7b3e3f69fb Modify according to @alalek. 2013-09-03 09:31:13 +08:00
Vadim Pisarevsky
e85e4d3ab9 fixed bug in IPP-accelerated morphology; added several IPP imgwarp functions (by Klim) 2013-09-02 18:34:50 +04:00
kdrobnyh
e6ec3dd17f Add IPP support in resize, warpAffine, warpPerspective functions 2013-09-02 18:04:06 +04:00
Roman Donchenko
757e7f842b Merge pull request #1300 from kdrobnyh:FilterBilateral 2013-09-02 17:01:38 +04:00
Roman Donchenko
99043f6fc2 Merge pull request #1385 from asmorkalov:winrt_glob_fix 2013-09-02 16:05:15 +04:00
Alexander Smorkalov
6d3102141c Globbing accuracy test fail on Windows RT fixed. 2013-09-02 04:31:58 -07:00
Roman Donchenko
188d3f02ee Merge pull request #1302 from kdrobnyh:compare 2013-09-02 15:11:20 +04:00
StevenPuttemans
7e638cb0b5 Bugfix 3115: Added not to documentation for python version for 
facerecognizer interface + white + whitespaces remove
 2013-09-02 11:59:35 +02:00
Roman Donchenko
bd7930ada1 Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt 2013-09-02 13:09:22 +04:00
peng xiao
3c2a8912ee Let clAmdBlas library initialize once during program lifetime. 2013-09-02 10:06:01 +08:00
Roman Donchenko
7e4c0ac4d6 Merge pull request #1371 from HapeMask:fix-png-warnings 2013-08-30 17:56:06 +04:00
Roman Donchenko
46d74d7c6b Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect 2013-08-30 17:55:07 +04:00
Gabe Schwartz
b2bedef26f Added interlace handling to PNG decoder. 
libpng 1.5+ recommends a call to png_set_interlace_handling() if you use
png_read_update_info and png_read_image. It will generate a warning
without it.
 2013-08-30 09:49:24 -04:00
Gabe Schwartz
e2441e0034 Removed incorrect iCCP chunks from GUI resources. 
Also removed malformed tEXt chunk from a logo PNG.
 2013-08-30 09:49:24 -04:00
Roman Donchenko
42b4d830e8 Merge pull request #1266 from kdrobnyh:core_stat_functions 2013-08-30 17:26:20 +04:00
Roman Donchenko
96a0afce50 Merge pull request #1236 from pengx17:2.4_fix_retina_color_param 2013-08-30 17:25:07 +04:00
StevenPuttemans
e7921c3fe7 Added changes suggested by bug #3186 : fixing the unplugging of webcam 2013-08-30 13:16:18 +02:00
StevenPuttemans
15f1a48ec4 Updated with comments of speclad 2013-08-30 12:50:06 +02:00
Roman Donchenko
114bec52fe Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests 2013-08-30 12:24:24 +04:00
kdrobnyh
f4aa7ff919 Add IPP support in meanStdDev, minMaxIdx, norm functions 2013-08-29 21:09:19 +04:00
Alexander Smorkalov
114e04ee12 OpenCV version++. Current OpenCv version 2.4.6.2 2013-08-29 19:00:13 +04:00
Alexander Smorkalov
ba26f6d48a Native camera libraries updated. 
Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
(cherry picked from commit fff91eef0b)
 2013-08-29 18:46:45 +04:00
ilya-lavrenov
a6084d2970 enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal 2013-08-29 18:39:09 +04:00
ilya-lavrenov
968c095403 gpu -> ocl 2013-08-29 18:32:06 +04:00
StevenPuttemans
caaf440bd8 Added fix in CMakeLists.txt for contrib module. 2013-08-29 16:09:48 +02:00
kdrobnyh
7a7aa148d4 Add IPP support in compare function 2013-08-29 17:55:57 +04:00
Jin Ma
114f3266d8 Removed performance test. 2013-08-29 17:35:47 +08:00
Jin Ma
4f3349ffe4 Added perf namespace. 2013-08-29 16:24:26 +08:00
Jin Ma
0233c4c198 Removed whitespace. 2013-08-29 15:49:02 +08:00
Jin Ma
14e083f1e0 Removed trailing whitespace 2013-08-29 14:09:00 +08:00
Jin Ma
5728612f95 Removed the trailing whitespace 2013-08-29 14:06:03 +08:00
yao
ab235cda74 fix warnings 2013-08-29 11:59:19 +08:00
yao
26b5eb3e39 add adaptive bilateral filter (cpp and ocl version) 2013-08-29 10:48:15 +08:00
Vadim Pisarevsky
f12702be24 fixed bugs in rectangular morphology case 2013-08-28 19:53:40 +04:00
Vadim Pisarevsky
771feb61c2 fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches) 2013-08-28 17:00:26 +04:00
Roman Donchenko
2b90b20be2 Merge pull request #1357 from SpecLad:less-precomps 2013-08-28 14:52:28 +04:00
Roman Donchenko
cdf6cf2cd8 Merge pull request #1213 from kdrobnyh:color 2013-08-28 13:31:09 +04:00
Roman Donchenko
122d0f8685 Deleted the now-empty ocl perf_precomp.cpp. 
See pull request #1241 for why.
 2013-08-28 13:26:30 +04:00
Roman Donchenko
8bb9994094 Merge pull request #1349 from ilya-lavrenov:ocl_perf_finish 2013-08-28 12:46:01 +04:00
ilya-lavrenov
3c86aa4ae1 appended ocl::finish to test_cycle defines 2013-08-28 00:39:58 +04:00
Vladislav Vinogradov
bff0fad6c3 gpu TVL1 Optical Flow optimization: 
do not calculate sum of error in every round of iteration;
instead the error will be summed every 2nd times or more, 
if the previous sum of error is too far away from threshold.
 2013-08-27 11:21:41 +04:00
peng xiao
040b3b8265 Remove trailing whitespace. 2013-08-27 13:02:34 +08:00
peng xiao
c74c517ce3 Fix build error. 2013-08-27 11:56:11 +08:00
peng xiao
168d1dc18c Make some tweaks to make sum operations less frequently 2013-08-27 11:42:54 +08:00
Roman Donchenko
525b6eca2e Merge pull request #1311 from leszekhanusz:png_palette_alpha 2013-08-26 16:59:45 +04:00
Roman Donchenko
b43890a7e1 Merge pull request #1326 from ilya-lavrenov:perf_ocl 2013-08-26 16:54:59 +04:00
Roman Donchenko
d44adcd6e8 Merge pull request #1336 from jet47:gpu-resize 2013-08-26 16:40:50 +04:00
ilya-lavrenov
d02ccc9590 the code was refactored and old test system code was removed 2013-08-26 12:36:31 +04:00
ilya-lavrenov
4c28a6f0f6 most of the performance tests was rewritten in google-test manner 2013-08-26 11:43:44 +04:00
Vladislav Vinogradov
21c4753fed used global memory access for up-scaling 2013-08-23 18:08:06 +04:00
Roman Donchenko
3182e68b8a Merge pull request #1334 from MarkBelmont:bugfix_1 2013-08-23 16:49:51 +04:00
Roman Donchenko
cae4480834 Merge pull request #1332 from pengx17:2.4_fix_parallel 2013-08-23 14:47:49 +04:00
Vladislav Vinogradov
d1f6a23abf improved texture usage: 
* use explicit extrapolation only for sub-matrixes
* use built-in interpolation for INTER_NEAREST mode
 2013-08-23 13:57:12 +04:00
Vladislav Vinogradov
241cc417f9 added custom implementation for nearest and linear interpolation 2013-08-23 13:57:12 +04:00
Vladislav Vinogradov
3b05acf936 reorganize code for further modifiction 2013-08-23 13:56:35 +04:00
MarkBelmont
cf34b3d65b Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span." 2013-08-23 16:39:39 +08:00
Vladislav Vinogradov
f826bd8bce removed NPP implementation 2013-08-23 12:16:41 +04:00
peng xiao
2519a21935 Fix a potential bug of ParallelLoopBodyWrapper::operator(Range) 
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.
 2013-08-23 15:35:55 +08:00
Ilya Lavrenov
6c4ad9b597 fixer error with incorrect condition 2013-08-22 17:38:55 +04:00
Ilya Lavrenov
ec461a2ff0 added a test for ocl::norm 2013-08-22 17:37:48 +04:00
Roman Donchenko
20bf1aa244 Merge pull request #1321 from asmorkalov:winrt_mode_warn_fix 2013-08-22 12:46:00 +04:00
Roman Donchenko
fe4c7ae4ae Merge pull request #1317 from jet47:gpu-tvl1-optimization 2013-08-22 11:55:24 +04:00
Roman Donchenko
43aec5ad4a Merge pull request #1318 from SpecLad:wow 2013-08-22 11:49:45 +04:00
Jin Ma
1e8194fd3c Optimized mog and mog2, which have much better performance. 2013-08-22 15:42:07 +08:00
Alexander Smorkalov
8aae54b7f4 WindowsRT mode build warning fix. 2013-08-21 23:59:27 -07:00
Roman Donchenko
9c60a2c24c Merge pull request #1316 from asmorkalov:winrt_c4447_fix 2013-08-21 19:24:25 +04:00
Roman Donchenko
3c137f7a04 Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
Roman Donchenko
ebb6c842f9 Merge pull request #1295 from asmorkalov:winrt_ptr_usage_fix 2013-08-21 18:28:36 +04:00
Alexander Smorkalov
b15addec70 C4447 warning about main function format suppressed. 2013-08-21 07:24:46 -07:00
Alexander Smorkalov
d62c98527a Invalid usage of cv::Ptr for arrays fixed. 2013-08-21 07:20:35 -07:00
Vladislav Vinogradov
de214950c4 minor gpu TVL1 optical flow optimization: 
don't calc diff term if it is not used for epsilon criterion
 2013-08-21 18:17:45 +04:00
Roman Donchenko
1a7c2eefb8 Merge pull request #1306 from jet47:gpu-bitwize-fix 2013-08-21 16:18:31 +04:00
Hanusz Leszek
32635a6834 using unsigned char instead of uint8_t to compile under windows 2013-08-21 12:33:51 +02:00
Roman Donchenko
84a9755597 Merge pull request #1215 from jet47:cuda-5.5-sanity 2013-08-21 13:25:28 +04:00
Vladislav Vinogradov
2899d558ac record cuda gpu name to output report 2013-08-21 10:12:44 +04:00
Vladislav Vinogradov
b7ec673001 added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros 2013-08-21 10:00:40 +04:00
Hanusz Leszek
cf39ba5801 Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel 
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
 2013-08-21 05:31:44 +02:00
Vladislav Vinogradov
cb2985c526 fixed gpu bitwize operation: 
incorrect types for template instantiation
 2013-08-20 16:28:45 +04:00
Alexander Smorkalov
e37f7a4c73 Typo in Java generator fixed. 
Typo breaks debug build for Android platform.
 2013-08-19 16:27:06 +04:00
kdrobnyh
c1de14c27a Fix bilateralFilter function 2013-08-19 15:52:34 +04:00
Roman Donchenko
70fffa48e5 Merge pull request #1293 from jet47:gpu-cvtcolor-fix 2013-08-19 14:14:22 +04:00
Vladislav Vinogradov
cfbd791465 fixed gpu cvtColor for BGR <-> YUV 2013-08-19 11:56:58 +04:00
kdrobnyh
3c9f307193 macros -> template in IPP support cvtColor 2013-08-17 20:04:03 +04:00
Nghia Ho
c6858c3fb0 Buffer is accessed out of bounds. 2013-08-17 20:32:13 +10:00
Roman Donchenko
449b99a6d7 Merge pull request #1286 from SpecLad:optflow-sf-init 2013-08-16 19:59:26 +04:00
Roman Donchenko
7919bcef70 Merge pull request #1277 from NCBee:2.4 2013-08-16 19:59:12 +04:00
Roman Donchenko
7d768d2159 In calcOpticalFlowSF, fixed several uninitialized uses of matrices. 
This should fix that pesky test failure that pops up from time to time.

I don't actually know if the default values should be zeros, but the tests
pass, so...
 2013-08-16 14:43:18 +04:00
Roman Donchenko
47b3e7855f Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix 2013-08-16 14:05:39 +04:00
Roman Donchenko
a3bbb3dd3d Merge pull request #1279 from asmorkalov:ocv_opt_tabs 2013-08-16 13:58:14 +04:00
Jin Ma
1bcd1fd3a2 Used perf_precomp.hpp instead of precomp.hpp for test. 2013-08-16 17:39:17 +08:00
Roman Donchenko
46fb737bdc Merge pull request #1152 from StevenPuttemans:bugfix_2795 2013-08-16 12:52:48 +04:00
Roman Donchenko
ac8506db32 Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix 2013-08-16 12:22:18 +04:00
Alexander Smorkalov
a3dd13450c All optimized function tables wrapped to getters to change its 
initialization time.
 2013-08-16 12:10:07 +04:00
Jin Ma
a3aa7966ae Resolved compiling errors under Linux. 2013-08-16 16:07:53 +08:00
Roman Donchenko
35cb59bb22 Merge pull request #1258 from apavlenko:java_video_capture 2013-08-16 12:05:13 +04:00
Jin Ma
916b92bc3b Resolved a compiling warning under Windows. 2013-08-16 15:33:43 +08:00
Jin Ma
8feaadc69f Resolved a compiling error under Linux. 2013-08-16 15:25:11 +08:00
Jin Ma
3fb0bf6e99 Added MOG and MOG2. 2013-08-16 14:19:46 +08:00
Andrey Pavlenko
5a9bd3f080 restoring binary compatibility 2013-08-15 23:49:32 +04:00
Roman Donchenko
95143fdc13 Merge pull request #1275 from rdm12:bug_1922 2013-08-15 19:12:23 +04:00
Alexander Smorkalov
9af2c1661a Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch 
for libpng added.
 2013-08-15 06:42:00 -07:00
Dmitry Retinskiy
ab8c0fde52 applied comments after review 2013-08-15 16:18:01 +04:00
Bahram Dahi
83e21568ee Minor bug fix, missing const in method signature 2013-08-14 15:54:13 -07:00
Bahram Dahi
6cf9070b9a Added ability to read several opencv types (Size, Point, etc.) to FileStorage. Solves issue #3196 2013-08-14 15:08:34 -07:00
Roman Donchenko
7b95bb20f7 Merge pull request #1272 from kamjagin:fixingQTKitPublic2.4 2013-08-14 18:50:26 +04:00
Roman Donchenko
902aa309f8 Merge pull request #1270 from rdm12:bugfix_3094 2013-08-14 18:49:38 +04:00
Dmitry Retinskiy
f013baf739 bug #1922: restored most of the class definitions in basic_structures.rst 2013-08-14 17:37:59 +04:00
Roman Donchenko
6ae9870de4 Merge pull request #1254 from pengx17:2.4_filter2d_ 2013-08-14 17:27:18 +04:00
kamjagin
69287c936b missed # in if defined 2013-08-14 14:25:46 +02:00
kamjagin
c24c1a5926 added HAVE_QTKIT to tests 2013-08-14 13:40:50 +02:00
kamjagin
7ff07e94a3 Fix for bug Bug #3215. Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME 2013-08-14 13:34:34 +02:00
Dmitry Retinskiy
4eb85189e5 bug #3094: added CV_Assert to PyrDown_ to check if source matrix is not empty 2013-08-14 15:30:35 +04:00
Roman Donchenko
bcba3fc6b8 Merge pull request #1263 from abidrahmank:pyCLAHE_24 2013-08-14 12:10:22 +04:00
peng xiao
124ede611b Update with apavlenko's suggestions. 2013-08-14 10:00:09 +08:00
abidrahmank
96c1df14f4 CLAHE Python bindings 2013-08-13 19:51:32 +05:30
Roman Donchenko
43c7a8ae93 Merge pull request #1259 from pengx17:2.4_fix_cvtcolor 2013-08-13 16:34:19 +04:00
Andrey Pavlenko
f3b1933a92 LinkedList -> ArrayList 2013-08-13 15:51:37 +04:00
Andrey Pavlenko
4902db1c42 also fixing JNI library name in JUnit tests 2013-08-13 13:18:01 +04:00
peng xiao
2fb2ac8836 Apply bugfix #3121 for OCL. 2013-08-13 17:17:07 +08:00
Andrey Pavlenko
d4e098f401 enabling of VideoCapture(String) [fixing issue #3207] 
- enable auto-wrap of VideoCapture;
- minor refactoring of generated code templates.
 2013-08-13 12:04:36 +04:00
peng xiao
7fe8403074 Let ocl::filter2D support kernel size >= 3. 2013-08-13 13:58:55 +08:00
Roman Donchenko
390b67e5a0 Merge pull request #1251 from StevenPuttemans:bugfix_3209 2013-08-12 18:56:35 +04:00
Roman Donchenko
dc06d47f1c Merge pull request #1241 from SpecLad:redundant-precomps 2013-08-12 17:19:53 +04:00
Roman Donchenko
57c1e8f333 Merge pull request #1242 from asmorkalov:android_native_cam 2013-08-12 14:47:48 +04:00
Roman Donchenko
504ebda7c4 Merge pull request #1235 from WonderRico:bugfix_dshow 2013-08-12 14:33:30 +04:00
StevenPuttemans
fd056235d3 Added bugfix 3209 : anchor point (-1,1) changed to (-1,-1) 2013-08-12 11:44:38 +02:00
WonderRico
d067749c21 fix _index / index 2013-08-12 11:19:53 +02:00
Roman Donchenko
98cd04c191 Merge pull request #1163 from kdrobnyh:Morphology 2013-08-12 12:06:31 +04:00
StevenPuttemans
d11746e56d Added fix mentioned in bug #3206 
VideoWriter memory leak solved.
 2013-08-12 09:49:19 +02:00
WonderRico
a048387376 fix formating 2013-08-09 16:13:40 +02:00
Alexander Smorkalov
fff91eef0b Native camera libraries updated. 
Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
 2013-08-09 17:43:21 +04:00
Roman Donchenko
167abf0dae Merge pull request #1244 from vkocheganov:bugfix_3179 2013-08-09 11:49:27 +04:00
kocheganovvm
e4b201be25 Fix unsequenced modifications (Bug #3179). 2013-08-08 18:55:47 +04:00
Roman Donchenko
4dc63273f0 Renamed ocl tests' precomp files according to convention. 
Also, added the missing include guard to perf_precomp.hpp.
This should fix the build.
 2013-08-08 18:18:54 +04:00
Roman Donchenko
d9f71b762f Deleted almost all of the precomp.cpp files. 
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
 2013-08-08 12:43:07 +04:00
kdrobnyh
7da5fa01d4 Removed extra {} in erosion and dilation functions 2013-08-08 12:30:28 +04:00
Roman Donchenko
79b6f68f54 Merge pull request #1233 from vpisarev:24_ipp_78 2013-08-08 12:00:52 +04:00
Vadim Pisarevsky
d5539975d7 polished the patch 2013-08-07 22:34:29 +04:00
Andrey Pavlenko
1c55096c01 Merge pull request #1232 from StevenPuttemans:fix_wrong_documentation 2013-08-07 21:05:43 +04:00
StevenPuttemans
ed76b2f98f Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong 
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
 2013-08-07 14:49:33 +02:00
Roman Donchenko
e23f31311d xls-report.py: separated image width and height for easier analysis. 2013-08-07 13:43:03 +04:00
Roman Donchenko
95bdd4b670 Merge pull request #1189 from pengx17:2.4_sort_by_key 2013-08-07 11:41:23 +04:00
peng xiao
5aaed77cbc Fix a bug of retinaParameters. 
When colorMode is set to 0 via Retina::_init method, _retinaParameters's
colorMode variable is not correctly assigned.
 2013-08-07 14:36:24 +08:00
Andrey Pavlenko
a7da129984 Merge pull request #1187 from kdrobnyh:mean_and_sum 2013-08-06 20:54:52 +04:00
WonderRico
7e7fb0b75d Bug #3201 fix 2013-08-06 18:35:49 +02:00
Vadim Pisarevsky
10fde1ca5c disabled 64f IPP DFT; added IPP Gaussian filter; added IPP GetRectSubPix; added IPP BilateralFilter (temporarily disabled) 2013-08-06 18:31:06 +04:00
Roman Donchenko
131458847b Make ts always static. 
This allows us to forget about the GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
macros and to get rid of the dependency on cvconfig.h.
 2013-08-06 17:56:25 +04:00
Roman Donchenko
b2d1d87ed1 Merge pull request #1225 from apavlenko:fix_format_security 2013-08-05 12:58:37 +04:00
Roman Donchenko
4fb2e9a85a Merge pull request #1196 from rdm12:bugfix_3121_cvtcolor 2013-08-05 12:52:15 +04:00
Andrey Pavlenko
7b0734caf9 fixing java test after fix in OpenCV library 2013-08-05 11:45:17 +04:00
Andrey Pavlenko
a06891851d fixing compilation with -Werror=format-security enabled 2013-08-05 11:11:54 +04:00
Andrey Pavlenko
6483754860 Merge pull request #1220 from asmorkalov:msmf_sizet_fix 2013-08-05 10:26:39 +04:00
Andrey Pavlenko
af8a03e17f Merge pull request #1222 from philippefoubert:branch_2.4_pvapi 2013-08-05 10:20:25 +04:00
Alexander Smorkalov
aada5f7844 Difference in method definition and declaration fixed (Bug #3189). 2013-08-04 22:34:36 +04:00
Alexander Smorkalov
2243118fc0 NEON instruction set enabled for WIN32 on ARM by default. 2013-08-04 08:47:42 -07:00
Andrey Pavlenko
ee8687ba19 Merge pull request #1214 from StevenPuttemans:feature_3169_others 2013-08-02 17:59:06 +04:00
Vladislav Vinogradov
d13ecd0d76 increase epsilon for GEMM & Convolve sanity tests for CUDA 5.5 2013-08-02 17:31:34 +04:00
Andrey Pavlenko
f0d854ce39 Merge pull request #1205 from asmorkalov:winrt_api_cert_fix 2013-08-02 16:27:23 +04:00
StevenPuttemans
f28496c628 Added sample links in documentation for python2, ocl and gpu 2013-08-02 14:05:08 +02:00
Alexander Smorkalov
63786c389f Warning and review notes fixes. 
WITH_WINRT -> ENABLE_WINRT_MODE;
Some temporary char* replaced with Ptr<char>;
Build fix for regular WIN32;
Windows Platform SDK and MSVC search added to cmake;
Warinig fixes.
 2013-08-02 04:10:56 -07:00
Vladislav Vinogradov
55cb26551f use NPP version for Fermi 2013-08-02 09:05:21 +04:00
Vladislav Vinogradov
a28cb99e88 optimized version of histEven for CV_8UC1 2013-08-01 18:00:05 +04:00
Vladislav Vinogradov
bfca1afd9e rewrite histEven test 2013-08-01 18:00:05 +04:00
Vladislav Vinogradov
c8d1fccdac compare cv::gpu::calcHist with cv::calcHist 2013-08-01 18:00:05 +04:00
kdrobnyh
c1ad6a9ffb Add IPP support in cvtColor function 2013-08-01 15:15:36 +04:00
peng xiao
fd77a49e76 Fix ocl compilation error when using Intel OpenCL SDK. 2013-08-01 13:06:33 +08:00
Alexander Smorkalov
e03ffde346 WinRT API Certification fixes for core and contrib. 2013-07-31 05:43:53 -07:00
Alexander Smorkalov
62b85a41da TLS calls on WinRT replaced on variables with C++11 "thread" attribute. 2013-07-31 05:43:52 -07:00
Alexander Smorkalov
6257df1c4b API restricted on WinRT partially removed from core. 
Additional CMAKE flag WITH_WINRT added.
 2013-07-31 05:43:51 -07:00
Andrey Pavlenko
9b5d1596dc Merge pull request #891 from NCBee:2.4 2013-07-31 16:38:16 +04:00
Andrey Pavlenko
4c35449b7d Merge pull request #1139 from StevenPuttemans:bugfix_3101 2013-07-31 15:14:03 +04:00
Andrey Pavlenko
d138f77143 Merge pull request #1019 from jet47:opengl-documentation 2013-07-31 15:10:27 +04:00
Andrey Pavlenko
76a938c7ef Merge pull request #1197 from apavlenko:fix_unstable_perf_tests 2013-07-31 15:07:19 +04:00
Andrey Pavlenko
6a40067424 Merge pull request #1206 from StevenPuttemans:feature_3169 2013-07-31 14:31:21 +04:00
StevenPuttemans
4dff5b7c72 Added bugfix #2795 
- changing license header
- fixed bug in QtKit when changing camera resolution
 2013-07-31 11:25:55 +02:00
StevenPuttemans
0c5244103f Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169 
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
 2013-07-31 11:20:05 +02:00
Andrey Pavlenko
0851766806 Merge pull request #1121 from pengx17:2.4_gftt_perf_test 2013-07-30 18:40:10 +04:00
Andrey Pavlenko
6a77bfb503 Merge pull request #1172 from StevenPuttemans:bugfix_3166_24 2013-07-30 18:39:41 +04:00
Andrey Pavlenko
2b8d868560 Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix 2013-07-30 17:50:50 +04:00
Andrey Pavlenko
f7ce70f70a Merge pull request #1110 from SpecLad:config-cleanup 2013-07-30 17:39:35 +04:00
Andrey Pavlenko
c43b896541 Merge pull request #1177 from janstarzy:refactor 2013-07-30 17:39:09 +04:00
Andrey Pavlenko
bc78e87a61 Merge pull request #1123 from bitwangyaoyao:2.4_fix 2013-07-30 17:13:27 +04:00
Andrey Pavlenko
26a3cabbf8 Merge pull request #1193 from SpecLad:exports-for-contrarians 2013-07-30 16:50:29 +04:00
Andrey Pavlenko
eb0d26b5be fixing warning on shadowing local var (TEST_CYCLE_MULTIRUN uses 'r') 2013-07-30 16:42:45 +04:00
Andrey Pavlenko
ea6002ebc7 Merge pull request #1185 from znah:cumpute_method_for_2_4 2013-07-30 15:46:48 +04:00
kdrobnyh
94bc4c4429 Some changes in erosion and dilation functions 2013-07-30 15:13:04 +04:00
peng xiao
8b90cb375a Fix doc build error. 2013-07-30 14:12:22 +08:00
peng xiao
892c088e1b Some modifications to sortByKey API. 
Add documentation.
 2013-07-30 11:53:25 +08:00
kdrobnyh
6af10a2937 Some changes in sum and mean functions 2013-07-30 00:54:27 +04:00
Andrey Pavlenko
301de6e038 Merge pull request #1202 from hansmi:docfix3149 2013-07-29 15:29:22 +04:00
Andrey Pavlenko
e213af6c0d Merge pull request #1190 from melody-rain:2.4_add_farneback_to_superres 2013-07-29 15:25:56 +04:00
Michael Hanselmann
cdc2ee9789 Documentation fix for cv::compare (issue 3149) 
Since commit d8417af086 (July 2011) cv::compare produces an array with
the same size and type as the input arrays.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
 2013-07-28 16:19:19 +02:00
Frédéric Devernay
6be8757e8b fix signedness error 
OpenCV's automatic builds don't care if you store an unsigned int into
an int, but they don't want you to compare signed with unsigned. Does
that make sense?
 2013-07-26 21:32:35 +02:00
Frédéric Devernay
4ad12a680c fix cap_qtkit.mm for multithreaded applications 
cap_qtkit does not work when the capture is run outside of the main
thread.
If the capture is launched in a separate thread, then [NSRunLoop
currentRunLoop] is not the same as in the main thread, and has no timer.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"

Using usleep() (which I previously proposed, and was reverted) is not a
good alternative, because it may block the GUI.

Here is the new proposed solution:
- create a dummy timer so that runUntilDate does not exit immediately
- simplify the loop by using runUntilDate instead of runMode:beforeDate
- fix potential memory leaks (pointed out by Xcode's static analysis)
- fix init to follow Objective-C guidelines
- fax warnings about conversions from size_t to int
 2013-07-26 18:39:03 +02:00
Andrey Pavlenko
3a0e26b89d adding/tuning multiple run for perf tests failing due to big deviation (functions using TBB can work so) 2013-07-26 17:27:31 +04:00
Dmitry Retinskiy
1d571b1eaa bugfix #3121: corrected calculation of blue channel index 2013-07-26 16:31:39 +04:00
Roman Donchenko
ee182eb086 Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared. 
Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.
 2013-07-26 14:35:40 +04:00
Vladislav Vinogradov
dfd2957841 fixed gpu_perf4au perf test (added cuda impl) 2013-07-26 11:13:39 +04:00
peng xiao
a6d558042c Fix build errors 2013-07-26 14:32:37 +08:00
Jin Ma
027b8021b1 Added farneback to superres module. 2013-07-26 14:14:40 +08:00
yao
270b2c7918 generating the lut table instead of hard coding one 2013-07-26 11:17:27 +08:00
kdrobnyh
4dfd40bec0 Add IPP mean and sum functions 2013-07-25 21:27:35 +04:00