Workaround a LLVM/Clang 3.3 bug. #2318
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The LLVM/Clang 3.3 has a bug when compile a cl kernel with assignment of a scalar to a vector data type. This patch could work around this bug. Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
|
Fix looks OK, so 👍. @apavlenko, please comment if you want. |
|
👍 |
SpecLad
pushed a commit
that referenced
this pull request
Feb 13, 2014
Merged
GregoryMorse
referenced
this pull request
in GregoryMorse/opencv
Mar 18, 2014
commit 72341645c01010e94d134c69dde62a23b1e9c744
Author: GregoryMorse <gregory.morse@live.com>
Date: Tue Mar 18 19:56:21 2014 +0800
Update CMakeLists.txt
commit 1f00840f92173a4d4fa9cf1c1ca37b32ce14d8f0
Merge: 366cc92 ae2b0b0
Author: GregoryMorse <gregory.morse@live.com>
Date: Tue Mar 18 19:52:32 2014 +0800
Merge https://github.com/Itseez/opencv
Conflicts:
CMakeLists.txt
commit ae2b0b0098824091a516dc62a59460ba1f85ac9d
Merge: dc28451 40a740f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 18 13:55:56 2014 +0400
Merge pull request #2486 from SpecLad:merge-2.4
commit 40a740ff88b0a0a0d7554ff32870fb3f1e3cf127
Merge: dd6cf15 8829711
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 17 14:14:07 2014 +0400
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/precornerdetect.cl
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf.ocl.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/opencl/arithm_bitwise.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_minMax.cl
modules/ocl/src/opencl/arithm_nonzero.cl
modules/ocl/src/opencl/arithm_sum.cl
modules/ocl/test/test_arithm.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkXYZReader.cpp
modules/viz/src/vtk/vtkXYZReader.h
modules/viz/test/test_precomp.hpp
commit dc28451b8ac6abcf636565104e379898bf2a76a6
Merge: 2a1d5c6 af062b7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Mar 17 14:04:22 2014 +0400
Merge pull request #2479 from alalek:ocl_compare_scalar
commit 2a1d5c6d43899f1ff3ceae0cb5e1841b2994598f
Merge: dd6cf15 e460822
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Mar 17 13:10:34 2014 +0400
Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels
commit af062b7c429957f3b93e89723bbd045483d6ecf7
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Mon Mar 17 12:29:49 2014 +0400
ocl: compare: remove useless perf tests
commit 882971151db79ffffb87017fb56dc8ed9a12b5cd
Merge: 136e5eb 24d8cbf
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 17 11:59:14 2014 +0400
Merge pull request #2485 from Nerei:viz_correct_viewer_pose
commit 136e5eb804872705ac76432ab489ed75405bdc23
Merge: 5726e80 8070800
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 17 11:57:09 2014 +0400
Merge pull request #2484 from berak:mat_doc_24
commit 24d8cbf940d47b6cea39634a6c3a2a051b33cd74
Author: Anatoly Baksheev <no@email>
Date: Sun Mar 16 20:07:05 2014 +0400
Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry)
commit 80708008a411f8beb50e300128b82a8d35921c40
Author: berak <px1704@web.de>
Date: Sun Mar 16 14:04:05 2014 +0100
missing () on Mat::type()
commit 7ce2ca2e0c7749bf5fb00adbe0e188de9678dd2b
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Fri Mar 14 19:50:38 2014 +0400
ocl: workaround for Pow accuracy test failure
commit 9cafd50160760d051469d7902c4782ced9b176fa
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Fri Mar 14 14:01:05 2014 +0400
ocl: fixes
commit 755ca4b7cf5ceb83a2383c76d5cc268efbd513b8
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Mar 13 20:36:23 2014 +0400
ocl: compare with scalar
commit dd6cf15a3943ec0602ff0e0e52334b16daad8a8c
Merge: bcb938e 4698d62
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 14 19:17:03 2014 +0400
Merge pull request #2481 from akarsakov:fix_hog_intel
commit bcb938efbb7612033dfd77b537b69519c56a6a68
Merge: c72a0a1 6f12f1b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 14 19:14:35 2014 +0400
Merge pull request #2483 from ilya-lavrenov:tapi_3_vs_4
commit c72a0a12953d9be8a164d3d42e3d55aed489499b
Merge: 6b434be 6be7869
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 14 19:08:06 2014 +0400
Merge pull request #2482 from ilya-lavrenov:tapi_fix
commit 5726e80f7715baa3e431b945a9096788f6f06af2
Merge: 836635d 61c347f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 14 19:05:55 2014 +0400
Merge pull request #2475 from ilya-lavrenov:ocl_2.4_fix
commit 6b434befc940abf16d22912043bbb3256fc196a5
Merge: 4a4151e 4fafab3
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 14 19:04:18 2014 +0400
Merge pull request #2480 from vpisarev:ocl_orb
commit 6f12f1b3b5895d1cba2be95983f7b35d00ad1b1a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Mar 14 17:25:34 2014 +0400
added 3 vs 4 channels performance tests
commit 6be7869ae87736770f0971e5c245330a3131b75b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Mar 14 16:53:10 2014 +0400
fix for unsupported doubles
commit 4a4151ec97ae73ef544e5443218933c4f6668fb5
Merge: 0ce8f1d 8910508
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Mar 14 15:17:45 2014 +0400
Merge pull request #2474 from akarsakov:fix_getpolicy
commit 4698d621254ab6793e9bb803c5aebacff58f0a77
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Fri Mar 14 14:18:52 2014 +0400
Removed workaround for Intel platform.
commit 8910508b838363ce4f721e5b463cd04cfd225a1a
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Thu Mar 13 10:22:36 2014 +0400
Fixed getPolicy() method to make it thread-safe.
commit 4fafab37867b3e1834634d6c78671fececefffd5
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Thu Mar 13 23:18:41 2014 +0400
fixed extra whitespace
commit 42e604abea2f1f36b321fa58937d2d2d46d2aabf
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Thu Mar 13 23:17:28 2014 +0400
fixed bug in FAST
commit 3e854fa6e5e790cdabf3d53d4ef5d10e799414bc
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Thu Mar 13 22:56:53 2014 +0400
finished OpenCL port of ORB
commit 61c347fb76ce3789e85fb41c526d007f11661870
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 22:56:46 2014 +0400
typos
commit 357a856cf68b6bb63f05f66ba9d7556f292913a8
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 22:35:08 2014 +0400
nonfree perf tests
commit 6f76e7b42dc52308c13f8d64331cbd3ca08aa750
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 19:42:13 2014 +0400
improved performance of bitwise ops
commit 0ce8f1d5ddd00e9d35171a5a790453f7962038aa
Merge: c5bf1c1 48196ad
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 18:55:27 2014 +0400
Merge pull request #2477 from alalek:ocl_cleanup_workarounds
commit c5bf1c108c6c99c9e537b44d42ab03550cf37e2d
Merge: 4233539 9932cf4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 18:42:00 2014 +0400
Merge pull request #2470 from ilya-lavrenov:tapi_reduction
commit 423353961787fe0aaab565c69824e0e345c358e6
Merge: a6c40ab dca401d
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 18:37:05 2014 +0400
Merge pull request #2469 from alalek:ocl_pyrUp_pyrDown_3channels
commit adc15c2bbaecaee5e60345c7c10c4b6cac585219
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 16:27:07 2014 +0400
improved performance of cv::ocl::sum
commit a6c40abfb20729e055aaaee130365a37cfc04a46
Merge: 0764a23 89b7c0d
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 16:56:01 2014 +0400
Merge pull request #2466 from ilya-lavrenov:tapi_transpose_3cn
commit 0764a23eb2050c119a71ba908640012aa01fabdc
Merge: 6b6cfa8 f138b61
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 16:49:56 2014 +0400
Merge pull request #2459 from ilya-lavrenov:tapi_experiments
commit 6b6cfa893d43bc24fb15b690b9400aad71ddf298
Merge: 553673e 9b31e6c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 16:48:38 2014 +0400
Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans
commit 48196ad10b59d619a646b649ae203f9bdb18f1de
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Mar 13 15:45:23 2014 +0400
ocl: cleanup workarounds
commit 3ebfe60008d9a0ea74cac18d1c30bcd8be8d16a9
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 15:35:53 2014 +0400
improved performance of cv::ocl::countNonZero
commit 8e79de35a800560f70631b614265ef12d5f95c29
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 14:57:13 2014 +0400
changes for GFTT
commit a5afcd9f115b82112cb2427f314c8af216655084
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Wed Mar 12 19:58:53 2014 +0400
improved performance of cv::ocl::minMax
commit 553673eeed7d4684abfc95c12c0e287081073c77
Merge: fd8f2c8 5252aa8
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu Mar 13 13:42:20 2014 +0400
Merge pull request #2468 from mlyashko:back_proj_fix
commit fd8f2c8d238fb75f674f075e3c0909eae3a206d6
Merge: 290b934 bbe8654
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Mar 12 18:51:40 2014 +0400
Merge pull request #2463 from ziyangli:master
commit 290b93422c80ecda73b1f05e82683a622e5e0aac
Merge: 702a2a6 95a5545
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Mar 12 17:08:43 2014 +0400
Merge pull request #2465 from SpecLad:merge-2.4
commit 836635d2d5157fa6772a2e3f45313c29f30018b7
Merge: 1bb0c57 4d7a593
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Mar 12 16:53:41 2014 +0400
Merge pull request #2434 from Nerei:viz_continue
commit 4d7a593c254657cd41e4c1659ac5420ef7082d8f
Author: Anatoly Baksheev <no@mail>
Date: Wed Mar 12 16:21:36 2014 +0400
minor cmake fix fo macos
commit 9932cf41a475f389849e4d9089e9882e67e1206a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Wed Mar 12 01:00:29 2014 +0400
3-channel reduction operations
commit dca401d4ccb2e4feaa2fd7c7d8aaa9fc06f70012
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Feb 27 16:25:26 2014 +0400
ocl: pyrUp/pyrDown 3-channel
commit bbe8654c3d9c0c01d8d6ecd836cc27b93aa65245
Author: ziyangli <ziyang.d.lee@gmail.com>
Date: Wed Mar 12 18:16:54 2014 +0800
cleanup
commit 4f5896493ea3e29b7938b70029c11e470a0ec1dc
Author: Ziyang LI <ziyangli@users.noreply.github.com>
Date: Wed Mar 12 18:14:43 2014 +0800
remove a whitepace
commit f138b613b7361a465223dbb8c78848b4b58829c5
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Mar 11 23:41:44 2014 +0400
cv::compare
commit 5252aa8fdd884c001e2ad56fd7fa0ed232f29445
Author: mlyashko <maria.lyashko@itseez.com>
Date: Wed Mar 12 11:30:28 2014 +0400
added data type check for back projection fix
commit 89b7c0dd93f25f20e9e506e2a2d8c09da20d4dcc
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Wed Mar 12 00:08:55 2014 +0400
3 channel support to cv::transpose
commit 2755ae5df918b881331892e4197d2c9587d54917
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Mar 8 01:29:27 2014 +0400
experiments
commit 1bb0c5747c76e5f9936a2f2bb47ea9bbade4a930
Merge: 0084dee 45969bb
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 11 17:41:18 2014 +0400
Merge pull request #2462 from ibtaylor:fix_deblurring_calcBlurriness_var_name_typo
commit 95a55453dffa5a92f65eb26b82723bf6521c4b39
Merge: 702a2a6 0084dee
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 11 17:20:01 2014 +0400
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
commit 702a2a6ff6752851508452c8aa0618c068881a4d
Merge: 5261fbe eb2e8a1
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 16:00:21 2014 +0400
Merge pull request #2373 from mlyashko:optflow_dualtvl1
commit 5261fbe217f345528a18da536d806cfbdd9ff8c7
Merge: 90c5dde e7475bf
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 15:59:11 2014 +0400
Merge pull request #2387 from alalek:ocl_remap_3cn
commit 90c5dde8871407bba72029bd6714526579bc7147
Merge: fd0ab8e 0e2cc5e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 15:58:32 2014 +0400
Merge pull request #2455 from ilya-lavrenov:tapi_fix
commit 9b31e6cd4478d245d493bbff2e2ea373fee524f7
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Mar 11 15:21:14 2014 +0400
changes according to reviewer's suggestions
commit 0084dee05bd9935d7c4df97ac53341cf692ff80f
Merge: 1f8df38 806e924
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 12:57:28 2014 +0400
Merge pull request #2448 from akarsakov:ocl_cxt_termination
commit fd0ab8eba143c464cff9d85cae4d924f4c454d94
Merge: 70e22b6 208831e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 12:44:33 2014 +0400
Merge pull request #2461 from ilya-lavrenov:tapi_calc_hist
commit 1f8df38dbaf363a1311505a776fed6587333271d
Merge: 229aa62 3eff05e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 12:37:11 2014 +0400
Merge pull request #2457 from ilya-lavrenov:ocl_calc_hist
commit 3eff05e3eb9297d0be9bb72f1131eee5947c209c
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Mar 7 14:35:51 2014 +0400
added performance tests for cv::ocl::calcHist
commit e7475bff68e9b3a50e1b5af4418a4066030a82ac
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Feb 20 18:20:08 2014 +0400
TAPI: remap 3-channel
commit e4608229f0de65aad3917b8eef958803f3a12d98
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Feb 27 14:49:36 2014 +0400
ocl: copyMakeBorder 3-channel
commit 786e3b9eee582c98fb4beba4b22e7a8951aa716f
Author: Ziyang LI <ziyangli@users.noreply.github.com>
Date: Mon Mar 10 17:33:13 2014 +0800
Moved x = 0 into the parenthesis
Easier to understand
commit 45969bb3ae6065bc152c62e19c420ada8f6b4315
Author: Ian Taylor <ian@paracosm.io>
Date: Mon Mar 10 03:02:06 2014 -0400
fix variable name typo in calcBlurriness
commit 208831eb5d9a925dd9cb912f1ced6e5cb33f658a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Mar 8 12:20:52 2014 +0400
optimized cv::calcHist
commit efdfca7a112d118868f5ea0ac653182ccbde14d8
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Fri Mar 7 18:55:45 2014 +0400
do not use the large "score" buffer; now without non-max suppression OpenCL FAST is pretty efficient
commit 70e22b682d07a3ed86127f7d071428a67a5a2712
Merge: 2879ff2 193e97a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Mar 7 18:19:00 2014 +0400
Merge pull request #2397 from vbystricky:intelperc
commit 06c138bd644f0c218fb899df90375849802616d2
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Fri Mar 7 18:18:10 2014 +0400
make the correctness test pass
commit 193e97a34ad64425b3ed6f94338ad95f6938ecca
Author: vbystricky <user@user-pc.(none)>
Date: Fri Mar 7 16:25:15 2014 +0400
Move declaration of IVideoCapture class into precomp.hpp, make some methods of IVideoCapture pure virtual
commit 2879ff209875de0a5e40d737dd35204bb1f80afa
Merge: 5dbe73f 4376de7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 14:00:09 2014 +0400
Merge pull request #2437 from ilya-lavrenov:tapi_morph
commit 5dbe73f94d27eb6418ee4e0b4674f26ff7e58893
Merge: 182d74d 050cca0
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 13:54:34 2014 +0400
Merge pull request #2438 from ilya-lavrenov:tapi_flip
commit 182d74d33f3e7dcf603f63a133233b6c7d92dd39
Merge: 451be9e 8660588
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 13:54:12 2014 +0400
Merge pull request #2441 from akarsakov:ocl_platform_vendor
commit 451be9ed538bbad6be61a783c2f4fa247fc83930
Merge: 3cb49ea 86a3ed4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 13:53:43 2014 +0400
Merge pull request #2444 from ilya-lavrenov:tapi_gftt
commit 3cb49eac49bd0c79a13a0b488cee7ff02e8e3955
Merge: 8f34928 4a7289b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 13:52:47 2014 +0400
Merge pull request #2451 from ilya-lavrenov:tapi_fast_covar_data
commit 8f3492851e22a62d6508e02ddd9debbad593dc9e
Merge: d1d451c dc76e6b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 13:51:37 2014 +0400
Merge pull request #2453 from ilya-lavrenov:tapi_sobel
commit 8660588fe9a34052b9a599e568f17ecf1a2a786e
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Wed Mar 5 15:04:44 2014 +0400
Pass vendor macro to opencl kernel
commit eb2e8a11faa496871b3c8d3737a5497db926ddb1
Author: mlyashko <maria.lyashko@itseez.com>
Date: Fri Mar 7 11:15:54 2014 +0400
changed kernel.set to support unsuccssful set
commit 0e2cc5ef637a4a2ea43d92d4955d3310fcce3bbc
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 25 19:32:55 2014 +0400
fix bitwise ops and mask support
commit d1d451c952d9650c859b721431a0852eae95c844
Merge: 2f0fe5b 68957b2
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 6 22:17:44 2014 +0400
Merge pull request #2431 from ilya-lavrenov:tapi_perf
commit 229aa6230092a33ea9ed02a56b07c04c597be738
Merge: f351540 f7a4741
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 6 22:03:01 2014 +0400
Merge pull request #2445 from ilya-lavrenov:ocl_perf
commit 2f0fe5b87b3b4f230589cbfa5d764fb445685550
Merge: f21a948 f404315
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 6 21:55:50 2014 +0400
Merge pull request #2450 from ilya-lavrenov:tapi_test
commit f21a94880eb0abc418ad5578b98354af6ea7c426
Merge: 42f9ee3 d9c5fbc
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 6 21:51:24 2014 +0400
Merge pull request #2452 from ilya-lavrenov:tapi_disable_surf
commit 8e1918e86eb5fc7a85960a37d2452883032d1230
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Thu Mar 6 18:04:04 2014 +0400
added OpenCL-accelerated(?) FAST; for now the tests fail :(
commit dc76e6b4a1129b871d4f9f503ed867e2a6dde6c2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 17:28:00 2014 +0400
added new dtypes to cv::Sobel
commit f351540eda6d174ea2d24b7a90302c6534f6a495
Merge: ba45135 b184d7f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu Mar 6 17:53:31 2014 +0400
Merge pull request #2443 from waveform80:issue-3554
commit 4a7289b22f9ead1d9b7f3a190938407d3f74cab1
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 15:48:57 2014 +0400
improved cv::preCornerDetect
commit d9c5fbc9bafae8dd335b6f600444b36f9fd58319
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 16:49:22 2014 +0400
disable SURF
commit 806e9241a6c0255cde117e24e3a9de6fd315443e
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Thu Mar 6 11:16:38 2014 +0400
Clarifying comments
commit 1291bd1c4a7407d2d07f6a11176718cf8052e0ac
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 15:40:27 2014 +0400
ported fast calculation of covar data
commit f404315368cc45386b672a687bf1f88b8b75cd73
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 12:11:40 2014 +0400
test for clEnqueueReadBufferRect
commit 66ed6a8a50e15c628e56a748b6c9defa5d660152
Author: mlyashko <maria.lyashko@itseez.com>
Date: Thu Mar 6 11:43:01 2014 +0400
macro for normal return from thriveless kernel.set
commit f7a474180be25f472a1e68426f803280454edc56
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 09:24:02 2014 +0400
tuned some tests
commit 86a3ed41621171c92b4a79974a072627d8306c06
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Mar 4 20:04:16 2014 +0400
improved performance of GFTT
commit fde0185a774b258988c9e37efbb8be14090e581a
Author: Anatoly Baksheev <no@email>
Date: Sun Feb 16 21:27:25 2014 +0400
iteractor work
commit 4aa891e77384e88a4e809f92fa2bc9b50f67a07c
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Wed Mar 5 17:57:06 2014 +0400
Remove clReleaseDevice call (workaround for pure virtual call on Windows)
commit 42f9ee3f3e580a2c8495b4b56669f06708de53b1
Merge: 0a3aca2 a80ebfe
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Mar 5 17:28:08 2014 +0400
Merge pull request #2440 from codyrigney92:Master_LKOptFlow_NEON
commit c1dad2178ca4ad3b7154e4026be9c31ef4fb8365
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Wed Mar 5 11:25:37 2014 +0400
Added Device:: isAMD,isIntel,isNvidia methods.
commit d4a1df85be5bbda269e6d877c7dfa6bb00d890fc
Author: vbystricky <user@user-pc.(none)>
Date: Wed Mar 5 13:06:36 2014 +0400
Change text of copyright
commit f9e942f9ef57fdb3245fbb23a598351f0df4e104
Author: vbystricky <user@user-pc.(none)>
Date: Wed Mar 5 11:03:57 2014 +0400
Change text of license and copyright
commit b184d7f27b9115b7532c7e021e11051a74e93fde
Author: Dave Hughes <dave@waveform.org.uk>
Date: Wed Mar 5 02:44:40 2014 +0000
Fix for #3554
v4l2_scan_controls_enumerate_menu is unused and causes ioctl error on
RaspberryPi and possibly other Video4Linux variants. See
http://www.raspberrypi.org/forum/viewtopic.php?f=43&t=65026 for more
detail.
commit a80ebfe28dbc868e876ece3f5aaed38069203290
Author: Cody Rigney <codyrigney92@gmail.com>
Date: Tue Mar 4 14:47:12 2014 -0500
Master Version: Added NEON Optimizations for LK Optical Flow.
commit 0a3aca230cab6bd466e43369397348492d4c1c6b
Merge: c9d8025 be5b5a0
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 4 19:21:15 2014 +0400
Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix
commit ba4513503e7b2b79f6c7f53e7d15b465f5a62d08
Merge: b5248db 767b28f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 4 19:18:11 2014 +0400
Merge pull request #2429 from ilya-lavrenov:master_compatible_tests
commit c9d8025fabd798b05ecd2a88e90d4f283ace5d90
Merge: c00f0fa 653b99c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 4 18:50:14 2014 +0400
Merge pull request #2391 from ilya-lavrenov:tapi_match_template
commit c00f0faf24c0240b471b32d19698085701078c98
Merge: 5527f28 fe38aab
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 4 18:37:26 2014 +0400
Merge pull request #2408 from ilya-lavrenov:tapi_core_opt
commit 5527f2872df6142aac6ae80dc164dd0e891c7075
Merge: 0692a67 7a68e3d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 4 15:32:12 2014 +0400
Merge pull request #2409 from juanmanpr:master
commit b5248dbf3fa7bde48296a3b9de024802254d28db
Merge: fa3f29f fbc69e4
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 4 15:30:26 2014 +0400
Merge pull request #2407 from codyrigney92:LKOptFlow_NEON
commit fa3f29f2b51099c311170e56ef42458f82142bd3
Merge: a600267 099ea91
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 4 13:51:30 2014 +0400
Merge pull request #2439 from ilya-lavrenov:typo
commit 099ea91823f75ccab2976031140c1f25e1ebb8bb
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Mar 3 19:37:47 2014 +0400
typos
commit 0692a674d1bd3a1a4a45214f5e5c9dc44086d740
Merge: 7ecbf45 68edda3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 4 11:49:01 2014 +0400
Merge pull request #2381 from ElenaGvozdeva:ipp_resize
commit a600267b9f63dc9e2115fdf00a73792b48f01984
Merge: af8aa8a 29deff8
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 4 11:46:28 2014 +0400
Merge pull request #2432 from ilya-lavrenov:summary_py
commit 5c867463d2ff7b2b8b6cdb876d674cecbcc484ef
Author: mlyashko <maria.lyashko@itseez.com>
Date: Tue Mar 4 11:36:47 2014 +0400
changed localsize to NULL (reviewers comment)
commit 050cca0422d461fdb0c0a1c5567eb42b8cef06c8
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Mar 3 19:04:32 2014 +0400
improved performance of cv::flip (flip cols)
commit 7ecbf4575118f3c2ceb155ffb9dee4af145bccf0
Merge: 3758068 db85c35
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 3 15:41:06 2014 +0400
Merge pull request #2435 from SpecLad:merge-2.4
commit 4376de7698bda00bec5f278322609f7bac7c2fb6
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Mar 3 15:19:02 2014 +0400
fixed morphology operations
commit be5b5a0471a02e3284c9aee81995fe2893b6e15e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Mar 3 14:32:38 2014 +0400
fixed cv::dft
commit db85c35e696f223bf2e37c5e85be66c7e5a09700
Merge: 3758068 af8aa8a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 3 13:45:22 2014 +0400
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
commit 29deff8707c825d1992a3bda6569a3e5eefb1a36
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Mar 2 16:08:37 2014 +0400
ability to merge logs with intersections only
commit af8aa8a2fa835bd535ec60a8e794f027c3766508
Merge: 409bd16 eedf864
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 3 12:20:34 2014 +0400
Merge pull request #2433 from ilya-lavrenov:typos
commit fb7e74c511077d2307f230abf6d4508bae96535a
Author: Anatoly Baksheev <no@email>
Date: Sun Feb 16 21:27:25 2014 +0400
iteractor work
commit eedf86402dcd3e1e4ba1e9868fab4c03ccd2fbbf
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Mar 2 21:04:17 2014 +0400
typos
commit 68957b27571507aab033f4a5e3bf704e656c2679
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Mar 1 20:08:58 2014 +0400
added some new performance tests
commit 767b28f2e3bf75883edaf79e5a4de5566a1926e2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Mar 1 13:13:24 2014 +0400
tests
commit fbc69e444b67b1643f62be065ca7b1e777abfed6
Author: Cody Rigney <codyrigney92@yahoo.com>
Date: Mon Feb 24 14:15:21 2014 -0500
Added NEON optimizations for LK optical flow (Intrinsics).
commit c1c3139368c97f1d31fc323a90b1e99879a79ba4
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Feb 28 14:15:56 2014 +0400
master-like performance tests
commit 409bd162ff46a43123e2e4fce607a79d61b6318d
Merge: 7dc22b4 e6f6707
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Feb 28 18:22:03 2014 +0400
Merge pull request #2421 from akarsakov:fix_ocl_haar_intel
commit 37580687e65931f8b0b730885c126867e5f17aee
Merge: 57b6850 b9d68ef
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Feb 28 18:21:37 2014 +0400
Merge pull request #2427 from alalek:ocl_build_log
commit 68edda3350554a71cc418b78283ab9a1645a0bb9
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Thu Feb 27 18:10:16 2014 +0400
fixed
commit b9d68ef0610f8adcc981ab6f9f99970c3103cc8a
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Feb 27 12:51:40 2014 +0400
core/ocl: OpenCL build log improvements
commit 57b6850d749a9270a9eba4530c51bf250649fa74
Merge: bd5d840 a3aced2
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Feb 27 09:37:04 2014 +0400
Merge pull request #2415 from vpisarev:fix_stereobm_sse
commit e6f6707558f7237dd74d654aa4460c6befe80472
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Wed Feb 26 18:11:11 2014 +0400
OCL: Fix for Haar classifier (thanks to Konstantin Rodyushkin).
commit 7dc22b4ea68e38278b239d52833f5fe867849a63
Merge: 1db1a83 a228633
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 26 17:34:49 2014 +0400
Merge pull request #2419 from linquize:tgit.icon
commit a228633d319447029de361446c09b027f93c2c98
Author: Linquize <linquize@yahoo.com.hk>
Date: Tue Feb 25 23:34:41 2014 +0800
Add tgit.icon project config
commit bd5d8404c93fc5728264a54a8ac36979526ab87d
Merge: 6931299 ce0557e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 26 12:16:35 2014 +0400
Merge pull request #2393 from ilya-lavrenov:coverity
commit ba5ebaa7588e1442f76f89e0214f0dbecb2f9f49
Author: mlyashko <maria.lyashko@itseez.com>
Date: Wed Feb 26 10:55:18 2014 +0400
changed file name to case-sensitve to support linux
commit 7a68e3d20733d38cd726ad878d6ead77e8e19f31
Author: juanmanpr <juanmanpr@gmail.com>
Date: Tue Feb 25 19:58:08 2014 +0100
CV_Assert for photo module corrected
commit 693129902d9a5b5d8786a5293551e9e5b40c9e04
Merge: c9a4a82 4843250
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 25 19:42:53 2014 +0400
Merge pull request #2399 from SpecLad:merge-2.4
commit a3aced20c1923b477fbca6197e2c326a4da821da
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Tue Feb 25 18:13:51 2014 +0400
fixed difference between SSE2 and C branches of StereoBM; they should now produce absolutely the same results
commit c9a4a82667c84f62af159ee5f9c6c8a0820d7152
Merge: 3693fac fd4461d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 25 17:43:48 2014 +0400
Merge pull request #2358 from rohitgirdhar:rotatedRect
commit ce0557ebb82dd01f3c89ac4cedeb20c1c712feee
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Feb 23 21:07:20 2014 +0400
fixed defects from Xcode
commit 45cc8a5300674bc0259a98c381e52f410ed3fd0a
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Tue Feb 25 16:40:04 2014 +0400
fixed
commit 1db1a8341079d4e928856d09c5797cfe20048dde
Merge: 7dc549f dbb7aa7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 25 15:04:23 2014 +0400
Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix
commit 48432502b6fe166242a25e1f9cc1d7215a72c1bb
Merge: 0a90d6d 2b0c3eb
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 24 14:35:34 2014 +0400
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
commit 3693facd9e322a5873477ff0959a338095074bd2
Merge: 73dfc4c 31fb7c4
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 25 14:21:12 2014 +0400
Merge pull request #2412 from arunjvs:master
commit fe38aab84abe57988bff7a5d6a2699c4d731c8ab
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 25 00:29:17 2014 +0400
core tapi optimization
commit 31fb7c4fecd409897b4cbef2fe93b3d9871405e4
Author: Arun JVS <jvsarun1993@gmail.com>
Date: Tue Feb 25 14:34:32 2014 +0530
Fixed Bug #3568: Build fails with WITH_OPENGL=ON
commit 48e7bc6b30ecb485055607e2c7995255f0059f30
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Mon Feb 24 16:12:50 2014 +0400
fixed
commit 7dc549f16606f0827196b535ac06bd397bd47bf5
Merge: d695d4a c78142a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 25 12:37:01 2014 +0400
Merge pull request #2411 from asmorkalov:android_mat_leak_fix
commit c78142acb016a11385bb0a82c66bdc66fd7b7be8
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue Feb 25 11:50:55 2014 +0400
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.
commit ff8b8ef24cab7e77fe46010802823e74ff4cc61f
Author: vbystricky <user@user-pc.(none)>
Date: Mon Feb 17 17:50:15 2014 +0400
Remove implementation of CvCapture interface for Intel PerC camera. Add IVideoCapture interface and implementation of this one for Intel PerC camera
commit dbb7aa7856282a09eec452ffa25205fcd5bd5659
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue Feb 25 10:36:20 2014 +0400
Highgui_Tiff.decode_tile16384x16384 disabled for Android.
Last changes in test leads to SIGKILL on Android.
SIGKILL is called by out of memory killer.
commit d695d4a0bf382b80067112ea0f4bf14f66ce9076
Merge: 681a8c6 e1a598c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Feb 25 09:12:32 2014 +0400
Merge pull request #2406 from ilya-lavrenov:abf
commit 540a60fca7c68dab442d8e9cb51f1b8f6c7d3774
Author: juanmanpr <juanmanpr@gmail.com>
Date: Tue Feb 25 00:29:07 2014 +0100
Replaced calls to cout from photo module, by CV_Assert
commit 653b99c9bd1e02712105c344ca16c51c0c89a0be
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 24 18:38:33 2014 +0400
new scheme of sqrSum
commit e1a598c5b33f92491573541a744abf64c6860e59
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 24 23:26:01 2014 +0400
disabled ABF tests
commit e75a257f929079c9e21a0821092c7a00d137d2c2
Author: mlyashko <maria.lyashko@itseez.com>
Date: Mon Feb 24 17:47:56 2014 +0400
changed epsilon for test passing
commit 73dfc4cb8c866a45e02a4c2041882c4a7cd681ac
Merge: 3845b96 16bfdbd
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 24 16:56:40 2014 +0400
Merge pull request #2402 from ilya-lavrenov:amd_libs
commit 3845b96f6cbdf243a4828d27921b038a674f5734
Merge: 52a339c 9b3c76a
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 24 16:54:44 2014 +0400
Merge pull request #2388 from alalek:coverity_bug_fix
commit 52a339cba58404e24febd4243a52124dca73c1d7
Merge: 0f43345 6d83048
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 24 16:22:28 2014 +0400
Merge pull request #2401 from akarsakov:fix_elem_size
commit 0f43345f9e7f002b89cdac513af0ce9601ae3a3a
Merge: 0a90d6d 0406898
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 24 16:21:41 2014 +0400
Merge pull request #2394 from ilya-lavrenov:tapi_memop_fix
commit 16bfdbd22a228b7d541a22c4c600a1bb48de37d4
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 24 15:12:42 2014 +0400
dump AMD Blas/Fft
commit 6d83048ec372080e62727bc43d8eaa5c9404d8cb
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Mon Feb 24 15:10:00 2014 +0400
Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale.
commit 681a8c6e18453dd5524f55ce2ff3eef432ca61af
Merge: 2b0c3eb ced8e7a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 24 14:26:41 2014 +0400
Merge pull request #2398 from nghiaho12:integral_doc
commit ced8e7a8131c327cd4a00e72c1fb192fa2e3dd0f
Author: Nghia Ho <nghiaho12@yahoo.com>
Date: Mon Feb 24 20:06:20 2014 +1100
Typo
commit 2b0c3eb17086c10c0ccd04adc03d915f94bf3287
Merge: 5142109 1cf75c0
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 24 12:44:36 2014 +0400
Merge pull request #2389 from SpecLad:ios-big-endian
commit 1cf75c0cabff9699ab80d078629f9af0f71f1ec1
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 21 16:08:49 2014 +0400
Hardcode iOS's endianness, since the TestBigEndian module doesn't work there
commit 32eb38ec984b098b56b3358d8ba5edd0b721c6ed
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Feb 23 14:59:06 2014 +0400
fixed defects from coverity.com
commit 0406898b9ae5d2e682bfad5ac62b1723f9bf88eb
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Feb 23 15:12:38 2014 +0400
int2 -> ulong; to work properly with 3 channels
commit 0ef16125ae71e02d4a97dc2970dd5d8db4addc46
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Feb 22 00:43:03 2014 +0400
improved cv::matchTemplate OpenCL part
commit fd4461d54389e9674b97c64a445baa7ed3e95980
Author: Rohit Girdhar <rohit@iiith>
Date: Sat Feb 22 00:26:10 2014 +0530
addressed issues
commit 0a90d6dde6cedcc98c1f5663798ffde32831d864
Merge: 9c5bd85 51dafc7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 21 19:11:57 2014 +0400
Merge pull request #2266 from vpisarev:ipp_norm_fix
commit 51dafc780bcfd70016662bb6470f2c897cdfb336
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Fri Feb 21 18:07:01 2014 +0400
fixed hint type declaration
commit 51421098ddb7c15f8385c6078d789d624ffc6ca4
Merge: 3e58906 dc50dc7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 21 17:57:36 2014 +0400
Merge pull request #2201 from mattip:2.4
commit dc50dc72548a9b7c970610ee95a7797e644040be
Author: Matti Picus <matti.picus@gmail.com>
Date: Fri Feb 21 13:54:58 2014 +0200
fix merge
commit 3e5890694e81ef2cc765821c072f3b0200a24741
Merge: efafd4a aa5311e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Feb 21 15:14:11 2014 +0400
Merge pull request #2384 from ilya-lavrenov:perf_match
commit 9b3c76a3db1700c884bec2d07d303a35fc438de7
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Fri Feb 21 14:04:01 2014 +0400
TAPI: coverity bug fix
commit f5330a44e834603bc86eae7de2e7b5f9141a5fa4
Merge: 31c8f2e efafd4a
Author: Matti Picus <matti.picus@gmail.com>
Date: Fri Feb 21 11:59:49 2014 +0200
merge with origin
commit c7857e8c1341426f9a16c55ac0923adec5a996d0
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Feb 20 16:05:50 2014 +0400
small fixes
commit 347a3dc520358738c1b42654de2e37651c2174d8
Author: Rohit Girdhar <rohit@iiith>
Date: Fri Feb 21 03:00:03 2014 +0530
added randomized test
commit 31c8f2ec57138aa2708aa2b59f930d4102c0d7e8
Author: Matti Picus <matti.picus@gmail.com>
Date: Thu Feb 20 22:12:22 2014 +0200
fix code, it turns out only TIFFReadRGBATile needs buffer pointer mangling
commit 46d128e073a0736f93301f98446f3e721a3e3fd1
Author: Matti Picus <matti.picus@gmail.com>
Date: Thu Feb 20 22:10:22 2014 +0200
add test (needs updated opencv_extra repo)
commit 9c5bd852478f1ae7ef5ffc1650b8d470058fe6e9
Merge: b96923d 7e4dea9
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Feb 20 21:41:43 2014 +0400
Merge pull request #2375 from akarsakov:fix_getGradient
commit b96923d5fadbb629ee61c15fa4166a447fd7480b
Merge: f04a158 ddd3c06
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Feb 20 21:40:27 2014 +0400
Merge pull request #2377 from alalek:tapi_warpers_perf_test
commit f04a158268de6a0ce4860d92383459af4d99301a
Merge: ad66233 804b70b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Feb 20 21:36:30 2014 +0400
Merge pull request #2383 from ilya-lavrenov:perf_match_template
commit aa5311ea9fdc21f4b76df555aa0d1a9d529bb325
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Feb 20 18:55:08 2014 +0400
backport of master-based perf tests for matchTemplate to 2.4
commit 804b70b72fc5e10cd20355562bfc598ee1293986
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Feb 20 18:11:56 2014 +0400
ported 2.4 perf tests for matchTemplate
commit 7b552c0493bc8e030318b9c452a0070c94e451cf
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Thu Feb 20 17:34:51 2014 +0400
fixed
commit ea7b1bb3d2418ffa34a155ce7b80239ef6a02a5d
Author: Rohit Girdhar <rohit@iiith>
Date: Thu Feb 20 17:51:48 2014 +0530
added test, doc
commit cd68cd43a211b2a2408edae9a8617646c6c5f2c6
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Thu Feb 20 16:13:05 2014 +0400
Fixed
commit 10f2a038c2f30e78e14e530a6c9f9c17d618a1c5
Author: mlyashko <maria.lyashko@itseez.com>
Date: Tue Feb 18 14:24:30 2014 +0400
Optical flow dualt tvl1 ocl-based implementation and tests
commit e013d31715fe1f1d57389f959f8bf241ce3d583a
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Thu Feb 20 14:01:22 2014 +0400
Added IPP function for resize()
commit 7e4dea968cdddc6e527deb5d72a9d381c8919843
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Wed Feb 19 16:32:17 2014 +0400
Fixed typo with indexes in getGradient(x/y) functions.
commit ad662337745d98c1d254af0b18c6bc003de8ee55
Merge: 61976b8 fa05994
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu Feb 20 13:43:22 2014 +0400
Merge pull request #2376 from GrinIara:master
commit efafd4a9e5cce08b10441041e6295112e8f26c62
Merge: ce42593 7fd21d2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu Feb 20 13:41:45 2014 +0400
Merge pull request #2380 from jet47:fix-3562
commit 61976b84617f094e1849e874dcbea7ca49837628
Merge: ccbceb5 79eba54
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu Feb 20 13:39:54 2014 +0400
Merge pull request #2325 from alalek:perf_fix
commit 79eba54a4f7b3d16e8687ea2c5b029bc43764159
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Wed Feb 12 18:12:22 2014 +0400
some fixes in perf tests
commit ddd3c062b55c03bb95aa40d230543ccd2912f7b2
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Wed Feb 19 20:30:27 2014 +0400
TAPI: fix perf test for warpers
commit 7fd21d217ad7cc027f5cdd3474b17df71343ba2a
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Thu Feb 20 10:24:52 2014 +0400
fix bug #3562:
add missing __syncthreads to edgesHysteresisLocalKernel
commit fa0599448dddd16519cee0b0e95542c6e9c892a6
Author: GrinIara <yaroslava.grin@gmail.com>
Date: Wed Feb 19 17:06:33 2014 +0100
Fixed compilation error due to missing std::.
commit b939b4ae3b76b97b7041b5c37e40e3b34ffd086f
Author: Rohit Girdhar <rohit@iiith>
Date: Wed Feb 19 20:58:40 2014 +0530
removed inline, changed interface
commit 8bf616e4c78d5e1133c634b4059f25a162f5ab36
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Wed Feb 19 18:34:34 2014 +0400
added color image support via L*a*b*
commit 634e8d37cc208f5f0f54891d7dc7d4f991769e7f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Wed Feb 19 18:13:09 2014 +0400
fixed for 2 channels
commit bf4f15fb5fd6aaf4e014de2aeef9070c7d858b9a
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Wed Feb 19 14:00:39 2014 +0400
TAPI: fix OpenCL warpers and test
commit 7faf1f6277cf780b78c591c38fb569cf43236dcd
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 18 19:38:50 2014 +0400
some improvements
commit ccbceb56c488892f5d0f0a384750028a11082af7
Merge: cfc4621 75b80e5
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 19 14:48:56 2014 +0400
Merge pull request #2144 from nickdademo:pvapi_framestarttriggermode
commit cfc4621587538ac34cd960d45f6b5154da695cd9
Merge: 3782c32 0d199b4
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 19 14:33:57 2014 +0400
Merge pull request #2291 from xgvargas:extra-note-for-waitKey
commit ce42593fe684a88c82aba121fb9bb433bb3aea34
Merge: 7cbc4e8 4c1ed13
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 19 12:03:06 2014 +0400
Merge pull request #2368 from asmorkalov:ocv_gcc48_warning_fix
commit 7cbc4e88de6317ee7e531c618da1c96d92c8a059
Merge: 8754adc 01a980a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 19 12:02:40 2014 +0400
Merge pull request #2357 from akarsakov:fix_ipp_compilation_linux
commit 4c1ed138461400a8d74801a92c9cc048d8539723
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue Feb 18 12:01:01 2014 +0400
Warning fixes for GCC 4.8.
commit 72c327fef882421d6403b00e66397b29efeae801
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 18 19:23:38 2014 +0400
hope it finally works
commit 8754adc021fd389ad454f99f786a4c7d275f56be
Merge: af9368d e460a29
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 18:00:13 2014 +0400
Merge pull request #2371 from ilya-lavrenov:typo
commit af9368d35fbc59506e8072cd4123c5a1cae5902e
Merge: c35dab9 da9bdf9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 17:00:53 2014 +0400
Merge pull request #2370 from ilya-lavrenov:cuda_nlm_typo
commit c35dab904680d8a074f523360f631e9f063230ce
Merge: 6f19ef8 e35d98e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 17:00:32 2014 +0400
Merge pull request #2359 from SpecLad:moments-no-vectorize
commit 3782c324c41b9636e8303fe24fd4ab7c48388712
Merge: edbff68 44ecb72
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 15:49:18 2014 +0400
Merge pull request #2098 from pxli168:patch-1
commit 6f19ef863186beda3546acfcdf58c04a50b613a0
Merge: 5cb2d1c 77df594
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 15:44:56 2014 +0400
Merge pull request #2361 from alekcac:ios_camera_changes
commit 38cbe9873a8076116ec450f204ad93ef05293352
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 18 00:06:32 2014 +0400
small fixes
commit 9db28f332acf53eb2001249af33919b4ac742377
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 17 19:27:34 2014 +0400
more fixes
commit 891dbeabbabf586be357c4897d0dbcca81185d0a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Feb 16 21:54:51 2014 +0400
implemented OpenCL version of cv::fastNlMeansDenoising
commit d27068f79ada4d1a344d2e2381ee239af2946178
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Feb 13 15:15:05 2014 +0400
some more refactoring
commit e16d89e8d68895d5899b7fded655b98185ceeb54
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 11 19:08:13 2014 +0400
some refactoring
commit 5cb2d1c20d01d155f1a7cf216eaa6d30d2f0b11b
Merge: b7659c6 de6d130
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 14:25:16 2014 +0400
Merge pull request #2338 from asmorkalov:ocv_gcov
commit e460a29cab9d929de3d12632718f7c677a20d5c7
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 18 14:24:17 2014 +0400
typo
commit da9bdf9c15e435364d52cc317d3e119ca4aaae44
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 18 14:16:54 2014 +0400
fixes typo and unused variables
commit 77df5948e78cc630c8f6478f276b386c8affaa61
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Tue Feb 18 13:56:26 2014 +0400
removed trailing spaces
commit e35d98e566b628d52660854bf9a6e56c0251654e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 16:08:28 2014 +0400
Worked around an apparent GCC bug in moments.
commit b7659c62f393dfb80a6e6fc06772f91fe7f37a54
Merge: e6420c5 394c74b
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 13:47:45 2014 +0400
Merge pull request #2366 from yashdv:mat_copyto_doc_bug
commit edbff68843c5adc5e7261ad5798c527e38cc0c3b
Merge: b3cfe6b f60913d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 13:36:33 2014 +0400
Merge pull request #2355 from alekcac:hough_circles_fix
commit 394c74b349d1d0e912324b9e2136700be0a39e8b
Author: yash <yashdv@gmail.com>
Date: Tue Feb 18 15:04:27 2014 +0530
edited the doc for mat::copyto and clarified the part regarding reallocation by .create
commit e6420c523d73e3d92007c1e1577fa90955a3c02a
Merge: 689589e d1606b4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Feb 18 13:33:15 2014 +0400
Merge pull request #2235 from alalek:ocl_svm_perf_test
commit b3cfe6b4469420600db50c7257b106c3aef2c3c9
Merge: ff9a081 915fb63
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Feb 18 13:27:38 2014 +0400
Merge pull request #2341 from alalek:ocl_fix_error_processing
commit ff9a0815b9ad88f09bc55e8b8320745aa94869da
Merge: 2409812 6ad7b64
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Feb 18 13:24:40 2014 +0400
Merge pull request #2352 from ilya-lavrenov:flann
commit de6d13088fc435e1cdc4c6ae4221a3912b80b2ca
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Fri Feb 14 17:43:33 2014 +0400
gcov tool support added.
commit 2409812803416e32e3c11728ab833c3885ff459d
Merge: 139a262 768da4d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 12:57:25 2014 +0400
Merge pull request #2347 from Chechli:master
commit 139a2620724a5774b751062313b8e9615798ea7e
Merge: bcf4307 afd99c9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 12:15:48 2014 +0400
Merge pull request #2367 from jet47:fix-3544
commit bcf4307345282572859bda676e51eb3b659f5ec9
Merge: 9885a67 029ffb7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 12:14:57 2014 +0400
Merge pull request #2356 from SpecLad:merge-2.4
commit 689589ebaa8c56c2a76e1a2b63dece7181654141
Merge: 95d7ecb 017a282
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 11:58:10 2014 +0400
Merge pull request #2365 from yashdv:image_tutorial_doc_bug
commit 95d7ecb33f022a5e0279896209f9848590b98621
Merge: 13182da 01527c4
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 11:57:35 2014 +0400
Merge pull request #2364 from ilya-lavrenov:unused_field
commit 13182da945ee23e9635bd3a09374cb7f4d462e4e
Merge: a0a4f6c a8eab26
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 11:56:57 2014 +0400
Merge pull request #2363 from alekcac:introduction_tut_fix
commit a0a4f6c23d8cf728fc42a59acaee2d456052cda5
Merge: 224124b 63235f5
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 11:56:36 2014 +0400
Merge pull request #2362 from alekcac:docs_style_change
commit 224124b69ea8c2d2297b8edb2cb0cec730ab6af0
Merge: e8d26b0 8236181
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 11:56:20 2014 +0400
Merge pull request #2360 from Evgenij-Gr:XLSreport
commit 768da4d95a77d8a7248350d53e0337b507041072
Author: Chechli <lukasz.chechlinski@gmail.com>
Date: Tue Feb 18 08:50:33 2014 +0100
Update hough_circles.cpp
commit afd99c9c81ec37a294b14612ff98a4af6daabe29
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Tue Feb 18 10:45:47 2014 +0400
fix bug #3544:
add "opencv2/core/utility.hpp" header to precomp.hpp
commit 38ef8894b7f5e85217faa6e44cf7d10fc4bc7020
Author: yash <yashdv@gmail.com>
Date: Tue Feb 18 10:51:05 2014 +0530
Made a sentence in the doc for Mat::copyTo more clearer
commit 017a282c7ab2a83922107ba5c425fb35a7ef43dc
Author: yash <yashdv@gmail.com>
Date: Tue Feb 18 10:34:58 2014 +0530
Minor error in the documentation Load and Save Image
commit 0d199b40483b321cbc27bd35dbaf09a3201e70d7
Author: Gustavo Vargas <xgvargas@users.noreply.github.com>
Date: Mon Feb 17 23:22:18 2014 -0300
Update py_image_display.rst
commit 44ecb727c559c3545203919292901405197fe0b4
Author: pxli168 <pxli168@163.com>
Date: Tue Feb 18 10:13:30 2014 +0800
Change again.
Opps.
commit 6ad7b64912755cce33ce4bd8b21a47da8a0547cc
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 17 03:00:20 2014 +0400
some more changes
commit 01527c44fd23c6a5956557910710fae2a7880a95
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 17 21:50:00 2014 +0400
removed unused field
commit a8eab26bae0bc7f7f38e9e72235896311c65de72
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Mon Feb 17 18:10:08 2014 +0400
fixed incorrect code in introduction tutorial
commit 63235f51f06f15b0eddeb3a212808f91f574400b
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Mon Feb 17 17:56:12 2014 +0400
fixed year in copyright
commit 9885a671ee819d0443a6dc62a3c8a204514405af
Merge: 47d9b93 9b627a5
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 17 17:53:05 2014 +0400
Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup
commit 47d9b933f666888e7fca8345ad77f6b42219f04a
Merge: aeeb9f9 7629bb7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 17 17:38:26 2014 +0400
Merge pull request #2345 from ilya-lavrenov:tapi_3cn_perf
commit cc529d971b7fb6b459c9cc5acde44cf1afded5d9
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Mon Feb 17 17:37:02 2014 +0400
removed tabs
commit aeeb9f9e25f27cad2092530ff51d28e841e35542
Merge: 01b225a 95e38e4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 17 17:34:19 2014 +0400
Merge pull request #2334 from alalek:umat_usage_flags_2
commit a879e1fcd69490f2a93cc88665810e72e6ca677d
Author: Rohit Girdhar <rohit@iiith>
Date: Mon Feb 17 19:00:36 2014 +0530
fixed warnings
commit 8236181c627448bf5e662648ab78ffc60d7d835e
Author: Evgeniy <evgeniy@evgeniy-MS-7850.(none)>
Date: Mon Feb 17 17:01:23 2014 +0400
Added more colorizing options to XLS generating script
commit 01a980aa9e2293c079012ead3976ed51223dbcbb
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Mon Feb 17 15:28:21 2014 +0400
Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries.
commit 01b225acb0ddc5af83767cd8969e3aeaa12e347e
Merge: a6d64e2 c8e22c0
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 17 16:45:40 2014 +0400
Merge pull request #2340 from ilya-lavrenov:tapi_lab
commit 613a17355de653d52d6f8d82339d3f3520375964
Author: Rohit Girdhar <rohit@iiith>
Date: Fri Feb 14 09:37:39 2014 +0530
rotRect using points
commit 029ffb7c2d3916958404d4ebe7ed87c0d4444e6e
Merge: a0bb74a b6dafed
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 15:24:05 2014 +0400
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
commit a6d64e254fdc5b063d5124bd93c4b10a5c41affd
Merge: a0bb74a f85aa92
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 15:00:42 2014 +0400
Merge pull request #2354 from gleb-sternharz:Branch_2.4.8
commit e8d26b02acae9c7c15f346bc5e352d8aed7ade59
Merge: 7358b44 8b8c368
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 13:35:15 2014 +0400
Merge pull request #2339 from jet47:gpu-warnings
commit 7358b442227c7994bcf65c398d773cf9504c56d2
Merge: b6dafed cce225f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 13:33:28 2014 +0400
Merge pull request #2343 from yashdv:template_matching_doc_fix
commit 9a98cd6e6520d348b0be067360236c50181e9983
Author: Marijan Vukcevich <marijan@eastsideinteractive.com>
Date: Tue Feb 4 10:10:50 2014 -0800
Update cap_ios_abstract_camera.mm
AVCaptureVideoPreviewLayer setOrientation is depricated. This fixes the warning and provides backward compatibility.
commit f60913ddd3584045132a6e0ea3bd5bd9b1e26845
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Mon Feb 17 12:55:19 2014 +0400
small changes in hough circles tutorial
commit 9211d1ac2d2b081cce64a00e9392a9458b00f13e
Author: Chechli <lukasz.chechlinski@gmail.com>
Date: Mon Feb 17 09:50:32 2014 +0100
Update hough_circles.cpp
commit 640a45d3596003cad3845d877ba592f3570c54b3
Author: Chechli <lukasz.chechlinski@gmail.com>
Date: Mon Feb 17 09:48:51 2014 +0100
Update precomp.hpp
commit a0bb74a086d33a57509d147fccfdb3abd28b37dc
Merge: cfcf07a 8829e9f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 12:24:48 2014 +0400
Merge pull request #2337 from pmoulon:master
commit cfcf07acfae100c98586baae563d375204a36154
Merge: 947fb74 a4b5641
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 12:23:59 2014 +0400
Merge pull request #2328 from rohitgirdhar:bugfix_blobdetector_kpt_radius
commit 947fb74c18485b7c0efcaa2982a07bbcfcbc57a3
Merge: f252687 01b624e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 12:22:11 2014 +0400
Merge pull request #2330 from rohitgirdhar:linux_tutorial_make_j8
commit b6dafed5ba920ec804b5ee93809a47c7099e8820
Merge: 8cbb284 e2f5001
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 12:21:19 2014 +0400
Merge pull request #2342 from yashdv:android_doc_fix
commit 8cbb284b7b8626b0824802141bedbb723267a906
Merge: 9fcb0b2 510680a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 12:02:58 2014 +0400
Merge pull request #2348 from ilya-lavrenov:typo
commit f252687eae591c07f3c1a0e51d48f901871a6a08
Merge: 3542da7 1a89a03
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 11:58:02 2014 +0400
Merge pull request #2351 from yashdv:BOW_assert_error
commit 9fcb0b220128812acf7fc1741b469fb47221ef5c
Merge: aad289a 150e522
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 11:52:00 2014 +0400
Merge pull request #2349 from jet47:fix-bug-3552
commit aad289a3a292d0c090e7f7a56d9a998f7faac917
Merge: e0d991c ed1aa73
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 11:48:03 2014 +0400
Merge pull request #2344 from kirill-kornyakov:replace-gittip-button
commit f85aa929f1b0227c6ed2bc983fee8ebf34f48433
Author: gleb.sternharz <gleb.sternharz@gmail.com>
Date: Mon Feb 17 04:08:30 2014 +0100
fix dev by 0 in KL-Divergence
commit 70d462b3526027ec1f27dbb054bf6c3d8336a923
Author: pxli168 <pxli168@163.com>
Date: Mon Feb 17 10:21:18 2014 +0800
Simplify the code
Simplify the code as @SpecLad suggested.
commit f74ef644bc5f3de6a7e6035c25155d6de741a2bf
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 17 01:37:32 2014 +0400
changed the signature of add method according to the base class
commit 1a89a03c7c7cb6f9ad69b65be7dc05dd8e6e404e
Author: yash <yashdv@gmail.com>
Date: Sun Feb 16 22:33:30 2014 +0530
Fixed CV_ASSERT condition in the code for bag of words
commit 10465c546aaf6e535d40a2c66822ef630108add8
Author: Chechli <lukasz.chechlinski@gmail.com>
Date: Sun Feb 16 13:26:00 2014 +0100
Update hough_circles.cpp
commit c8e22c04c8c71df3df360f02fa547799eaf10435
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Feb 14 18:55:11 2014 +0400
extended performance test
commit 150e522beea4807c7d6342e050a1eb6f9fb71199
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Sun Feb 16 12:17:17 2014 +0400
fix bug #3552:
replace std::swap with own code
commit 510680a5df77f520449e0e74680486e00e88fb96
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Feb 16 01:42:02 2014 +0400
typo
commit 7629bb78a4bf0838cfd5bcab4893a3fb0201d52a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Feb 15 15:27:27 2014 +0400
extended performance tests to test 3 channels
commit 03bd82796de2278f0fac1424a255c339d214ec10
Author: Anatoly Baksheev <no@email>
Date: Sat Feb 15 23:40:09 2014 +0400
source compatibility with master
commit 72e4f72a7593bb51cf962d02b2e313c8d32bdd67
Author: Chechli <lukasz.chechlinski@gmail.com>
Date: Sat Feb 15 17:31:14 2014 +0100
Update hough_circles.cpp
commit 9b627a5e9ff699d2d3261f63ae595df694837b39
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Feb 15 16:29:40 2014 +0400
disabled 'reshape', 'copyTo' test
commit 56754e907dcc40f5caa9bcae242a1d0ae5eb1932
Author: Anatoly Baksheev <no@email>
Date: Sat Feb 15 20:08:04 2014 +0400
fixed crash for windows if console widow is closed or CTRL_C/CTRL_BRAK keys in console are pressed.
commit 1a5dfe421dcbc5c2d831fff61ad7d5bc69c2c59c
Author: Anatoly Baksheev <no@email>
Date: Sat Feb 15 17:02:17 2014 +0400
Added WidgetMerger, Polyline - colors support for each point independently, simple widgets now compute color array instead of setting global color
commit 7ce2c3574add66252b46ce2f143fc7b6e51dd294
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Feb 15 16:04:57 2014 +0400
restored lost in PR #1735 umat tests
commit 4f36bc29d9f8d48ff493ed29f1dcffda6a478648
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Feb 15 15:51:52 2014 +0400
cleaned-up UMat tests
commit ed1aa73dd3c5b43a50bac920fea7c37f0606a328
Author: Kirill Kornyakov <kirill.kornyakov@gmail.com>
Date: Sat Feb 15 13:08:52 2014 +0400
Replaced Gittip button
commit cce225f6e9cb18d5e6432e90faf8ca94f0267374
Author: yash <yashdv@gmail.com>
Date: Sat Feb 15 12:48:42 2014 +0530
fixed doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
commit e2f5001b1147829af7c75d22e811cad0150caacb
Author: yash <yashdv@gmail.com>
Date: Fri Feb 14 23:04:03 2014 +0530
fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
commit 915fb632fd82593dafed5c31c198a8c64872d639
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Fri Feb 14 19:50:58 2014 +0400
core/ocl: change error processing for missed function
commit 8150c1b7e4867a33f492f57e1154d5287f86ff76
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Feb 14 17:26:28 2014 +0400
added [s|l]rgb <-> lab conversion
commit 8b8c3681484536fdc28d5fd0e8b7dd06ca2970f5
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Fri Feb 14 17:56:03 2014 +0400
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
commit d1606b4aa37f6d1d6daeebe039f593a37cbf607e
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Jan 30 17:01:48 2014 +0400
ocl: added SVM perf test
commit 3542da7167530696a5cf24f578a7267226746f8a
Merge: 0fc248f 88f993d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 14 16:21:00 2014 +0400
Merge pull request #2336 from SpecLad:useOclChanged
commit e0d991cf46e7a3d17cd1642fda56fb44af8c02e2
Merge: fa272c4 1ce5165
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 14 16:20:44 2014 +0400
Merge pull request #2335 from jet47:gpu-alphacomp-test
commit 0fc248fb70d4460785f454cd624fcd0572f5ae5c
Merge: 534bec3 630bdbf
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Feb 14 15:49:36 2014 +0400
Merge pull request #2326 from vpisarev:ocl_ch3
commit 95e38e457fc805fab15b34679a00cf2e96e41da1
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Mon Feb 10 16:34:45 2014 +0400
core/umat: usage flags (with proposals from PR #2195)
commit fa272c43c2f9ecb2edd23bfdbebdbba4ebc7343f
Merge: a1de9e9 1454843
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 14 15:37:09 2014 +0400
Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host
commit 8829e9f6c8efaf707275b4c42807f4b9865b59fc
Author: Pierre Moulon <pmoulon@gmail.com>
Date: Fri Feb 14 12:22:53 2014 +0100
Fix a typo error
commit f3f8b843b63fa37f37803ed48fbbb668cd7ce5d3
Author: Pierre Moulon <pmoulon@gmail.com>
Date: Fri Feb 14 12:21:35 2014 +0100
Fix a typo error
commit a1de9e9ad59ebf92574110ffe2bd4c546c1810da
Merge: ecbe843 b92a46c
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 14 14:38:36 2014 +0400
Merge pull request…
GregoryMorse
referenced
this pull request
in GregoryMorse/opencv
Mar 18, 2014
commit 72341645c01010e94d134c69dde62a23b1e9c744
Author: GregoryMorse <gregory.morse@live.com>
Date: Tue Mar 18 19:56:21 2014 +0800
Update CMakeLists.txt
commit 1f00840f92173a4d4fa9cf1c1ca37b32ce14d8f0
Merge: 366cc92 ae2b0b0
Author: GregoryMorse <gregory.morse@live.com>
Date: Tue Mar 18 19:52:32 2014 +0800
Merge https://github.com/Itseez/opencv
Conflicts:
CMakeLists.txt
commit ae2b0b0098824091a516dc62a59460ba1f85ac9d
Merge: dc28451 40a740f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 18 13:55:56 2014 +0400
Merge pull request #2486 from SpecLad:merge-2.4
commit 40a740ff88b0a0a0d7554ff32870fb3f1e3cf127
Merge: dd6cf15 8829711
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 17 14:14:07 2014 +0400
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/precornerdetect.cl
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf.ocl.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/opencl/arithm_bitwise.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_minMax.cl
modules/ocl/src/opencl/arithm_nonzero.cl
modules/ocl/src/opencl/arithm_sum.cl
modules/ocl/test/test_arithm.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkXYZReader.cpp
modules/viz/src/vtk/vtkXYZReader.h
modules/viz/test/test_precomp.hpp
commit dc28451b8ac6abcf636565104e379898bf2a76a6
Merge: 2a1d5c6 af062b7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Mar 17 14:04:22 2014 +0400
Merge pull request #2479 from alalek:ocl_compare_scalar
commit 2a1d5c6d43899f1ff3ceae0cb5e1841b2994598f
Merge: dd6cf15 e460822
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Mar 17 13:10:34 2014 +0400
Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels
commit af062b7c429957f3b93e89723bbd045483d6ecf7
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Mon Mar 17 12:29:49 2014 +0400
ocl: compare: remove useless perf tests
commit 882971151db79ffffb87017fb56dc8ed9a12b5cd
Merge: 136e5eb 24d8cbf
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 17 11:59:14 2014 +0400
Merge pull request #2485 from Nerei:viz_correct_viewer_pose
commit 136e5eb804872705ac76432ab489ed75405bdc23
Merge: 5726e80 8070800
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 17 11:57:09 2014 +0400
Merge pull request #2484 from berak:mat_doc_24
commit 24d8cbf940d47b6cea39634a6c3a2a051b33cd74
Author: Anatoly Baksheev <no@email>
Date: Sun Mar 16 20:07:05 2014 +0400
Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry)
commit 80708008a411f8beb50e300128b82a8d35921c40
Author: berak <px1704@web.de>
Date: Sun Mar 16 14:04:05 2014 +0100
missing () on Mat::type()
commit 7ce2ca2e0c7749bf5fb00adbe0e188de9678dd2b
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Fri Mar 14 19:50:38 2014 +0400
ocl: workaround for Pow accuracy test failure
commit 9cafd50160760d051469d7902c4782ced9b176fa
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Fri Mar 14 14:01:05 2014 +0400
ocl: fixes
commit 755ca4b7cf5ceb83a2383c76d5cc268efbd513b8
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Mar 13 20:36:23 2014 +0400
ocl: compare with scalar
commit dd6cf15a3943ec0602ff0e0e52334b16daad8a8c
Merge: bcb938e 4698d62
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 14 19:17:03 2014 +0400
Merge pull request #2481 from akarsakov:fix_hog_intel
commit bcb938efbb7612033dfd77b537b69519c56a6a68
Merge: c72a0a1 6f12f1b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 14 19:14:35 2014 +0400
Merge pull request #2483 from ilya-lavrenov:tapi_3_vs_4
commit c72a0a12953d9be8a164d3d42e3d55aed489499b
Merge: 6b434be 6be7869
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 14 19:08:06 2014 +0400
Merge pull request #2482 from ilya-lavrenov:tapi_fix
commit 5726e80f7715baa3e431b945a9096788f6f06af2
Merge: 836635d 61c347f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 14 19:05:55 2014 +0400
Merge pull request #2475 from ilya-lavrenov:ocl_2.4_fix
commit 6b434befc940abf16d22912043bbb3256fc196a5
Merge: 4a4151e 4fafab3
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 14 19:04:18 2014 +0400
Merge pull request #2480 from vpisarev:ocl_orb
commit 6f12f1b3b5895d1cba2be95983f7b35d00ad1b1a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Mar 14 17:25:34 2014 +0400
added 3 vs 4 channels performance tests
commit 6be7869ae87736770f0971e5c245330a3131b75b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Mar 14 16:53:10 2014 +0400
fix for unsupported doubles
commit 4a4151ec97ae73ef544e5443218933c4f6668fb5
Merge: 0ce8f1d 8910508
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Mar 14 15:17:45 2014 +0400
Merge pull request #2474 from akarsakov:fix_getpolicy
commit 4698d621254ab6793e9bb803c5aebacff58f0a77
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Fri Mar 14 14:18:52 2014 +0400
Removed workaround for Intel platform.
commit 8910508b838363ce4f721e5b463cd04cfd225a1a
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Thu Mar 13 10:22:36 2014 +0400
Fixed getPolicy() method to make it thread-safe.
commit 4fafab37867b3e1834634d6c78671fececefffd5
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Thu Mar 13 23:18:41 2014 +0400
fixed extra whitespace
commit 42e604abea2f1f36b321fa58937d2d2d46d2aabf
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Thu Mar 13 23:17:28 2014 +0400
fixed bug in FAST
commit 3e854fa6e5e790cdabf3d53d4ef5d10e799414bc
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Thu Mar 13 22:56:53 2014 +0400
finished OpenCL port of ORB
commit 61c347fb76ce3789e85fb41c526d007f11661870
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 22:56:46 2014 +0400
typos
commit 357a856cf68b6bb63f05f66ba9d7556f292913a8
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 22:35:08 2014 +0400
nonfree perf tests
commit 6f76e7b42dc52308c13f8d64331cbd3ca08aa750
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 19:42:13 2014 +0400
improved performance of bitwise ops
commit 0ce8f1d5ddd00e9d35171a5a790453f7962038aa
Merge: c5bf1c1 48196ad
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 18:55:27 2014 +0400
Merge pull request #2477 from alalek:ocl_cleanup_workarounds
commit c5bf1c108c6c99c9e537b44d42ab03550cf37e2d
Merge: 4233539 9932cf4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 18:42:00 2014 +0400
Merge pull request #2470 from ilya-lavrenov:tapi_reduction
commit 423353961787fe0aaab565c69824e0e345c358e6
Merge: a6c40ab dca401d
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 18:37:05 2014 +0400
Merge pull request #2469 from alalek:ocl_pyrUp_pyrDown_3channels
commit adc15c2bbaecaee5e60345c7c10c4b6cac585219
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 16:27:07 2014 +0400
improved performance of cv::ocl::sum
commit a6c40abfb20729e055aaaee130365a37cfc04a46
Merge: 0764a23 89b7c0d
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 16:56:01 2014 +0400
Merge pull request #2466 from ilya-lavrenov:tapi_transpose_3cn
commit 0764a23eb2050c119a71ba908640012aa01fabdc
Merge: 6b6cfa8 f138b61
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 16:49:56 2014 +0400
Merge pull request #2459 from ilya-lavrenov:tapi_experiments
commit 6b6cfa893d43bc24fb15b690b9400aad71ddf298
Merge: 553673e 9b31e6c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 13 16:48:38 2014 +0400
Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans
commit 48196ad10b59d619a646b649ae203f9bdb18f1de
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Mar 13 15:45:23 2014 +0400
ocl: cleanup workarounds
commit 3ebfe60008d9a0ea74cac18d1c30bcd8be8d16a9
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 15:35:53 2014 +0400
improved performance of cv::ocl::countNonZero
commit 8e79de35a800560f70631b614265ef12d5f95c29
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 13 14:57:13 2014 +0400
changes for GFTT
commit a5afcd9f115b82112cb2427f314c8af216655084
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Wed Mar 12 19:58:53 2014 +0400
improved performance of cv::ocl::minMax
commit 553673eeed7d4684abfc95c12c0e287081073c77
Merge: fd8f2c8 5252aa8
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu Mar 13 13:42:20 2014 +0400
Merge pull request #2468 from mlyashko:back_proj_fix
commit fd8f2c8d238fb75f674f075e3c0909eae3a206d6
Merge: 290b934 bbe8654
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Mar 12 18:51:40 2014 +0400
Merge pull request #2463 from ziyangli:master
commit 290b93422c80ecda73b1f05e82683a622e5e0aac
Merge: 702a2a6 95a5545
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Mar 12 17:08:43 2014 +0400
Merge pull request #2465 from SpecLad:merge-2.4
commit 836635d2d5157fa6772a2e3f45313c29f30018b7
Merge: 1bb0c57 4d7a593
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Mar 12 16:53:41 2014 +0400
Merge pull request #2434 from Nerei:viz_continue
commit 4d7a593c254657cd41e4c1659ac5420ef7082d8f
Author: Anatoly Baksheev <no@mail>
Date: Wed Mar 12 16:21:36 2014 +0400
minor cmake fix fo macos
commit 9932cf41a475f389849e4d9089e9882e67e1206a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Wed Mar 12 01:00:29 2014 +0400
3-channel reduction operations
commit dca401d4ccb2e4feaa2fd7c7d8aaa9fc06f70012
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Feb 27 16:25:26 2014 +0400
ocl: pyrUp/pyrDown 3-channel
commit bbe8654c3d9c0c01d8d6ecd836cc27b93aa65245
Author: ziyangli <ziyang.d.lee@gmail.com>
Date: Wed Mar 12 18:16:54 2014 +0800
cleanup
commit 4f5896493ea3e29b7938b70029c11e470a0ec1dc
Author: Ziyang LI <ziyangli@users.noreply.github.com>
Date: Wed Mar 12 18:14:43 2014 +0800
remove a whitepace
commit f138b613b7361a465223dbb8c78848b4b58829c5
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Mar 11 23:41:44 2014 +0400
cv::compare
commit 5252aa8fdd884c001e2ad56fd7fa0ed232f29445
Author: mlyashko <maria.lyashko@itseez.com>
Date: Wed Mar 12 11:30:28 2014 +0400
added data type check for back projection fix
commit 89b7c0dd93f25f20e9e506e2a2d8c09da20d4dcc
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Wed Mar 12 00:08:55 2014 +0400
3 channel support to cv::transpose
commit 2755ae5df918b881331892e4197d2c9587d54917
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Mar 8 01:29:27 2014 +0400
experiments
commit 1bb0c5747c76e5f9936a2f2bb47ea9bbade4a930
Merge: 0084dee 45969bb
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 11 17:41:18 2014 +0400
Merge pull request #2462 from ibtaylor:fix_deblurring_calcBlurriness_var_name_typo
commit 95a55453dffa5a92f65eb26b82723bf6521c4b39
Merge: 702a2a6 0084dee
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 11 17:20:01 2014 +0400
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
commit 702a2a6ff6752851508452c8aa0618c068881a4d
Merge: 5261fbe eb2e8a1
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 16:00:21 2014 +0400
Merge pull request #2373 from mlyashko:optflow_dualtvl1
commit 5261fbe217f345528a18da536d806cfbdd9ff8c7
Merge: 90c5dde e7475bf
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 15:59:11 2014 +0400
Merge pull request #2387 from alalek:ocl_remap_3cn
commit 90c5dde8871407bba72029bd6714526579bc7147
Merge: fd0ab8e 0e2cc5e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 15:58:32 2014 +0400
Merge pull request #2455 from ilya-lavrenov:tapi_fix
commit 9b31e6cd4478d245d493bbff2e2ea373fee524f7
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Mar 11 15:21:14 2014 +0400
changes according to reviewer's suggestions
commit 0084dee05bd9935d7c4df97ac53341cf692ff80f
Merge: 1f8df38 806e924
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 12:57:28 2014 +0400
Merge pull request #2448 from akarsakov:ocl_cxt_termination
commit fd0ab8eba143c464cff9d85cae4d924f4c454d94
Merge: 70e22b6 208831e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 12:44:33 2014 +0400
Merge pull request #2461 from ilya-lavrenov:tapi_calc_hist
commit 1f8df38dbaf363a1311505a776fed6587333271d
Merge: 229aa62 3eff05e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 11 12:37:11 2014 +0400
Merge pull request #2457 from ilya-lavrenov:ocl_calc_hist
commit 3eff05e3eb9297d0be9bb72f1131eee5947c209c
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Mar 7 14:35:51 2014 +0400
added performance tests for cv::ocl::calcHist
commit e7475bff68e9b3a50e1b5af4418a4066030a82ac
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Feb 20 18:20:08 2014 +0400
TAPI: remap 3-channel
commit e4608229f0de65aad3917b8eef958803f3a12d98
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Feb 27 14:49:36 2014 +0400
ocl: copyMakeBorder 3-channel
commit 786e3b9eee582c98fb4beba4b22e7a8951aa716f
Author: Ziyang LI <ziyangli@users.noreply.github.com>
Date: Mon Mar 10 17:33:13 2014 +0800
Moved x = 0 into the parenthesis
Easier to understand
commit 45969bb3ae6065bc152c62e19c420ada8f6b4315
Author: Ian Taylor <ian@paracosm.io>
Date: Mon Mar 10 03:02:06 2014 -0400
fix variable name typo in calcBlurriness
commit 208831eb5d9a925dd9cb912f1ced6e5cb33f658a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Mar 8 12:20:52 2014 +0400
optimized cv::calcHist
commit efdfca7a112d118868f5ea0ac653182ccbde14d8
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Fri Mar 7 18:55:45 2014 +0400
do not use the large "score" buffer; now without non-max suppression OpenCL FAST is pretty efficient
commit 70e22b682d07a3ed86127f7d071428a67a5a2712
Merge: 2879ff2 193e97a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Mar 7 18:19:00 2014 +0400
Merge pull request #2397 from vbystricky:intelperc
commit 06c138bd644f0c218fb899df90375849802616d2
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Fri Mar 7 18:18:10 2014 +0400
make the correctness test pass
commit 193e97a34ad64425b3ed6f94338ad95f6938ecca
Author: vbystricky <user@user-pc.(none)>
Date: Fri Mar 7 16:25:15 2014 +0400
Move declaration of IVideoCapture class into precomp.hpp, make some methods of IVideoCapture pure virtual
commit 2879ff209875de0a5e40d737dd35204bb1f80afa
Merge: 5dbe73f 4376de7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 14:00:09 2014 +0400
Merge pull request #2437 from ilya-lavrenov:tapi_morph
commit 5dbe73f94d27eb6418ee4e0b4674f26ff7e58893
Merge: 182d74d 050cca0
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 13:54:34 2014 +0400
Merge pull request #2438 from ilya-lavrenov:tapi_flip
commit 182d74d33f3e7dcf603f63a133233b6c7d92dd39
Merge: 451be9e 8660588
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 13:54:12 2014 +0400
Merge pull request #2441 from akarsakov:ocl_platform_vendor
commit 451be9ed538bbad6be61a783c2f4fa247fc83930
Merge: 3cb49ea 86a3ed4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 13:53:43 2014 +0400
Merge pull request #2444 from ilya-lavrenov:tapi_gftt
commit 3cb49eac49bd0c79a13a0b488cee7ff02e8e3955
Merge: 8f34928 4a7289b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 13:52:47 2014 +0400
Merge pull request #2451 from ilya-lavrenov:tapi_fast_covar_data
commit 8f3492851e22a62d6508e02ddd9debbad593dc9e
Merge: d1d451c dc76e6b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Mar 7 13:51:37 2014 +0400
Merge pull request #2453 from ilya-lavrenov:tapi_sobel
commit 8660588fe9a34052b9a599e568f17ecf1a2a786e
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Wed Mar 5 15:04:44 2014 +0400
Pass vendor macro to opencl kernel
commit eb2e8a11faa496871b3c8d3737a5497db926ddb1
Author: mlyashko <maria.lyashko@itseez.com>
Date: Fri Mar 7 11:15:54 2014 +0400
changed kernel.set to support unsuccssful set
commit 0e2cc5ef637a4a2ea43d92d4955d3310fcce3bbc
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 25 19:32:55 2014 +0400
fix bitwise ops and mask support
commit d1d451c952d9650c859b721431a0852eae95c844
Merge: 2f0fe5b 68957b2
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 6 22:17:44 2014 +0400
Merge pull request #2431 from ilya-lavrenov:tapi_perf
commit 229aa6230092a33ea9ed02a56b07c04c597be738
Merge: f351540 f7a4741
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 6 22:03:01 2014 +0400
Merge pull request #2445 from ilya-lavrenov:ocl_perf
commit 2f0fe5b87b3b4f230589cbfa5d764fb445685550
Merge: f21a948 f404315
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 6 21:55:50 2014 +0400
Merge pull request #2450 from ilya-lavrenov:tapi_test
commit f21a94880eb0abc418ad5578b98354af6ea7c426
Merge: 42f9ee3 d9c5fbc
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Mar 6 21:51:24 2014 +0400
Merge pull request #2452 from ilya-lavrenov:tapi_disable_surf
commit 8e1918e86eb5fc7a85960a37d2452883032d1230
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Thu Mar 6 18:04:04 2014 +0400
added OpenCL-accelerated(?) FAST; for now the tests fail :(
commit dc76e6b4a1129b871d4f9f503ed867e2a6dde6c2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 17:28:00 2014 +0400
added new dtypes to cv::Sobel
commit f351540eda6d174ea2d24b7a90302c6534f6a495
Merge: ba45135 b184d7f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu Mar 6 17:53:31 2014 +0400
Merge pull request #2443 from waveform80:issue-3554
commit 4a7289b22f9ead1d9b7f3a190938407d3f74cab1
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 15:48:57 2014 +0400
improved cv::preCornerDetect
commit d9c5fbc9bafae8dd335b6f600444b36f9fd58319
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 16:49:22 2014 +0400
disable SURF
commit 806e9241a6c0255cde117e24e3a9de6fd315443e
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Thu Mar 6 11:16:38 2014 +0400
Clarifying comments
commit 1291bd1c4a7407d2d07f6a11176718cf8052e0ac
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 15:40:27 2014 +0400
ported fast calculation of covar data
commit f404315368cc45386b672a687bf1f88b8b75cd73
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 12:11:40 2014 +0400
test for clEnqueueReadBufferRect
commit 66ed6a8a50e15c628e56a748b6c9defa5d660152
Author: mlyashko <maria.lyashko@itseez.com>
Date: Thu Mar 6 11:43:01 2014 +0400
macro for normal return from thriveless kernel.set
commit f7a474180be25f472a1e68426f803280454edc56
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Mar 6 09:24:02 2014 +0400
tuned some tests
commit 86a3ed41621171c92b4a79974a072627d8306c06
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Mar 4 20:04:16 2014 +0400
improved performance of GFTT
commit fde0185a774b258988c9e37efbb8be14090e581a
Author: Anatoly Baksheev <no@email>
Date: Sun Feb 16 21:27:25 2014 +0400
iteractor work
commit 4aa891e77384e88a4e809f92fa2bc9b50f67a07c
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Wed Mar 5 17:57:06 2014 +0400
Remove clReleaseDevice call (workaround for pure virtual call on Windows)
commit 42f9ee3f3e580a2c8495b4b56669f06708de53b1
Merge: 0a3aca2 a80ebfe
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Mar 5 17:28:08 2014 +0400
Merge pull request #2440 from codyrigney92:Master_LKOptFlow_NEON
commit c1dad2178ca4ad3b7154e4026be9c31ef4fb8365
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Wed Mar 5 11:25:37 2014 +0400
Added Device:: isAMD,isIntel,isNvidia methods.
commit d4a1df85be5bbda269e6d877c7dfa6bb00d890fc
Author: vbystricky <user@user-pc.(none)>
Date: Wed Mar 5 13:06:36 2014 +0400
Change text of copyright
commit f9e942f9ef57fdb3245fbb23a598351f0df4e104
Author: vbystricky <user@user-pc.(none)>
Date: Wed Mar 5 11:03:57 2014 +0400
Change text of license and copyright
commit b184d7f27b9115b7532c7e021e11051a74e93fde
Author: Dave Hughes <dave@waveform.org.uk>
Date: Wed Mar 5 02:44:40 2014 +0000
Fix for #3554
v4l2_scan_controls_enumerate_menu is unused and causes ioctl error on
RaspberryPi and possibly other Video4Linux variants. See
http://www.raspberrypi.org/forum/viewtopic.php?f=43&t=65026 for more
detail.
commit a80ebfe28dbc868e876ece3f5aaed38069203290
Author: Cody Rigney <codyrigney92@gmail.com>
Date: Tue Mar 4 14:47:12 2014 -0500
Master Version: Added NEON Optimizations for LK Optical Flow.
commit 0a3aca230cab6bd466e43369397348492d4c1c6b
Merge: c9d8025 be5b5a0
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 4 19:21:15 2014 +0400
Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix
commit ba4513503e7b2b79f6c7f53e7d15b465f5a62d08
Merge: b5248db 767b28f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 4 19:18:11 2014 +0400
Merge pull request #2429 from ilya-lavrenov:master_compatible_tests
commit c9d8025fabd798b05ecd2a88e90d4f283ace5d90
Merge: c00f0fa 653b99c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 4 18:50:14 2014 +0400
Merge pull request #2391 from ilya-lavrenov:tapi_match_template
commit c00f0faf24c0240b471b32d19698085701078c98
Merge: 5527f28 fe38aab
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Mar 4 18:37:26 2014 +0400
Merge pull request #2408 from ilya-lavrenov:tapi_core_opt
commit 5527f2872df6142aac6ae80dc164dd0e891c7075
Merge: 0692a67 7a68e3d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 4 15:32:12 2014 +0400
Merge pull request #2409 from juanmanpr:master
commit b5248dbf3fa7bde48296a3b9de024802254d28db
Merge: fa3f29f fbc69e4
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 4 15:30:26 2014 +0400
Merge pull request #2407 from codyrigney92:LKOptFlow_NEON
commit fa3f29f2b51099c311170e56ef42458f82142bd3
Merge: a600267 099ea91
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 4 13:51:30 2014 +0400
Merge pull request #2439 from ilya-lavrenov:typo
commit 099ea91823f75ccab2976031140c1f25e1ebb8bb
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Mar 3 19:37:47 2014 +0400
typos
commit 0692a674d1bd3a1a4a45214f5e5c9dc44086d740
Merge: 7ecbf45 68edda3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 4 11:49:01 2014 +0400
Merge pull request #2381 from ElenaGvozdeva:ipp_resize
commit a600267b9f63dc9e2115fdf00a73792b48f01984
Merge: af8aa8a 29deff8
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Mar 4 11:46:28 2014 +0400
Merge pull request #2432 from ilya-lavrenov:summary_py
commit 5c867463d2ff7b2b8b6cdb876d674cecbcc484ef
Author: mlyashko <maria.lyashko@itseez.com>
Date: Tue Mar 4 11:36:47 2014 +0400
changed localsize to NULL (reviewers comment)
commit 050cca0422d461fdb0c0a1c5567eb42b8cef06c8
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Mar 3 19:04:32 2014 +0400
improved performance of cv::flip (flip cols)
commit 7ecbf4575118f3c2ceb155ffb9dee4af145bccf0
Merge: 3758068 db85c35
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 3 15:41:06 2014 +0400
Merge pull request #2435 from SpecLad:merge-2.4
commit 4376de7698bda00bec5f278322609f7bac7c2fb6
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Mar 3 15:19:02 2014 +0400
fixed morphology operations
commit be5b5a0471a02e3284c9aee81995fe2893b6e15e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Mar 3 14:32:38 2014 +0400
fixed cv::dft
commit db85c35e696f223bf2e37c5e85be66c7e5a09700
Merge: 3758068 af8aa8a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 3 13:45:22 2014 +0400
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
commit 29deff8707c825d1992a3bda6569a3e5eefb1a36
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Mar 2 16:08:37 2014 +0400
ability to merge logs with intersections only
commit af8aa8a2fa835bd535ec60a8e794f027c3766508
Merge: 409bd16 eedf864
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Mar 3 12:20:34 2014 +0400
Merge pull request #2433 from ilya-lavrenov:typos
commit fb7e74c511077d2307f230abf6d4508bae96535a
Author: Anatoly Baksheev <no@email>
Date: Sun Feb 16 21:27:25 2014 +0400
iteractor work
commit eedf86402dcd3e1e4ba1e9868fab4c03ccd2fbbf
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Mar 2 21:04:17 2014 +0400
typos
commit 68957b27571507aab033f4a5e3bf704e656c2679
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Mar 1 20:08:58 2014 +0400
added some new performance tests
commit 767b28f2e3bf75883edaf79e5a4de5566a1926e2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Mar 1 13:13:24 2014 +0400
tests
commit fbc69e444b67b1643f62be065ca7b1e777abfed6
Author: Cody Rigney <codyrigney92@yahoo.com>
Date: Mon Feb 24 14:15:21 2014 -0500
Added NEON optimizations for LK optical flow (Intrinsics).
commit c1c3139368c97f1d31fc323a90b1e99879a79ba4
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Feb 28 14:15:56 2014 +0400
master-like performance tests
commit 409bd162ff46a43123e2e4fce607a79d61b6318d
Merge: 7dc22b4 e6f6707
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Feb 28 18:22:03 2014 +0400
Merge pull request #2421 from akarsakov:fix_ocl_haar_intel
commit 37580687e65931f8b0b730885c126867e5f17aee
Merge: 57b6850 b9d68ef
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Feb 28 18:21:37 2014 +0400
Merge pull request #2427 from alalek:ocl_build_log
commit 68edda3350554a71cc418b78283ab9a1645a0bb9
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Thu Feb 27 18:10:16 2014 +0400
fixed
commit b9d68ef0610f8adcc981ab6f9f99970c3103cc8a
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Feb 27 12:51:40 2014 +0400
core/ocl: OpenCL build log improvements
commit 57b6850d749a9270a9eba4530c51bf250649fa74
Merge: bd5d840 a3aced2
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Feb 27 09:37:04 2014 +0400
Merge pull request #2415 from vpisarev:fix_stereobm_sse
commit e6f6707558f7237dd74d654aa4460c6befe80472
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Wed Feb 26 18:11:11 2014 +0400
OCL: Fix for Haar classifier (thanks to Konstantin Rodyushkin).
commit 7dc22b4ea68e38278b239d52833f5fe867849a63
Merge: 1db1a83 a228633
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 26 17:34:49 2014 +0400
Merge pull request #2419 from linquize:tgit.icon
commit a228633d319447029de361446c09b027f93c2c98
Author: Linquize <linquize@yahoo.com.hk>
Date: Tue Feb 25 23:34:41 2014 +0800
Add tgit.icon project config
commit bd5d8404c93fc5728264a54a8ac36979526ab87d
Merge: 6931299 ce0557e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 26 12:16:35 2014 +0400
Merge pull request #2393 from ilya-lavrenov:coverity
commit ba5ebaa7588e1442f76f89e0214f0dbecb2f9f49
Author: mlyashko <maria.lyashko@itseez.com>
Date: Wed Feb 26 10:55:18 2014 +0400
changed file name to case-sensitve to support linux
commit 7a68e3d20733d38cd726ad878d6ead77e8e19f31
Author: juanmanpr <juanmanpr@gmail.com>
Date: Tue Feb 25 19:58:08 2014 +0100
CV_Assert for photo module corrected
commit 693129902d9a5b5d8786a5293551e9e5b40c9e04
Merge: c9a4a82 4843250
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 25 19:42:53 2014 +0400
Merge pull request #2399 from SpecLad:merge-2.4
commit a3aced20c1923b477fbca6197e2c326a4da821da
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Tue Feb 25 18:13:51 2014 +0400
fixed difference between SSE2 and C branches of StereoBM; they should now produce absolutely the same results
commit c9a4a82667c84f62af159ee5f9c6c8a0820d7152
Merge: 3693fac fd4461d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 25 17:43:48 2014 +0400
Merge pull request #2358 from rohitgirdhar:rotatedRect
commit ce0557ebb82dd01f3c89ac4cedeb20c1c712feee
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Feb 23 21:07:20 2014 +0400
fixed defects from Xcode
commit 45cc8a5300674bc0259a98c381e52f410ed3fd0a
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Tue Feb 25 16:40:04 2014 +0400
fixed
commit 1db1a8341079d4e928856d09c5797cfe20048dde
Merge: 7dc549f dbb7aa7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 25 15:04:23 2014 +0400
Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix
commit 48432502b6fe166242a25e1f9cc1d7215a72c1bb
Merge: 0a90d6d 2b0c3eb
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 24 14:35:34 2014 +0400
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
commit 3693facd9e322a5873477ff0959a338095074bd2
Merge: 73dfc4c 31fb7c4
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 25 14:21:12 2014 +0400
Merge pull request #2412 from arunjvs:master
commit fe38aab84abe57988bff7a5d6a2699c4d731c8ab
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 25 00:29:17 2014 +0400
core tapi optimization
commit 31fb7c4fecd409897b4cbef2fe93b3d9871405e4
Author: Arun JVS <jvsarun1993@gmail.com>
Date: Tue Feb 25 14:34:32 2014 +0530
Fixed Bug #3568: Build fails with WITH_OPENGL=ON
commit 48e7bc6b30ecb485055607e2c7995255f0059f30
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Mon Feb 24 16:12:50 2014 +0400
fixed
commit 7dc549f16606f0827196b535ac06bd397bd47bf5
Merge: d695d4a c78142a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 25 12:37:01 2014 +0400
Merge pull request #2411 from asmorkalov:android_mat_leak_fix
commit c78142acb016a11385bb0a82c66bdc66fd7b7be8
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue Feb 25 11:50:55 2014 +0400
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.
commit ff8b8ef24cab7e77fe46010802823e74ff4cc61f
Author: vbystricky <user@user-pc.(none)>
Date: Mon Feb 17 17:50:15 2014 +0400
Remove implementation of CvCapture interface for Intel PerC camera. Add IVideoCapture interface and implementation of this one for Intel PerC camera
commit dbb7aa7856282a09eec452ffa25205fcd5bd5659
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue Feb 25 10:36:20 2014 +0400
Highgui_Tiff.decode_tile16384x16384 disabled for Android.
Last changes in test leads to SIGKILL on Android.
SIGKILL is called by out of memory killer.
commit d695d4a0bf382b80067112ea0f4bf14f66ce9076
Merge: 681a8c6 e1a598c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Feb 25 09:12:32 2014 +0400
Merge pull request #2406 from ilya-lavrenov:abf
commit 540a60fca7c68dab442d8e9cb51f1b8f6c7d3774
Author: juanmanpr <juanmanpr@gmail.com>
Date: Tue Feb 25 00:29:07 2014 +0100
Replaced calls to cout from photo module, by CV_Assert
commit 653b99c9bd1e02712105c344ca16c51c0c89a0be
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 24 18:38:33 2014 +0400
new scheme of sqrSum
commit e1a598c5b33f92491573541a744abf64c6860e59
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 24 23:26:01 2014 +0400
disabled ABF tests
commit e75a257f929079c9e21a0821092c7a00d137d2c2
Author: mlyashko <maria.lyashko@itseez.com>
Date: Mon Feb 24 17:47:56 2014 +0400
changed epsilon for test passing
commit 73dfc4cb8c866a45e02a4c2041882c4a7cd681ac
Merge: 3845b96 16bfdbd
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 24 16:56:40 2014 +0400
Merge pull request #2402 from ilya-lavrenov:amd_libs
commit 3845b96f6cbdf243a4828d27921b038a674f5734
Merge: 52a339c 9b3c76a
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 24 16:54:44 2014 +0400
Merge pull request #2388 from alalek:coverity_bug_fix
commit 52a339cba58404e24febd4243a52124dca73c1d7
Merge: 0f43345 6d83048
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 24 16:22:28 2014 +0400
Merge pull request #2401 from akarsakov:fix_elem_size
commit 0f43345f9e7f002b89cdac513af0ce9601ae3a3a
Merge: 0a90d6d 0406898
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 24 16:21:41 2014 +0400
Merge pull request #2394 from ilya-lavrenov:tapi_memop_fix
commit 16bfdbd22a228b7d541a22c4c600a1bb48de37d4
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 24 15:12:42 2014 +0400
dump AMD Blas/Fft
commit 6d83048ec372080e62727bc43d8eaa5c9404d8cb
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Mon Feb 24 15:10:00 2014 +0400
Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale.
commit 681a8c6e18453dd5524f55ce2ff3eef432ca61af
Merge: 2b0c3eb ced8e7a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 24 14:26:41 2014 +0400
Merge pull request #2398 from nghiaho12:integral_doc
commit ced8e7a8131c327cd4a00e72c1fb192fa2e3dd0f
Author: Nghia Ho <nghiaho12@yahoo.com>
Date: Mon Feb 24 20:06:20 2014 +1100
Typo
commit 2b0c3eb17086c10c0ccd04adc03d915f94bf3287
Merge: 5142109 1cf75c0
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 24 12:44:36 2014 +0400
Merge pull request #2389 from SpecLad:ios-big-endian
commit 1cf75c0cabff9699ab80d078629f9af0f71f1ec1
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 21 16:08:49 2014 +0400
Hardcode iOS's endianness, since the TestBigEndian module doesn't work there
commit 32eb38ec984b098b56b3358d8ba5edd0b721c6ed
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Feb 23 14:59:06 2014 +0400
fixed defects from coverity.com
commit 0406898b9ae5d2e682bfad5ac62b1723f9bf88eb
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Feb 23 15:12:38 2014 +0400
int2 -> ulong; to work properly with 3 channels
commit 0ef16125ae71e02d4a97dc2970dd5d8db4addc46
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Feb 22 00:43:03 2014 +0400
improved cv::matchTemplate OpenCL part
commit fd4461d54389e9674b97c64a445baa7ed3e95980
Author: Rohit Girdhar <rohit@iiith>
Date: Sat Feb 22 00:26:10 2014 +0530
addressed issues
commit 0a90d6dde6cedcc98c1f5663798ffde32831d864
Merge: 9c5bd85 51dafc7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 21 19:11:57 2014 +0400
Merge pull request #2266 from vpisarev:ipp_norm_fix
commit 51dafc780bcfd70016662bb6470f2c897cdfb336
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Fri Feb 21 18:07:01 2014 +0400
fixed hint type declaration
commit 51421098ddb7c15f8385c6078d789d624ffc6ca4
Merge: 3e58906 dc50dc7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 21 17:57:36 2014 +0400
Merge pull request #2201 from mattip:2.4
commit dc50dc72548a9b7c970610ee95a7797e644040be
Author: Matti Picus <matti.picus@gmail.com>
Date: Fri Feb 21 13:54:58 2014 +0200
fix merge
commit 3e5890694e81ef2cc765821c072f3b0200a24741
Merge: efafd4a aa5311e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Feb 21 15:14:11 2014 +0400
Merge pull request #2384 from ilya-lavrenov:perf_match
commit 9b3c76a3db1700c884bec2d07d303a35fc438de7
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Fri Feb 21 14:04:01 2014 +0400
TAPI: coverity bug fix
commit f5330a44e834603bc86eae7de2e7b5f9141a5fa4
Merge: 31c8f2e efafd4a
Author: Matti Picus <matti.picus@gmail.com>
Date: Fri Feb 21 11:59:49 2014 +0200
merge with origin
commit c7857e8c1341426f9a16c55ac0923adec5a996d0
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Feb 20 16:05:50 2014 +0400
small fixes
commit 347a3dc520358738c1b42654de2e37651c2174d8
Author: Rohit Girdhar <rohit@iiith>
Date: Fri Feb 21 03:00:03 2014 +0530
added randomized test
commit 31c8f2ec57138aa2708aa2b59f930d4102c0d7e8
Author: Matti Picus <matti.picus@gmail.com>
Date: Thu Feb 20 22:12:22 2014 +0200
fix code, it turns out only TIFFReadRGBATile needs buffer pointer mangling
commit 46d128e073a0736f93301f98446f3e721a3e3fd1
Author: Matti Picus <matti.picus@gmail.com>
Date: Thu Feb 20 22:10:22 2014 +0200
add test (needs updated opencv_extra repo)
commit 9c5bd852478f1ae7ef5ffc1650b8d470058fe6e9
Merge: b96923d 7e4dea9
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Feb 20 21:41:43 2014 +0400
Merge pull request #2375 from akarsakov:fix_getGradient
commit b96923d5fadbb629ee61c15fa4166a447fd7480b
Merge: f04a158 ddd3c06
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Feb 20 21:40:27 2014 +0400
Merge pull request #2377 from alalek:tapi_warpers_perf_test
commit f04a158268de6a0ce4860d92383459af4d99301a
Merge: ad66233 804b70b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu Feb 20 21:36:30 2014 +0400
Merge pull request #2383 from ilya-lavrenov:perf_match_template
commit aa5311ea9fdc21f4b76df555aa0d1a9d529bb325
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Feb 20 18:55:08 2014 +0400
backport of master-based perf tests for matchTemplate to 2.4
commit 804b70b72fc5e10cd20355562bfc598ee1293986
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Feb 20 18:11:56 2014 +0400
ported 2.4 perf tests for matchTemplate
commit 7b552c0493bc8e030318b9c452a0070c94e451cf
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Thu Feb 20 17:34:51 2014 +0400
fixed
commit ea7b1bb3d2418ffa34a155ce7b80239ef6a02a5d
Author: Rohit Girdhar <rohit@iiith>
Date: Thu Feb 20 17:51:48 2014 +0530
added test, doc
commit cd68cd43a211b2a2408edae9a8617646c6c5f2c6
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Thu Feb 20 16:13:05 2014 +0400
Fixed
commit 10f2a038c2f30e78e14e530a6c9f9c17d618a1c5
Author: mlyashko <maria.lyashko@itseez.com>
Date: Tue Feb 18 14:24:30 2014 +0400
Optical flow dualt tvl1 ocl-based implementation and tests
commit e013d31715fe1f1d57389f959f8bf241ce3d583a
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date: Thu Feb 20 14:01:22 2014 +0400
Added IPP function for resize()
commit 7e4dea968cdddc6e527deb5d72a9d381c8919843
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Wed Feb 19 16:32:17 2014 +0400
Fixed typo with indexes in getGradient(x/y) functions.
commit ad662337745d98c1d254af0b18c6bc003de8ee55
Merge: 61976b8 fa05994
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu Feb 20 13:43:22 2014 +0400
Merge pull request #2376 from GrinIara:master
commit efafd4a9e5cce08b10441041e6295112e8f26c62
Merge: ce42593 7fd21d2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu Feb 20 13:41:45 2014 +0400
Merge pull request #2380 from jet47:fix-3562
commit 61976b84617f094e1849e874dcbea7ca49837628
Merge: ccbceb5 79eba54
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu Feb 20 13:39:54 2014 +0400
Merge pull request #2325 from alalek:perf_fix
commit 79eba54a4f7b3d16e8687ea2c5b029bc43764159
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Wed Feb 12 18:12:22 2014 +0400
some fixes in perf tests
commit ddd3c062b55c03bb95aa40d230543ccd2912f7b2
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Wed Feb 19 20:30:27 2014 +0400
TAPI: fix perf test for warpers
commit 7fd21d217ad7cc027f5cdd3474b17df71343ba2a
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Thu Feb 20 10:24:52 2014 +0400
fix bug #3562:
add missing __syncthreads to edgesHysteresisLocalKernel
commit fa0599448dddd16519cee0b0e95542c6e9c892a6
Author: GrinIara <yaroslava.grin@gmail.com>
Date: Wed Feb 19 17:06:33 2014 +0100
Fixed compilation error due to missing std::.
commit b939b4ae3b76b97b7041b5c37e40e3b34ffd086f
Author: Rohit Girdhar <rohit@iiith>
Date: Wed Feb 19 20:58:40 2014 +0530
removed inline, changed interface
commit 8bf616e4c78d5e1133c634b4059f25a162f5ab36
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Wed Feb 19 18:34:34 2014 +0400
added color image support via L*a*b*
commit 634e8d37cc208f5f0f54891d7dc7d4f991769e7f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Wed Feb 19 18:13:09 2014 +0400
fixed for 2 channels
commit bf4f15fb5fd6aaf4e014de2aeef9070c7d858b9a
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Wed Feb 19 14:00:39 2014 +0400
TAPI: fix OpenCL warpers and test
commit 7faf1f6277cf780b78c591c38fb569cf43236dcd
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 18 19:38:50 2014 +0400
some improvements
commit ccbceb56c488892f5d0f0a384750028a11082af7
Merge: cfc4621 75b80e5
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 19 14:48:56 2014 +0400
Merge pull request #2144 from nickdademo:pvapi_framestarttriggermode
commit cfc4621587538ac34cd960d45f6b5154da695cd9
Merge: 3782c32 0d199b4
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 19 14:33:57 2014 +0400
Merge pull request #2291 from xgvargas:extra-note-for-waitKey
commit ce42593fe684a88c82aba121fb9bb433bb3aea34
Merge: 7cbc4e8 4c1ed13
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 19 12:03:06 2014 +0400
Merge pull request #2368 from asmorkalov:ocv_gcc48_warning_fix
commit 7cbc4e88de6317ee7e531c618da1c96d92c8a059
Merge: 8754adc 01a980a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Wed Feb 19 12:02:40 2014 +0400
Merge pull request #2357 from akarsakov:fix_ipp_compilation_linux
commit 4c1ed138461400a8d74801a92c9cc048d8539723
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue Feb 18 12:01:01 2014 +0400
Warning fixes for GCC 4.8.
commit 72c327fef882421d6403b00e66397b29efeae801
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 18 19:23:38 2014 +0400
hope it finally works
commit 8754adc021fd389ad454f99f786a4c7d275f56be
Merge: af9368d e460a29
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 18:00:13 2014 +0400
Merge pull request #2371 from ilya-lavrenov:typo
commit af9368d35fbc59506e8072cd4123c5a1cae5902e
Merge: c35dab9 da9bdf9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 17:00:53 2014 +0400
Merge pull request #2370 from ilya-lavrenov:cuda_nlm_typo
commit c35dab904680d8a074f523360f631e9f063230ce
Merge: 6f19ef8 e35d98e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 17:00:32 2014 +0400
Merge pull request #2359 from SpecLad:moments-no-vectorize
commit 3782c324c41b9636e8303fe24fd4ab7c48388712
Merge: edbff68 44ecb72
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 15:49:18 2014 +0400
Merge pull request #2098 from pxli168:patch-1
commit 6f19ef863186beda3546acfcdf58c04a50b613a0
Merge: 5cb2d1c 77df594
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 15:44:56 2014 +0400
Merge pull request #2361 from alekcac:ios_camera_changes
commit 38cbe9873a8076116ec450f204ad93ef05293352
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 18 00:06:32 2014 +0400
small fixes
commit 9db28f332acf53eb2001249af33919b4ac742377
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 17 19:27:34 2014 +0400
more fixes
commit 891dbeabbabf586be357c4897d0dbcca81185d0a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Feb 16 21:54:51 2014 +0400
implemented OpenCL version of cv::fastNlMeansDenoising
commit d27068f79ada4d1a344d2e2381ee239af2946178
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu Feb 13 15:15:05 2014 +0400
some more refactoring
commit e16d89e8d68895d5899b7fded655b98185ceeb54
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 11 19:08:13 2014 +0400
some refactoring
commit 5cb2d1c20d01d155f1a7cf216eaa6d30d2f0b11b
Merge: b7659c6 de6d130
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 14:25:16 2014 +0400
Merge pull request #2338 from asmorkalov:ocv_gcov
commit e460a29cab9d929de3d12632718f7c677a20d5c7
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 18 14:24:17 2014 +0400
typo
commit da9bdf9c15e435364d52cc317d3e119ca4aaae44
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Tue Feb 18 14:16:54 2014 +0400
fixes typo and unused variables
commit 77df5948e78cc630c8f6478f276b386c8affaa61
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Tue Feb 18 13:56:26 2014 +0400
removed trailing spaces
commit e35d98e566b628d52660854bf9a6e56c0251654e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 16:08:28 2014 +0400
Worked around an apparent GCC bug in moments.
commit b7659c62f393dfb80a6e6fc06772f91fe7f37a54
Merge: e6420c5 394c74b
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 13:47:45 2014 +0400
Merge pull request #2366 from yashdv:mat_copyto_doc_bug
commit edbff68843c5adc5e7261ad5798c527e38cc0c3b
Merge: b3cfe6b f60913d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 13:36:33 2014 +0400
Merge pull request #2355 from alekcac:hough_circles_fix
commit 394c74b349d1d0e912324b9e2136700be0a39e8b
Author: yash <yashdv@gmail.com>
Date: Tue Feb 18 15:04:27 2014 +0530
edited the doc for mat::copyto and clarified the part regarding reallocation by .create
commit e6420c523d73e3d92007c1e1577fa90955a3c02a
Merge: 689589e d1606b4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Feb 18 13:33:15 2014 +0400
Merge pull request #2235 from alalek:ocl_svm_perf_test
commit b3cfe6b4469420600db50c7257b106c3aef2c3c9
Merge: ff9a081 915fb63
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Feb 18 13:27:38 2014 +0400
Merge pull request #2341 from alalek:ocl_fix_error_processing
commit ff9a0815b9ad88f09bc55e8b8320745aa94869da
Merge: 2409812 6ad7b64
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue Feb 18 13:24:40 2014 +0400
Merge pull request #2352 from ilya-lavrenov:flann
commit de6d13088fc435e1cdc4c6ae4221a3912b80b2ca
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Fri Feb 14 17:43:33 2014 +0400
gcov tool support added.
commit 2409812803416e32e3c11728ab833c3885ff459d
Merge: 139a262 768da4d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 12:57:25 2014 +0400
Merge pull request #2347 from Chechli:master
commit 139a2620724a5774b751062313b8e9615798ea7e
Merge: bcf4307 afd99c9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 12:15:48 2014 +0400
Merge pull request #2367 from jet47:fix-3544
commit bcf4307345282572859bda676e51eb3b659f5ec9
Merge: 9885a67 029ffb7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 12:14:57 2014 +0400
Merge pull request #2356 from SpecLad:merge-2.4
commit 689589ebaa8c56c2a76e1a2b63dece7181654141
Merge: 95d7ecb 017a282
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 11:58:10 2014 +0400
Merge pull request #2365 from yashdv:image_tutorial_doc_bug
commit 95d7ecb33f022a5e0279896209f9848590b98621
Merge: 13182da 01527c4
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 11:57:35 2014 +0400
Merge pull request #2364 from ilya-lavrenov:unused_field
commit 13182da945ee23e9635bd3a09374cb7f4d462e4e
Merge: a0a4f6c a8eab26
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 11:56:57 2014 +0400
Merge pull request #2363 from alekcac:introduction_tut_fix
commit a0a4f6c23d8cf728fc42a59acaee2d456052cda5
Merge: 224124b 63235f5
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 11:56:36 2014 +0400
Merge pull request #2362 from alekcac:docs_style_change
commit 224124b69ea8c2d2297b8edb2cb0cec730ab6af0
Merge: e8d26b0 8236181
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue Feb 18 11:56:20 2014 +0400
Merge pull request #2360 from Evgenij-Gr:XLSreport
commit 768da4d95a77d8a7248350d53e0337b507041072
Author: Chechli <lukasz.chechlinski@gmail.com>
Date: Tue Feb 18 08:50:33 2014 +0100
Update hough_circles.cpp
commit afd99c9c81ec37a294b14612ff98a4af6daabe29
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Tue Feb 18 10:45:47 2014 +0400
fix bug #3544:
add "opencv2/core/utility.hpp" header to precomp.hpp
commit 38ef8894b7f5e85217faa6e44cf7d10fc4bc7020
Author: yash <yashdv@gmail.com>
Date: Tue Feb 18 10:51:05 2014 +0530
Made a sentence in the doc for Mat::copyTo more clearer
commit 017a282c7ab2a83922107ba5c425fb35a7ef43dc
Author: yash <yashdv@gmail.com>
Date: Tue Feb 18 10:34:58 2014 +0530
Minor error in the documentation Load and Save Image
commit 0d199b40483b321cbc27bd35dbaf09a3201e70d7
Author: Gustavo Vargas <xgvargas@users.noreply.github.com>
Date: Mon Feb 17 23:22:18 2014 -0300
Update py_image_display.rst
commit 44ecb727c559c3545203919292901405197fe0b4
Author: pxli168 <pxli168@163.com>
Date: Tue Feb 18 10:13:30 2014 +0800
Change again.
Opps.
commit 6ad7b64912755cce33ce4bd8b21a47da8a0547cc
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 17 03:00:20 2014 +0400
some more changes
commit 01527c44fd23c6a5956557910710fae2a7880a95
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 17 21:50:00 2014 +0400
removed unused field
commit a8eab26bae0bc7f7f38e9e72235896311c65de72
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Mon Feb 17 18:10:08 2014 +0400
fixed incorrect code in introduction tutorial
commit 63235f51f06f15b0eddeb3a212808f91f574400b
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Mon Feb 17 17:56:12 2014 +0400
fixed year in copyright
commit 9885a671ee819d0443a6dc62a3c8a204514405af
Merge: 47d9b93 9b627a5
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 17 17:53:05 2014 +0400
Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup
commit 47d9b933f666888e7fca8345ad77f6b42219f04a
Merge: aeeb9f9 7629bb7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 17 17:38:26 2014 +0400
Merge pull request #2345 from ilya-lavrenov:tapi_3cn_perf
commit cc529d971b7fb6b459c9cc5acde44cf1afded5d9
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Mon Feb 17 17:37:02 2014 +0400
removed tabs
commit aeeb9f9e25f27cad2092530ff51d28e841e35542
Merge: 01b225a 95e38e4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 17 17:34:19 2014 +0400
Merge pull request #2334 from alalek:umat_usage_flags_2
commit a879e1fcd69490f2a93cc88665810e72e6ca677d
Author: Rohit Girdhar <rohit@iiith>
Date: Mon Feb 17 19:00:36 2014 +0530
fixed warnings
commit 8236181c627448bf5e662648ab78ffc60d7d835e
Author: Evgeniy <evgeniy@evgeniy-MS-7850.(none)>
Date: Mon Feb 17 17:01:23 2014 +0400
Added more colorizing options to XLS generating script
commit 01a980aa9e2293c079012ead3976ed51223dbcbb
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date: Mon Feb 17 15:28:21 2014 +0400
Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries.
commit 01b225acb0ddc5af83767cd8969e3aeaa12e347e
Merge: a6d64e2 c8e22c0
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Mon Feb 17 16:45:40 2014 +0400
Merge pull request #2340 from ilya-lavrenov:tapi_lab
commit 613a17355de653d52d6f8d82339d3f3520375964
Author: Rohit Girdhar <rohit@iiith>
Date: Fri Feb 14 09:37:39 2014 +0530
rotRect using points
commit 029ffb7c2d3916958404d4ebe7ed87c0d4444e6e
Merge: a0bb74a b6dafed
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 15:24:05 2014 +0400
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
commit a6d64e254fdc5b063d5124bd93c4b10a5c41affd
Merge: a0bb74a f85aa92
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 15:00:42 2014 +0400
Merge pull request #2354 from gleb-sternharz:Branch_2.4.8
commit e8d26b02acae9c7c15f346bc5e352d8aed7ade59
Merge: 7358b44 8b8c368
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 13:35:15 2014 +0400
Merge pull request #2339 from jet47:gpu-warnings
commit 7358b442227c7994bcf65c398d773cf9504c56d2
Merge: b6dafed cce225f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 13:33:28 2014 +0400
Merge pull request #2343 from yashdv:template_matching_doc_fix
commit 9a98cd6e6520d348b0be067360236c50181e9983
Author: Marijan Vukcevich <marijan@eastsideinteractive.com>
Date: Tue Feb 4 10:10:50 2014 -0800
Update cap_ios_abstract_camera.mm
AVCaptureVideoPreviewLayer setOrientation is depricated. This fixes the warning and provides backward compatibility.
commit f60913ddd3584045132a6e0ea3bd5bd9b1e26845
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Mon Feb 17 12:55:19 2014 +0400
small changes in hough circles tutorial
commit 9211d1ac2d2b081cce64a00e9392a9458b00f13e
Author: Chechli <lukasz.chechlinski@gmail.com>
Date: Mon Feb 17 09:50:32 2014 +0100
Update hough_circles.cpp
commit 640a45d3596003cad3845d877ba592f3570c54b3
Author: Chechli <lukasz.chechlinski@gmail.com>
Date: Mon Feb 17 09:48:51 2014 +0100
Update precomp.hpp
commit a0bb74a086d33a57509d147fccfdb3abd28b37dc
Merge: cfcf07a 8829e9f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 12:24:48 2014 +0400
Merge pull request #2337 from pmoulon:master
commit cfcf07acfae100c98586baae563d375204a36154
Merge: 947fb74 a4b5641
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 12:23:59 2014 +0400
Merge pull request #2328 from rohitgirdhar:bugfix_blobdetector_kpt_radius
commit 947fb74c18485b7c0efcaa2982a07bbcfcbc57a3
Merge: f252687 01b624e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 12:22:11 2014 +0400
Merge pull request #2330 from rohitgirdhar:linux_tutorial_make_j8
commit b6dafed5ba920ec804b5ee93809a47c7099e8820
Merge: 8cbb284 e2f5001
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 12:21:19 2014 +0400
Merge pull request #2342 from yashdv:android_doc_fix
commit 8cbb284b7b8626b0824802141bedbb723267a906
Merge: 9fcb0b2 510680a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 12:02:58 2014 +0400
Merge pull request #2348 from ilya-lavrenov:typo
commit f252687eae591c07f3c1a0e51d48f901871a6a08
Merge: 3542da7 1a89a03
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 11:58:02 2014 +0400
Merge pull request #2351 from yashdv:BOW_assert_error
commit 9fcb0b220128812acf7fc1741b469fb47221ef5c
Merge: aad289a 150e522
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 11:52:00 2014 +0400
Merge pull request #2349 from jet47:fix-bug-3552
commit aad289a3a292d0c090e7f7a56d9a998f7faac917
Merge: e0d991c ed1aa73
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon Feb 17 11:48:03 2014 +0400
Merge pull request #2344 from kirill-kornyakov:replace-gittip-button
commit f85aa929f1b0227c6ed2bc983fee8ebf34f48433
Author: gleb.sternharz <gleb.sternharz@gmail.com>
Date: Mon Feb 17 04:08:30 2014 +0100
fix dev by 0 in KL-Divergence
commit 70d462b3526027ec1f27dbb054bf6c3d8336a923
Author: pxli168 <pxli168@163.com>
Date: Mon Feb 17 10:21:18 2014 +0800
Simplify the code
Simplify the code as @SpecLad suggested.
commit f74ef644bc5f3de6a7e6035c25155d6de741a2bf
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Mon Feb 17 01:37:32 2014 +0400
changed the signature of add method according to the base class
commit 1a89a03c7c7cb6f9ad69b65be7dc05dd8e6e404e
Author: yash <yashdv@gmail.com>
Date: Sun Feb 16 22:33:30 2014 +0530
Fixed CV_ASSERT condition in the code for bag of words
commit 10465c546aaf6e535d40a2c66822ef630108add8
Author: Chechli <lukasz.chechlinski@gmail.com>
Date: Sun Feb 16 13:26:00 2014 +0100
Update hough_circles.cpp
commit c8e22c04c8c71df3df360f02fa547799eaf10435
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Feb 14 18:55:11 2014 +0400
extended performance test
commit 150e522beea4807c7d6342e050a1eb6f9fb71199
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Sun Feb 16 12:17:17 2014 +0400
fix bug #3552:
replace std::swap with own code
commit 510680a5df77f520449e0e74680486e00e88fb96
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sun Feb 16 01:42:02 2014 +0400
typo
commit 7629bb78a4bf0838cfd5bcab4893a3fb0201d52a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Feb 15 15:27:27 2014 +0400
extended performance tests to test 3 channels
commit 03bd82796de2278f0fac1424a255c339d214ec10
Author: Anatoly Baksheev <no@email>
Date: Sat Feb 15 23:40:09 2014 +0400
source compatibility with master
commit 72e4f72a7593bb51cf962d02b2e313c8d32bdd67
Author: Chechli <lukasz.chechlinski@gmail.com>
Date: Sat Feb 15 17:31:14 2014 +0100
Update hough_circles.cpp
commit 9b627a5e9ff699d2d3261f63ae595df694837b39
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Feb 15 16:29:40 2014 +0400
disabled 'reshape', 'copyTo' test
commit 56754e907dcc40f5caa9bcae242a1d0ae5eb1932
Author: Anatoly Baksheev <no@email>
Date: Sat Feb 15 20:08:04 2014 +0400
fixed crash for windows if console widow is closed or CTRL_C/CTRL_BRAK keys in console are pressed.
commit 1a5dfe421dcbc5c2d831fff61ad7d5bc69c2c59c
Author: Anatoly Baksheev <no@email>
Date: Sat Feb 15 17:02:17 2014 +0400
Added WidgetMerger, Polyline - colors support for each point independently, simple widgets now compute color array instead of setting global color
commit 7ce2c3574add66252b46ce2f143fc7b6e51dd294
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Feb 15 16:04:57 2014 +0400
restored lost in PR #1735 umat tests
commit 4f36bc29d9f8d48ff493ed29f1dcffda6a478648
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Sat Feb 15 15:51:52 2014 +0400
cleaned-up UMat tests
commit ed1aa73dd3c5b43a50bac920fea7c37f0606a328
Author: Kirill Kornyakov <kirill.kornyakov@gmail.com>
Date: Sat Feb 15 13:08:52 2014 +0400
Replaced Gittip button
commit cce225f6e9cb18d5e6432e90faf8ca94f0267374
Author: yash <yashdv@gmail.com>
Date: Sat Feb 15 12:48:42 2014 +0530
fixed doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
commit e2f5001b1147829af7c75d22e811cad0150caacb
Author: yash <yashdv@gmail.com>
Date: Fri Feb 14 23:04:03 2014 +0530
fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
commit 915fb632fd82593dafed5c31c198a8c64872d639
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Fri Feb 14 19:50:58 2014 +0400
core/ocl: change error processing for missed function
commit 8150c1b7e4867a33f492f57e1154d5287f86ff76
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Fri Feb 14 17:26:28 2014 +0400
added [s|l]rgb <-> lab conversion
commit 8b8c3681484536fdc28d5fd0e8b7dd06ca2970f5
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Fri Feb 14 17:56:03 2014 +0400
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
commit d1606b4aa37f6d1d6daeebe039f593a37cbf607e
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu Jan 30 17:01:48 2014 +0400
ocl: added SVM perf test
commit 3542da7167530696a5cf24f578a7267226746f8a
Merge: 0fc248f 88f993d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 14 16:21:00 2014 +0400
Merge pull request #2336 from SpecLad:useOclChanged
commit e0d991cf46e7a3d17cd1642fda56fb44af8c02e2
Merge: fa272c4 1ce5165
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 14 16:20:44 2014 +0400
Merge pull request #2335 from jet47:gpu-alphacomp-test
commit 0fc248fb70d4460785f454cd624fcd0572f5ae5c
Merge: 534bec3 630bdbf
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri Feb 14 15:49:36 2014 +0400
Merge pull request #2326 from vpisarev:ocl_ch3
commit 95e38e457fc805fab15b34679a00cf2e96e41da1
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Mon Feb 10 16:34:45 2014 +0400
core/umat: usage flags (with proposals from PR #2195)
commit fa272c43c2f9ecb2edd23bfdbebdbba4ebc7343f
Merge: a1de9e9 1454843
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 14 15:37:09 2014 +0400
Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host
commit 8829e9f6c8efaf707275b4c42807f4b9865b59fc
Author: Pierre Moulon <pmoulon@gmail.com>
Date: Fri Feb 14 12:22:53 2014 +0100
Fix a typo error
commit f3f8b843b63fa37f37803ed48fbbb668cd7ce5d3
Author: Pierre Moulon <pmoulon@gmail.com>
Date: Fri Feb 14 12:21:35 2014 +0100
Fix a typo error
commit a1de9e9ad59ebf92574110ffe2bd4c546c1810da
Merge: ecbe843 b92a46c
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri Feb 14 14:38:36 2014 +0400
Merge pull request…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The LLVM/Clang 3.3 has a bug when compile a cl kernel with
assignment of a scalar to a vector data type. This patch
could work around this bug.
Signed-off-by: Zhigang Gong zhigang.gong@intel.com