Squashed commit of the following:

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 #2329 from ilya-lavrenov:macosx_ogl

commit 88f993dbda0ce0013938c9c422883d9261a9550b
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Feb 14 14:37:56 2014 +0400

    Deleted an assignment to a variable that doesn't exist.

commit 1ce5165cb7ccabdd0280970e3f1b6bc180055a3d
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Feb 14 14:27:43 2014 +0400

    temporary disable performance test for alphaComp function

commit 534bec3a907c3db51d48650ae2e6e8f7eda7b128
Merge: d68c688 4f2cdc9
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Feb 14 13:24:12 2014 +0400

    Merge pull request #2315 from ilya-lavrenov:nlmeans_perf

commit d68c688f22f639bfa73057024fb05917d237fbb0
Merge: 3def777 5f76072
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Feb 14 12:37:47 2014 +0400

    Merge pull request #1735 from KonstantinMatskevich:umat_tests

commit 3def7778dc7e0922e5253826f1463ea62d27a095
Merge: f297ec5 6b00c4e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Feb 14 12:09:01 2014 +0400

    Merge pull request #2062 from cook:bug3440

commit 1454843b81f642ca25716997522c6630f6bb624f
Author: Stuart Cunningham <stuartc@blackmagicdesign.com>
Date:   Fri Feb 14 16:16:17 2014 +1100

    Fix build of libtiff on big endian host due to defined but empty WORDS_BIGENDIAN macro

commit b92a46c130a0f34f07af64525fb57fd27c841654
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Feb 13 23:47:18 2014 +0400

    some more fixes

commit 6b00c4e337e24ac369b02c40fe5f35cf8b1acae7
Author: Yantao Xie <leeward.xie@gmail.com>
Date:   Thu Feb 13 23:53:58 2014 +0800

    Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab.

commit ecbe843061f847d98db1e88b04be76ed6f92fb84
Merge: b4a5352 dbe7634
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Feb 13 19:21:56 2014 +0400

    Merge pull request #2333 from asmorkalov:java_dead_code_fix

commit b4a535272c2d13e7d1ac22906d5fbfd932468b2d
Merge: b8d8b05 eb247d8
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Feb 13 19:21:45 2014 +0400

    Merge pull request #2332 from jet47:gpu-fixes

commit dbe7634286d405161adb30677aa4d07cc17e0de2
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Feb 13 18:17:47 2014 +0400

    Dead code removed as this cannot be null in Java.

commit b8d8b0568cc2b5cae386e4d77e1a1bd0c1686568
Merge: 91ab92c 7da3e98
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Feb 13 17:57:45 2014 +0400

    Merge pull request #2331 from asmorkalov:android_native_activity_finish

commit 630bdbf42fca7883585ed04ed927a009b9cd51c0
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Thu Feb 13 17:37:42 2014 +0400

    fixed OpenCL kernel flag in resize (thanks to Ilya L)

commit eb247d826f04673a23e4d050ee5cf0395bde82c2
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Thu Feb 13 17:25:59 2014 +0400

    temporary disable perf test for StereoBeliefPropagation

commit 9e69e2a07a9798d75a0949ab2b4ad063dd84e8f2
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Thu Feb 13 17:16:43 2014 +0400

    increase epsilon for AlphaComp sanity test for integer input

commit 7da3e98dfd1539c027b26fd67f9225e93af8d144
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Feb 13 16:47:02 2014 +0400

    Application pause/resume fix for Android sample NativeActivity.

commit 55b9c0374c943bd5d7224190bed8d3228dd0d792
Author: Stuart Cunningham <stuartc@hobbes.(none)>
Date:   Thu Feb 13 22:59:30 2014 +1100

    Fix cmake detection of build platform endianness

    Improve comments to indicate actual usage of WORDS_BIGENDIAN where
    it is tested with #ifdef rather than #if

commit 5f76072c623ef730228f5c8e44686e49b2a5a957
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Dec 11 13:56:41 2013 +0400

    update

commit f297ec55ae077dd2bb0aee7ee9f12282ec3e3a0a
Merge: 935e36b 7acd28f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Feb 13 12:30:19 2014 +0400

    Merge pull request #2304 from mattvenn:master

commit 01b624e3595f2a6c3eac5721c760a723a7456e1c
Author: Rohit Girdhar <rohit@iiith>
Date:   Thu Feb 13 13:52:00 2014 +0530

    -j8 in linux_installation tutorial

commit 91ab92c34910bcfb0dd07ac730d473d3b2e25fee
Merge: e556790 9aef26e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Feb 13 12:16:18 2014 +0400

    Merge pull request #2318 from gongzg:2.4

commit 935e36bc72e27f778aad2a5b633349926f2a6669
Merge: 0ee5c34 d9a322f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Feb 13 12:12:00 2014 +0400

    Merge pull request #2319 from m3d:patch-1

commit 0ee5c34f408a9b2ef476141d13b67237e621c386
Merge: 863e9c6 9158705
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Feb 13 11:46:23 2014 +0400

    Merge pull request #2324 from vpisarev:fix_facedetect

commit 7acd28fbea28d370ae879bf75a0a12ecb47d7ff5
Author: Matt Venn <matt@mattvenn.net>
Date:   Thu Feb 13 07:44:29 2014 +0000

    added imgpoints back

commit a0a3b8b56df52c07f436c8cb6e7c5dad2b51bd98
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Thu Oct 31 16:25:13 2013 +0400

    Some tests for UMat

commit 879c0196d44dc62ac394f76b13cf64047c40c16d
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Feb 13 00:17:15 2014 +0400

    enabled OpenGL on MacOSX

commit a4b5641836c172b4f5abe9b4334a7de8873677c5
Author: Rohit Girdhar <rohit@iiith>
Date:   Wed Feb 12 22:29:04 2014 +0530

    bugfix: blobdetector was putting incorrect diameter value in keypoints

commit 91587059ad51a84d61e1e58519d00958060981dd
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Wed Feb 12 20:28:55 2014 +0400

    tab => spaces

commit 290fbc01211b9785fcf6d531e2fe39fe7c3fa1a2
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Wed Feb 12 19:29:18 2014 +0400

    3-channel support in OpenCL kernels for setTo, resize, warpAffine and warpPerspective

commit a18bc9651d82b1dc2e2f17ecb32c8a798372dea0
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Wed Feb 12 17:42:09 2014 +0400

    fixed bug reported by Irina K. Also tried to fix LBP detector regression in quality (probably it did not help but still ...)

commit 5d43d3ca882d4e083fcf24484744f98346263f26
Author: Stuart Cunningham <stuartc@hobbes.(none)>
Date:   Wed Feb 12 23:41:38 2014 +1100

    Fix Windows build of grfmt_tiff.cpp by using libtiff's integer types.

commit 863e9c699ad6c32ad9853c7108ada1340c874e9d
Merge: fa38ea6 3959329
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Feb 12 16:32:29 2014 +0400

    Merge pull request #2322 from berak:b_cc_read

commit e55679079f343e58a1a590bc8acbb935f132230a
Merge: 3994cfb e55f2b2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Feb 12 16:27:24 2014 +0400

    Merge pull request #2320 from asmorkalov:ocv_readme_license_install

commit 3994cfbc599e822ff4e23b5c8e112aee98cf1577
Merge: bb4199b d02c291
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Feb 12 15:41:28 2014 +0400

    Merge pull request #2321 from asmorkalov:android_run_all_tests

commit fa38ea6d50a33ba21a47498fc23dbf22abb79ae2
Merge: 511e79a 2806679
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Feb 12 15:14:25 2014 +0400

    Merge pull request #2317 from blueskymonster:master

commit d9a322f6066113a0feeb055ecbc08bacef669d77
Author: Martin Dlouhy <md@robotika.cz>
Date:   Wed Feb 12 11:25:03 2014 +0100

    undo changes of cv2.cv.* functions/constants

commit d02c2911607b199e18988c29c3fb9df141555974
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Wed Feb 12 10:56:57 2014 +0400

    opencv_run_all_tests.sh implemented for Android SDK.

commit 8bbce0a2a2039fbb253eee3b87453b4351989601
Author: Stuart Cunningham <stuartc@hobbes.(none)>
Date:   Wed Feb 12 21:21:06 2014 +1100

    Fix reading of 16-bit TIFF images on big endian host.

    Use correct integer types for arguments to TIFFGetField to avoid corruption
    of values and failed loads of TIFF file when using cv::imread().

    Added test where both big and little endian TIFF files are read using imread().

    Fixed build of 3rdparty libtiff on big endian hosts.

    Reduced memory required during decode_tile16384x16384 test by not converting
    large grayscale test image to color image during read.

commit e55f2b26028a5261806fb8e972b6165c40593357
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Wed Feb 12 10:29:53 2014 +0400

    LICENSE and README files installation rules added.

commit f7620dc7d184a8a26a0cd6317566821035c3abc2
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Wed Feb 12 12:18:55 2014 +0400

    added 3-channel support to arithmetic operations

commit bbefc101de6a94600880f697c4ab3d6ead3d36f0
Author: Martin Dlouhy <md@robotika.cz>
Date:   Wed Feb 12 07:06:05 2014 +0100

    removed return images and fixed cv2 names

commit 280667978193c199af148000a358f1e6376d0f7a
Author: Elliot Godzich <elliot.godzich@gmail.com>
Date:   Tue Feb 11 21:46:14 2014 -0800

    Updated DisplayImage.cpp program to compile

    CV_WINDOW_AUTOSIZE -> WINDOW_AUTOSIZE

commit 9aef26e2ad05dea8a5203e01a2de148ba86cfdf2
Author: Zhigang Gong <zhigang.gong@intel.com>
Date:   Wed Feb 12 11:23:27 2014 +0800

    Workaround a LLVM/Clang 3.3 bug.

    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>

commit 261546f6f619bb5c77cad529e8114bdc16b5f508
Author: Anatoly Baksheev <no@email>
Date:   Tue Feb 11 23:27:19 2014 +0400

    casting Vec3b operator for viz::Color

commit 4f2cdc9bac7712dc8059418bc73a7faf7141898b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Feb 6 18:03:54 2014 +0400

    added performance tests for NLMeans

commit 511e79aef7d232b1e0da94ba81c15fd0bf727b0c
Merge: 1cef6f9 f7041ba
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Feb 11 17:11:06 2014 +0400

    Merge pull request #2311 from SvenWe:master

commit 1cef6f9fb17d80044bc5976a603e95daeeeee352
Merge: dad536f 47a4144
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Feb 11 17:10:22 2014 +0400

    Merge pull request #2313 from m3d:patch-1

commit bb4199b177f2abab7d83a0359ffddaa29f168277
Merge: 63dbe66 2816668
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Feb 11 17:06:38 2014 +0400

    Merge pull request #2314 from ilya-lavrenov:typo

commit dad536f4905dd4000156917d20685819b6351791
Merge: 7a35f45 67a2c4e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Feb 11 16:46:33 2014 +0400

    Merge pull request #1851 from dneelyep:patch-1

commit 281666887e8233c4dd2a8ed289e30ef0b9c71300
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Feb 11 14:25:37 2014 +0400

    typo

commit 7a35f4593ed39922e016302bb05560a56631892d
Merge: 86b6c48 72aabb8
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Feb 11 13:44:51 2014 +0400

    Merge pull request #2310 from SpecLad:merge-2.4

commit 72aabb8a8419c4fff0372ce3ac852b9b22e40b87
Merge: 86b6c48 1d68a89
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Feb 10 17:50:03 2014 +0400

    Merge remote-tracking branch 'origin/2.4' into merge-2.4

    Conflicts:
    	CMakeLists.txt
    	cmake/OpenCVGenAndroidMK.cmake
    	cmake/templates/OpenCV.mk.in
    	doc/tutorials/viz/creating_widgets/creating_widgets.rst
    	doc/tutorials/viz/launching_viz/launching_viz.rst
    	doc/tutorials/viz/table_of_content_viz/images/image_effects.png
    	doc/tutorials/viz/transformations/transformations.rst
    	doc/tutorials/viz/widget_pose/widget_pose.rst
    	modules/core/include/opencv2/core/affine.hpp
    	modules/core/include/opencv2/core/core.hpp
    	modules/gpu/perf/perf_imgproc.cpp
    	modules/gpu/src/cuda/canny.cu
    	modules/gpu/src/cuda/generalized_hough.cu
    	modules/gpu/src/generalized_hough.cpp
    	modules/gpu/src/imgproc.cpp
    	modules/gpu/test/test_color.cpp
    	modules/gpu/test/test_core.cpp
    	modules/gpu/test/test_gpumat.cpp
    	modules/gpu/test/test_hough.cpp
    	modules/nonfree/CMakeLists.txt
    	modules/nonfree/include/opencv2/nonfree/gpu.hpp
    	modules/nonfree/perf/perf_gpu.cpp
    	modules/nonfree/src/cuda/surf.cu
    	modules/nonfree/src/precomp.hpp
    	modules/nonfree/src/surf_gpu.cpp
    	modules/nonfree/test/test_gpu.cpp
    	modules/ocl/perf/perf_haar.cpp
    	modules/stitching/CMakeLists.txt
    	modules/stitching/include/opencv2/stitching/detail/matchers.hpp
    	modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
    	modules/stitching/include/opencv2/stitching/detail/warpers.hpp
    	modules/stitching/include/opencv2/stitching/warpers.hpp
    	modules/stitching/src/blenders.cpp
    	modules/stitching/src/matchers.cpp
    	modules/stitching/src/precomp.hpp
    	modules/stitching/src/seam_finders.cpp
    	modules/stitching/src/stitcher.cpp
    	modules/stitching/src/warpers.cpp
    	modules/viz/doc/widget.rst
    	modules/viz/include/opencv2/viz/types.hpp
    	modules/viz/include/opencv2/viz/viz3d.hpp
    	modules/viz/include/opencv2/viz/widget_accessor.hpp
    	modules/viz/src/precomp.hpp
    	modules/viz/src/shapes.cpp
    	modules/viz/src/vizcore.cpp
    	modules/viz/src/vtk/vtkCloudMatSink.h
    	modules/viz/src/vtk/vtkCloudMatSource.h
    	modules/viz/test/test_precomp.hpp
    	modules/viz/test/tests_simple.cpp
    	samples/android/tutorial-4-cuda/CMakeLists.txt
    	samples/android/tutorial-4-cuda/jni/Android.mk
    	samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java
    	samples/cpp/stitching_detailed.cpp
    	samples/cpp/tutorial_code/viz/creating_widgets.cpp
    	samples/cpp/tutorial_code/viz/launching_viz.cpp
    	samples/cpp/tutorial_code/viz/transformations.cpp
    	samples/cpp/tutorial_code/viz/widget_pose.cpp

commit 47a41449e3e72021fe2e791ab4de5d3166da716a
Author: Martin Dlouhy <md@robotika.cz>
Date:   Mon Feb 10 20:32:54 2014 +0100

    fixed spelling and removed return images

commit f7041bacc0095f51d36194f09b74ea179e46f12d
Author: Sven Wehner <wehner@informatik.uni-freiburg.de>
Date:   Mon Feb 10 16:45:28 2014 +0100

    grabcut.py sample: Allow drawing rect from bottom/right

    The grabcut sample script isn't able to create rectangles correctly that are
    drawn from e.g. bottom-right to top-left.
    This small commit uses four min() calls to determine the correct
    top-left point of the rectangle.
    It also removes some unnecessary white spaces before colons.

commit 2d33063a590edccf7926bc027cc9a58fc9baa83c
Author: Matt Venn <matt@mattvenn.net>
Date:   Mon Feb 10 14:51:29 2014 +0000

    removed whitespace at end of line 96

commit f1c062c30ab9eb02ea1b1bd8d221dc85ad7b2d27
Author: Anatoly Baksheev <no@email>
Date:   Mon Feb 10 13:27:08 2014 +0400

    cloud collection finalize

commit 5dc17f5d587b866aaee676c723a2bd30e1f710e2
Author: Anatoly Baksheev <no@mail>
Date:   Sat Feb 8 19:31:24 2014 +0400

    Fixed all OpenGL issues for Macos (via objective-C++ layer)

commit 069dd8a068263f6b0cfce647d11637baaf48b745
Author: Anatoly Baksheev <no@email>
Date:   Sat Feb 8 16:11:20 2014 +0400

    default meshlab background

commit f8ccc115ef3f593b4b44f5efbc7c79a276e8619d
Author: Anatoly Baksheev <no@email>
Date:   Sun Feb 2 22:08:18 2014 +0400

    proper render call order (fixes some issues with VTK6.1)

commit 17fea0dd0ad30f06d4676eb1d4e9320b4e6e9aa4
Author: Anatoly Baksheev <no@email>
Date:   Sun Feb 2 21:29:33 2014 +0400

    fixed size_t/int conversion warnings

commit 998aefd1d10a5cce794cf4c81248796719b9b0e6
Author: Anatoly Baksheev <no@email>
Date:   Sun Feb 2 20:43:43 2014 +0400

    cloud collection merges data only on rendering

commit 975a6299fa1b1fee9454567280fbe251347512dd
Author: Anatoly Baksheev <no@email>
Date:   Sun Feb 2 18:56:55 2014 +0400

    More proper OpneCv+Qt+Vtk issues handling (http://code.opencv.org/issues/3492)

commit eb8728d72751d78342d2dbb9fb11110380cf6c50
Author: Anatoly Baksheev <no@email>
Date:   Sun Feb 2 19:00:54 2014 +0400

    Updated cloud io functionality - removed dependency from VTK legacy

commit 63dbe66b414124e3745dd77fc71e4c69a9e7367d
Merge: 3cc27c7 8b44a42
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Feb 10 15:10:30 2014 +0400

    Merge pull request #2308 from jet47:gpu-tests-timeout

commit 3cc27c769c1558fa6aa070002ca208666742a021
Merge: 1d68a89 becbfa6
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Feb 10 14:59:04 2014 +0400

    Merge pull request #2309 from Nerei:fixed_cl_exe_hang_with_eigen

commit becbfa62812710cf2ef5becd3322374deb777769
Author: Anatoly Baksheev <no@email>
Date:   Mon Feb 10 13:41:27 2014 +0400

    Fixed Cl.exe hang for VS2008 x64 with Eigen::exp() function

commit 8b44a42a403548c244aaea6852fb09935a0741e9
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Mon Feb 10 11:50:14 2014 +0400

    decrease input size for several gpu tests to fix "timed out" error:

    * BruteForceNonLocalMeans
    * OpticalFlowBM

commit 3959329ef412cbedeb2c02981cc52b08301aad79
Author: berak <px1704@web.de>
Date:   Sat Feb 8 14:42:09 2014 +0100

    proper initialization for ccimpl in bool CascadeClassifier::read(const FileNode

commit 3170414ca8561264fc45ce766f0b6ffc847a199c
Author: Matt Venn <matt@mattvenn.net>
Date:   Fri Feb 7 22:18:59 2014 +0000

    fixed whitespace

commit a0bfdb9bf1e63b898546334e4d13edc81b314087
Author: Matt Venn <matt@mattvenn.net>
Date:   Fri Feb 7 20:53:57 2014 +0000

    fixed examples for opencv 2.4.8

commit 1d68a89947882fd20c6e11ae46f1eb0241a38a96
Merge: 48f95d9 5dbdadb
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Feb 7 19:03:14 2014 +0400

    Merge pull request #2303 from jet47:gpu-canny-fix

commit 86b6c48712df872df9ebc917aaebf0f8446171f4
Merge: 8b16b8b ce992c8
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Feb 7 17:45:15 2014 +0400

    Merge pull request #2295 from alalek:opencl_align_rw_buffers

commit 48f95d92ae99db47a48680826512814dcb964022
Merge: 5a8363a 5d099df
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Feb 7 16:54:49 2014 +0400

    Merge pull request #2294 from jet47:fix-gpu-issues

commit 8b16b8b6571c9ce6cbd26f80997632eb40dc9faa
Merge: 4b31b9c 38f46eb
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Feb 7 16:54:29 2014 +0400

    Merge pull request #2296 from apavlenko:fix_coverity_scan

commit 5dbdadb769e97f47b64655b5b3144787c57e2740
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Feb 7 16:04:29 2014 +0400

    fixed several bugs in CUDA Canny implementation:

    * out of border access in edgesHysteresisLocalKernel
    * incorrect usage of atomicAdd

commit 5a8363a44edf9e86f2c2e8748ff0be1d3d41f0cb
Merge: d534d04 3e1f74f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Feb 7 15:34:45 2014 +0400

    Merge pull request #2301 from jet47:fix-nonfree-build

commit d534d04f25dff03c1ad0a0e418c6549230c7b2ee
Merge: c1b6bf2 b86088b
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Feb 7 15:33:59 2014 +0400

    Merge pull request #2297 from asmorkalov:ocv_testdata_install_perms_fix

commit bfc27271e2543bb0807f6dc000f770993a740581
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Feb 7 14:55:06 2014 +0400

    Revert "disable gpu Canny and HoughCircles perf tests:"

    This reverts commit dbce90692acd84fbf46bde4da4b1726049f42857.

commit ce992c8269559a459bb3cf9d2418cf1641336cca
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Feb 6 19:07:30 2014 +0400

    ocl: update gftt

commit e371901dd9c4d7af3d3e372bb8d917bc9202fc58
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Feb 6 17:27:29 2014 +0400

    ocl: workaround for failures with misaligned host buffers

commit b86088b89c43ba1b7db2d8435f222489722e62c9
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Feb 6 23:36:23 2014 +0400

    Implicit testdata directory permissions setup added.

commit c1b6bf21d5e9aa5806de6507d9de7b5de4cea93a
Merge: 34b02f6 b10d4b0
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Feb 7 14:39:08 2014 +0400

    Merge pull request #2300 from asmorkalov:android_no_cuda_not_armeabiv7a

commit 3e1f74f2cafc5c38d0e64928149edb87d9b28d28
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Feb 7 13:40:37 2014 +0400

    fix nonfree module compilation without CUDA

commit b10d4b05ed3eb9947bcb3dd183da69e44be5e30a
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Feb 7 12:46:24 2014 +0400

    dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a.

commit 4b31b9cb8cbc673ca8db95fdec8a3e707d04fef2
Merge: 710d51b 412468e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Feb 7 11:33:49 2014 +0400

    Merge pull request #2251 from ilya-lavrenov:tapi_sqrboxfilter

commit 44cc51dfb105315157afd7bb5002f6c04f644eb1
Author: Gustavo Vargas <xgvargas@users.noreply.github.com>
Date:   Thu Feb 6 18:21:19 2014 -0200

    Update py_image_display.rst

    OS information removed.

commit 710d51bb41ca66629771e93cd66d123008f34e25
Merge: 9ff5a24 af0040e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Feb 6 21:38:22 2014 +0400

    Merge pull request #2287 from ilya-lavrenov:mat_step

commit 9ff5a24f9229e5ff6c44a65097d1cee1d2244236
Merge: 7daf26d e190d3f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Feb 6 21:37:57 2014 +0400

    Merge pull request #2289 from ilya-lavrenov:umat_expr

commit 38f46eb3b45e0a05511ce0d90dba2546777bc640
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Feb 6 21:33:44 2014 +0400

    fixing issues from coverity scan 1167937, 1167938, 1167939, 1127248 (http://scan.coverity.com/projects/169?tab=Overview)

commit 412468e0ae3ffcd22a06b7480d909757b9c5634d
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Feb 1 00:05:05 2014 +0400

    added cv::sqrBoxFilter to T-API

commit 5d099df57864d083881f026ffe32637afac6ba2e
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Thu Feb 6 16:58:40 2014 +0400

    Revert "disable CUDA generalized Hough Transform"

    This reverts commit 33d42b740c6fe938b63a0b25c9ad51741aba48c3.

commit 3e4bb371c8a364315dec18df14674d9164b7523d
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Thu Feb 6 12:41:19 2014 +0400

    fix epsilons for several gpu tests

commit b6ba1f226c3da6ba726416f92550410145e89c10
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Thu Feb 6 10:12:20 2014 +0400

    Revert "disable gpu CvtColor.*2HSV tests:"

    This reverts commit 952027a8536215a5e4308c79a59308c6b3426354.

commit da44a2fac1c0be45d2a987c165298a9629757723
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Wed Feb 5 15:59:13 2014 +0400

    Revert "disable gpu Subtract_Array test:"

    This reverts commit e91bf95d5832e87aa70240c50f0bf7fcc587e8c8.

commit 7daf26d39860ee649b445ea53c0969de2d0526af
Merge: b6675ee 1f5007f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Feb 6 16:47:15 2014 +0400

    Merge pull request #2269 from Nerei:qt5_vtk_guards

commit 34b02f643777940a7f7af632843af7e96fe2dc42
Merge: e91b818 6ae4a9b
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Feb 6 16:45:48 2014 +0400

    Merge pull request #2276 from asmorkalov:android_install_cuda

commit af0040eab0a381884b43d0888ff661ed12ca75e5
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Feb 5 16:01:15 2014 +0400

    condition for Mat step

commit 6ae4a9b09bf4b3572b2d31136528f1faa809a065
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Tue Feb 4 13:25:47 2014 +0400

    Multiple improvements in OpenCV examples build.

    EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
    INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
    opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
    CUDA initialization apportunity added to OpenCVLoader.initDebug();
    Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.

commit e91b818e3e72544bc048f41d17b3603c35f8b309
Merge: a078653 530702c
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Feb 6 14:59:31 2014 +0400

    Merge pull request #2292 from asmorkalov:ocv_deb_tests_script_path_fix

commit b6675ee2a85f957e352aef05f31b31b16428387c
Merge: 721d014 bdfa9fa
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Feb 6 12:55:04 2014 +0400

    Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray

commit a078653ab43876bd4438130580c4eefa1508c655
Merge: feed2c0 435615b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Feb 6 12:52:27 2014 +0400

    Merge pull request #2285 from KonstantinMatskevich:ocl_test_cascade2.4

commit 530702c5f2350c58f0e9078b5fde8185af6a3c77
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Feb 6 12:35:14 2014 +0400

    Absolute path to tests in opencv_run_app_tests.sh fixed.

commit feed2c074d1f961289c37517282f2ae791e2249c
Merge: 4ab891e 65b4d77
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Feb 6 12:20:07 2014 +0400

    Merge pull request #2288 from asmorkalov:android_project_properties_generation_fix

commit 390fa14a2a92c68fd07b3da4db45be4cca5145be
Author: Gustavo Vargas <xgvargas@users.noreply.github.com>
Date:   Wed Feb 5 21:25:16 2014 -0200

    Update py_image_display.rst

commit e190d3fd3680c807464654f101e8775012e471b3
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Feb 5 19:35:00 2014 +0400

    added perf test

commit 563dc5aa38b8bccfe91982a007f0f3fa4f5174a4
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Feb 5 19:10:02 2014 +0400

    implemented umat expressions

commit 721d0145e0e9c9b65e3e2ab0457868773c4702c3
Merge: 9493a4e 6ae16eb
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Feb 5 17:47:26 2014 +0400

    Merge pull request #2002 from abak:stereo_calibrate

commit 65b4d779597ffdfe909cb01f6163b1c404b040c2
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Wed Feb 5 17:34:19 2014 +0400

    project.properties file generation fixed for per-component installation.

commit 9493a4ec4eb684d03eb1b23b741752c14317e3d7
Merge: 02bf498 9f8de69
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Feb 5 14:00:20 2014 +0400

    Merge tag '3.0-ocl-tp2' (-s ours)

    OpenCV 3.0 OpenCL Technical Preview 2

commit 9f8de69505da51aec83044ca9bf12cb6a06c2c02
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Feb 5 13:57:04 2014 +0400

    Set status to -tp2.

commit bdfa9fa14a48614fb0d40e47d86fddd517aec8c6
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Feb 5 13:51:14 2014 +0400

    fixes2

commit 02bf4984cb7816ede2ccce0a4713c3de81e812aa
Merge: e6f3c9b 84fa60a
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Feb 5 13:37:05 2014 +0400

    Merge pull request #2284 from KonstantinMatskevich:ocl_test_cascade

commit 4ab891e9e5fb23456439f810c1fed1065c53648a
Merge: ccda4bf 0cd0e47
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Feb 5 12:36:37 2014 +0400

    Merge pull request #2277 from asmorkalov:android_test_path_fix

commit 435615ba2e14b19e5fe2d3bb3036273eee7979bc
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Feb 5 12:23:36 2014 +0400

    update test CascadeClassifier

commit 84fa60abb8796b2231ba434c6de2c4072d6fb720
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Feb 5 12:06:48 2014 +0400

    update test for cascade

commit 1aa83d324b0bcd6319b422440e8a9c5e659b7153
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Feb 5 11:31:25 2014 +0400

    fixed docs2

commit e6f3c9b0bf6534f6e4e0d103969a8d280c8bed0a
Merge: 055f41c 3e0c72a
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Feb 5 11:07:19 2014 +0400

    Merge pull request #2281 from vpisarev:ocl_surf

commit eb4c2cd59f889f19aff256de526e00a188c524d1
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Feb 5 10:55:26 2014 +0400

    removed CV_IN/OUT

commit a0ccb46a7fd6b60ea5cd21af1e94a4c6fde25799
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Feb 5 10:49:56 2014 +0400

    fixed docs

commit b0f617bc012b711262e2e227623ed9ec4d679854
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Feb 5 09:59:04 2014 +0400

    fixes

commit 055f41c92a6cb91dbd607c7ebc105dab0c5eb0fa
Merge: 564f5fc 2e8579f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Feb 5 09:27:06 2014 +0400

    Merge pull request #2250 from ilya-lavrenov:tapi_renaming

commit 2e8579fe9b91a1186f41fca348ed351f1d6f4307
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Jan 31 21:00:16 2014 +0400

    cleaned up super_resolution sample from old OCL

commit 3e0c72a8f73846343c78b80a6a3836ca26721c13
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Feb 4 21:50:04 2014 +0400

    fixed warnings/errors from GCC

commit 564f5fcca39ff2537e1f624f0aadd36709386c4c
Merge: b7ffed7 d957e8e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Feb 4 21:22:49 2014 +0400

    Merge pull request #2280 from ilya-lavrenov:attempt_pvc

commit 092d058d06e35bb4b53eb0d8c5940a2cec3012e7
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Feb 4 21:19:31 2014 +0400

    fixed warnings from OCL and DOC builders

commit b7ffed7b464e92fb8259a85c4fa8c551c6c5549a
Merge: 42ac312 83a2b56
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Feb 4 20:45:27 2014 +0400

    Merge pull request #2279 from alalek:fix_memory_leak_getumat

commit 38f5c7140c43cb64a1e91eefa5241653022a3f80
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Feb 4 20:41:11 2014 +0400

    undone change in ocl.hpp (explicit Image2D constructor)

commit c18d1ee2a91685d5279a7db4b4e2b6133415071b
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Feb 4 20:00:51 2014 +0400

    SURF kind of works (let's see if the tests pass)

commit c7fe162829bdf9952bd65e6365dab64c8416e184
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Jan 31 20:23:01 2014 +0400

    renamed **2 -> **

commit d957e8e40d8cc7771f05e504c1727281652a4450
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Feb 4 19:47:58 2014 +0400

    attempt to fix pure virtual call in Mat::deallocate

commit 42ac3123ece1b7a9bf09ab444fe9c08ae0b482db
Merge: 22146e4 4856353
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Feb 4 19:13:07 2014 +0400

    Merge pull request #2192 from alalek:buffer_pool

commit ccda4bf008b720664d9dab4fa88381a3ed19595a
Merge: b8c6adc 286fe26
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Feb 4 18:59:13 2014 +0400

    Merge pull request #2274 from jet47:android-mk-fix

commit 83a2b566a3d7ef0850ded63fbfdae228c55af94a
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Tue Feb 4 17:23:26 2014 +0400

    fix memory leak for Mat::getUMat() operation

commit f44334285b6b745bc04d9c320359b5ac35593fc4
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Tue Feb 4 16:34:18 2014 +0400

    features2d

commit 485635310c266914b1e0e2ee9a7106386e9fc9f4
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Jan 16 18:30:39 2014 +0400

    core/ocl: OpenCLBufferPool

commit 22146e4b181f8c42946ec3bd5ac1e2c42032d46e
Merge: bd6620f 3495c59
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Feb 4 16:35:11 2014 +0400

    Merge pull request #2234 from KonstantinMatskevich:ocl_tapi_hog

commit bd6620fa87ad415144a473bf52a341ecb96771e2
Merge: 49db511 da5b316
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Feb 4 16:34:27 2014 +0400

    Merge pull request #2252 from ilya-lavrenov:ocl_ref

commit 49db51188217691246917b317f6c98be890a6563
Merge: 5968b88 98b72ff
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Feb 4 16:32:42 2014 +0400

    Merge pull request #2268 from ilya-lavrenov:tapi_pow

commit 5968b8816e6e7f96f91e7b9ebf2351da594227aa
Merge: 92c8b94 85d519b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Feb 4 16:32:11 2014 +0400

    Merge pull request #2275 from ElenaGvozdeva:ocl_matchTemplate

commit 0cd0e4749bd74c2050b3e3cf082ced6bdc489376
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Tue Feb 4 16:23:01 2014 +0400

    Tests install path fix for Android SDK.

commit c684da35495676cdf82dbb6d6fea68f6b9072bbc
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Tue Feb 4 11:09:29 2014 +0400

    drawing

commit 85d519b6c3b6e2d3597fdabb4cd57158e8a13c30
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Tue Feb 4 10:54:02 2014 +0400

    fixed

commit 286fe261d07a7faf481ac907c6f09b3fece4aa64
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Tue Feb 4 10:29:43 2014 +0400

    save previous values of LOCAL_* variables and restore them at the end

commit a098fb1803a6bd4d6ebe58c4a1dd0f2dfea464ab
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Tue Feb 4 10:29:15 2014 +0400

    fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)

commit 8d5e95226322268381be212533eaabe80c950414
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Feb 4 03:21:03 2014 +0400

    very preliminary port of SURF to T-API (compiles but certainly does not work)

commit da5b316b4e75cdbb85e1170528b7d10efeac078c
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Feb 1 15:07:03 2014 +0400

    minor ocl.cpp refactoring

    fix for cv::LUT and cv::transpose

commit 92c8b94ba9c9ecf6a5b9ae7642251ae93d31fe53
Merge: 9dede73 de4b1c6
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Feb 4 00:39:09 2014 +0400

    Merge pull request #2265 from vpisarev:ocl_facedetect_amd3

commit 98b72ff389737ab7c99a1b7b18b4eef19195b29e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Feb 3 17:38:28 2014 +0400

    optimized cv::pow for integer power

commit 9dede73d9fe994a4ab25d2e1383a44be434f5629
Merge: 810dc26 aaa9be7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Feb 3 17:35:14 2014 +0400

    Merge pull request #2153 from scottbreyfogle:constrained-hough-lines

commit 810dc262ad074ce94178188fa9c49f1895003c5e
Merge: b3a48e1 ffeb223
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Feb 3 17:32:20 2014 +0400

    Merge pull request #2196 from KonstantinMatskevich:ocl_bugcautching

commit b3a48e1eed86a7e9bbf8a68844e91608f2f98627
Merge: 109e71e 91ca834
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Feb 3 17:31:57 2014 +0400

    Merge pull request #2264 from alalek:bug_fix_3470

commit 109e71e4ef190b5e894242c2a6f2d47f1ec402e1
Merge: b5d8f4d 9a1e461
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Feb 3 17:25:12 2014 +0400

    Merge pull request #2263 from ilya-lavrenov:include_fix

commit b5d8f4d5e533d55a5ea145c6ace890de15ffc8c0
Merge: 7cfb7bc 2bb3de5
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Feb 3 17:00:21 2014 +0400

    Merge pull request #2031 from berak:b_flann_timer_30

commit 7cfb7bc8cd10b310abc005244d7290ebf33a0a96
Merge: 652a0bd d155639
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Feb 3 16:58:57 2014 +0400

    Merge pull request #2120 from prclibo:master

commit 3495c5953c473bccc2809a3aa24b46879c4c7258
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Jan 31 19:33:02 2014 +0400

    fixes

commit de4b1c668d7f043ef3f2f812f86e0ba7978fa86b
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Feb 3 16:36:36 2014 +0400

    hopefully fixed compile warnings and the doc builder warnings

commit b8c6adc56947d0dd7f04ef7c57edc9d5569ad532
Merge: cd1ffd1 3dc2dbc
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Feb 3 16:16:50 2014 +0400

    Merge pull request #2178 from Nerei:viz_backport

commit cd1ffd169cdfec746f9aecca2f0fc51ea494abc2
Merge: a1ad1f0 214cbab
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Feb 3 15:35:55 2014 +0400

    Merge pull request #2261 from jet47:stitching-cuda-android

commit 652a0bd5ce90b2237b0e0495bb46e9a94701d52a
Merge: 0fef7f8 2bbda9d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Feb 3 15:33:40 2014 +0400

    Merge pull request #2262 from SpecLad:merge-2.4

commit 11926dafb24b07b409959878466216cb89f2fda5
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Feb 3 15:31:32 2014 +0400

    eliminate crash in ipp-accelerated norm and mean functions (thanks to Matt Curfman and Aaron Kunze for the patch)

commit 30593ee55e684a8b2a179c4bbbb49ab7d16e14cb
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Feb 3 15:12:27 2014 +0400

    3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.

commit 9a1e46145001478ec13c1d9b913b675687d9ad25
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Feb 3 14:47:32 2014 +0400

    fix for PR 2166

commit 5c38519c65c1c0de59157805a56025d4af9285da
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Jan 31 08:46:27 2014 +0400

    some changes

commit 3ea32b87bb9ca59885f3e6d97e9a64e407dedc0e
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Thu Jan 30 16:26:54 2014 +0400

    perf test

commit 9a62df16507fc695a93a0e61b12e1740e1428c00
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Thu Jan 30 16:25:41 2014 +0400

    HOG

commit 91ca834be921b149324ad72818f1e137bbc25788
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Mon Feb 3 14:46:22 2014 +0400

    bug fix for issue 3470

commit 0fef7f8b963c4006d04200549152bccdbdf40c3f
Merge: 13875b5 6ad4823
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Feb 3 14:38:59 2014 +0400

    Merge pull request #2217 from ilya-lavrenov:tapi_superres

commit ffeb2231508a7bf33a9927512fd6b920446e7b48
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Thu Jan 23 17:54:53 2014 +0400

    test for failure

commit cc47edb8504bb9e500667540183ee9e1d7fc4c0a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Feb 2 15:31:14 2014 +0400

    more strict checks and reseting state

commit aa23a842a1042f7ef473c316f14db5fa27f35fc1
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Thu Jan 23 17:54:53 2014 +0400

    test for failure

commit 13875b5fbc0284fb1d239bc3ab03f8a7f0802d2b
Merge: a2fcacc 19f799b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Feb 3 14:26:05 2014 +0400

    Merge pull request #2257 from ilya-lavrenov:tapi_opencl_game2

commit a1ad1f0800cb7e1b54739ac448bbb216738aa85a
Merge: 2bef73c ede5b23
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Feb 3 14:24:36 2014 +0400

    Merge pull request #2259 from ilya-lavrenov:ocl_surf

commit a2fcaccf8b138d72af1e506cb75f37b43144d061
Merge: cb1e4b2 31b7cdc
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Feb 3 14:17:49 2014 +0400

    Merge pull request #2258 from ilya-lavrenov:tapi_video

commit cb1e4b2edecaca584003c6cb5b1e8d9912da6fa2
Merge: 206df7f e844c08
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Feb 3 14:10:20 2014 +0400

    Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl

commit 2bbda9d225028c8462f926b600774e5b07fee264
Merge: 82330a5 2bef73c
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Feb 3 13:23:59 2014 +0400

    Merge remote-tracking branch 'origin/2.4' into merge-2.4

    Conflicts:
    	modules/cudaimgproc/test/test_color.cpp
    	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
    	modules/gpu/perf/perf_imgproc.cpp
    	modules/gpu/src/imgproc.cpp
    	modules/gpu/test/test_core.cpp
    	modules/gpu/test/test_imgproc.cpp
    	modules/java/generator/src/cpp/VideoCapture.cpp
    	samples/gpu/performance/CMakeLists.txt
    	samples/tapi/CMakeLists.txt

commit 214cbabc4073c17413c2982ce06266e777e73654
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Mon Feb 3 12:55:03 2014 +0400

    update stitching sample

commit a138e5a6a585e9dfc686d76b9769adeff02672b3
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Mon Feb 3 12:35:24 2014 +0400

    turn on CUDA part of stitching module on Android for non-dynamic build

commit 206df7fdb154d834011ac85afe1e895f496fe779
Merge: 82330a5 f8dd996
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Feb 3 12:14:14 2014 +0400

    Merge pull request #2255 from ilya-lavrenov:ocl_doc

commit 82330a51bd8397f302a20e6d7d937ff4bfd9aacc
Merge: c967069 a6104bd
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Feb 3 12:12:11 2014 +0400

    Merge pull request #2253 from ilya-lavrenov:cuda

commit c967069922b04f48f697a819aaca9b58ff0c7ed8
Merge: 75dde49 ec3eb14
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Feb 3 12:11:27 2014 +0400

    Merge pull request #2254 from ilya-lavrenov:opengl

commit d8f7377122a65512db2f443535a9d01ea336470c
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Mon Feb 3 11:52:43 2014 +0400

    turn on CUDA part of nonfree module on Android for non-dynamic build

commit ede5b23753f9946ba107237a3eaae006afd82b4f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Feb 2 18:24:21 2014 +0400

    rewrote perf tests for SURF

commit e844c08203fa84b9cbe5271490c7e2c3789cb463
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Feb 1 23:34:54 2014 +0400

    some fixes and improvements in cv::matchTemplate

commit 31b7cdc695a060509399b092b837757e0a8f3f16
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Feb 2 17:47:06 2014 +0400

    implemented OpenCL version of cv::updateMotionHistory

commit 1f5007f106e24ebef6f5f8dbe19b2ed439c83eea
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 26 14:41:16 2014 +0400

    modified viz module header layout for 2.4 compatibility

commit 0a870faf28ac20cc909547fa4ae688ae35075a36
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 26 14:40:32 2014 +0400

    added guard against linking qt5 and VTK together

commit 19f799ba1e835fdcccd3498a764bbe7483596933
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Feb 2 15:33:10 2014 +0400

    fix2 for OpenCL on/off

commit 02692f9ac00adafdc15c204a0171c5bd8857336a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Feb 1 22:43:41 2014 +0400

    fix MACRO

commit 75dde49b64cbaa00fc8520a122aea95c4a157eb8
Merge: 983799d 86353eb
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Feb 1 22:32:39 2014 +0400

    Merge pull request #2230 from ilya-lavrenov:tapi_openc_on-off_game

commit f8dd9960af1f5862462caed2d04b11d25488e555
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Feb 1 21:49:03 2014 +0400

    one more ocl deletion

commit 66b2acc8eec54b48060f2a545b46eaaccdfaef3e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Feb 1 20:55:50 2014 +0400

    removed ocl from allmodules list

commit ec3eb14138d6ad62e6a8c2cd761fcd1439ef2431
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Feb 1 18:14:10 2014 +0400

    unused function in case of unavailable OpenGL

commit a6104bd025e6ff46a6909759fcfca3b2c8a1dad2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Feb 1 18:11:19 2014 +0400

    fixed unused function in case of unavailable CUDA

commit 6ad4823f0c421fd3458817d347b8af10867a587a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Jan 22 19:13:29 2014 +0400

    ported superres to T-API

commit aaa9be7c65a0e2bc24526046c8de6e67a742b1e8
Merge: b074c67 983799d
Author: Scott Breyfogle <swb02009@mymail.pomona.edu>
Date:   Fri Jan 31 14:27:51 2014 -0800

    Merge remote-tracking branch 'original/master' into constrained-hough-lines

commit b074c67a56b874c7d6270eaf8a6c2f1ec239c669
Author: Scott Breyfogle <swb02009@mymail.pomona.edu>
Date:   Fri Jan 31 14:26:45 2014 -0800

    Add static cast to hough lines

commit 2bef73c9688547c18f0a76ef07462edfe701e71b
Merge: a518d7a 952027a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 31 20:49:04 2014 +0400

    Merge pull request #2249 from jet47:gpu-tests-disable

commit a518d7a1cb4d38a04a43ff0b7a92c6cf746b8097
Merge: 9ef8aea e630be3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 31 20:48:52 2014 +0400

    Merge pull request #2248 from jet47:gpu-npp-disable

commit 9ef8aeadd343287d7677ae7a8b13f09a6de63a7b
Merge: e2db68f 8401ed9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 31 20:48:37 2014 +0400

    Merge pull request #2247 from jet47:gpu-test-cufft

commit 983799d3983ad10543711dd79b4d8d50372273ae
Merge: c909a21 0ebb3ab
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 19:38:57 2014 +0400

    Merge pull request #2219 from ilya-lavrenov:createHanningWindow

commit 0ebb3ab0ea65b8565e5a84d609258d7a573b787a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Jan 28 23:10:43 2014 +0400

    optimized createHanningWindow

commit c909a2103565eafd1f0da097ef6c6279da3b022d
Merge: 25d2ab8 41bc580
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 19:25:00 2014 +0400

    Merge pull request #2219 from ilya-lavrenov:createHanningWindow

commit 25d2ab8a682fe993a913fae4d1b3c5417e71c25e
Merge: 6925dbd 6fa49f6
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 19:23:01 2014 +0400

    Merge pull request #2218 from alalek:fix_defects_code_coverity

commit 6925dbd9f9770656c01d9d00a088429abd1b4960
Merge: 5894f82 69630ee
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 19:22:37 2014 +0400

    Merge pull request #2216 from ElenaGvozdeva:ocl_MOG2

commit 5894f82f141d94784ca591cc3d54bb7bbcef11ac
Merge: b0befeb 9968197
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 19:22:18 2014 +0400

    Merge pull request #2202 from ilya-lavrenov:tapi_GFTTDetector

commit b0befeb1b325ff3443ca0aee2f1bd253e5773b87
Merge: 2c35438 c01e8e9
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 19:17:16 2014 +0400

    Merge pull request #2232 from ilya-lavrenov:ABF_drop

commit c01e8e936182250f0bdda6c9d97b7b97be3906d8
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 30 13:13:33 2014 +0400

    removed ABF

commit 2c3543877168ec8e9a92920b84c8e4e0152142a7
Merge: 09b55a7 1ab1594
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 19:14:18 2014 +0400

    Merge pull request #2228 from ilya-lavrenov:tapi_experiments

commit 09b55a77c8cb3d7b6eb455861e8ad02156eb1b16
Merge: 82bab2b 0f16893
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 19:08:26 2014 +0400

    Merge pull request #2243 from ilya-lavrenov:ocl2trash

commit 82bab2b03bdafbe2ff93d3fa2bf4e0d955a7dc16
Merge: 0b57d37 68f5dd4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 19:04:49 2014 +0400

    Merge pull request #2236 from ilya-lavrenov:tapi_boxfilter

commit 0b57d3717f9c1128074b8580087ab4f4c3207f54
Merge: b104b04 50cf152
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 19:04:30 2014 +0400

    Merge pull request #2244 from ilya-lavrenov:tapi_device_cache

commit b104b04d534cfcafcf922d188c29764cc3b87372
Merge: e8d66f5 d15bf62
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 19:04:07 2014 +0400

    Merge pull request #2245 from ilya-lavrenov:redundant_sync

commit e8d66f5cb7855d7427fbb9073442a5e3cc1eab5a
Merge: 9041c31 9300af9
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 31 18:58:01 2014 +0400

    Merge pull request #2246 from alalek:intersection_loop_bug

commit e2db68f8224484755036c5cca562ecf019ad0751
Merge: 7161b5b 49731ad
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 31 17:24:21 2014 +0400

    Merge pull request #2242 from jet47:gpu-test-fix

commit 952027a8536215a5e4308c79a59308c6b3426354
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Jan 31 16:20:45 2014 +0400

    disable gpu CvtColor.*2HSV tests:

    possible bug in CPU version

commit e91bf95d5832e87aa70240c50f0bf7fcc587e8c8
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Jan 31 16:15:11 2014 +0400

    disable gpu Subtract_Array test:

    possible bug in CPU version

commit dbce90692acd84fbf46bde4da4b1726049f42857
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Jan 31 16:10:37 2014 +0400

    disable gpu Canny and HoughCircles perf tests:

    it fails because driver terminates CUDA kernels after time out

commit e630be3890d91f84d0f2d825c755bd0c1d070918
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Jan 31 15:52:06 2014 +0400

    disable NPP for GpuMat methods and for copyMakeBorder

commit 8401ed939524f2f65c1bbcb81ba5181851719d7c
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Jan 31 15:40:59 2014 +0400

    disable some gpu tests if library was built without CUFFT

commit 7161b5bbadc13afd3ab8682ddf0998fb9969d266
Merge: 7e6293d 87935f3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 31 14:56:10 2014 +0400

    Merge pull request #2241 from asmorkalov:ocv_highgui_test_output_fix

commit 9300af90cd8067f8a9f62adb1afd63b3e9aa395b
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Fri Jan 31 14:42:38 2014 +0400

    imgproc/intersection: fix loop index

commit d15bf6261a7ab918850800cffaac3e766d6829bd
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Jan 31 14:39:03 2014 +0400

    redundant clFinish in upload since clEnqueueWriteBuffer above is already blocked

commit 7e6293d9ecf4c515379361de2fbc4ba61ef080b6
Merge: b13d4ba 063d8b4
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 31 14:24:04 2014 +0400

    Merge pull request #2240 from jet47:gpu-generalized-hough

commit 50cf152977041c5705de25d7787aa0a553040beb
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Jan 31 14:00:05 2014 +0400

    cached commonly used device properties

commit b13d4bafa8bb3d0c6b2888462d449563dbbf0330
Merge: d14e007 3d261e8
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 31 13:56:48 2014 +0400

    Merge pull request #2238 from asmorkalov:ocv_test_package_reports

commit 0f168936a08c24f48cef02cab65520f0d1e06cf7
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Jan 31 13:19:16 2014 +0400

    OCL module 2 trash

commit 49731ad5303a714302ff053aaeb32900845304bf
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Jan 31 13:19:15 2014 +0400

    gpu test output files moved from cwd to temp folder

commit 3d261e8a010eda45908592d3b2caa76d939d342c
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Jan 31 10:47:01 2014 +0400

    Reports path fix for opencv_run_all_tests.sh.in script.

commit 9041c318130b561c793f0a6c0d5c87361d1f0119
Merge: 1f3206a f756171
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 31 12:49:18 2014 +0400

    Merge pull request #2223 from cosminBoaca:add_prob_result_bayes_classifier

commit 87935f35600228a746d8a29cb1a5c108e710429d
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Jan 31 12:49:10 2014 +0400

    Highgui test output fixes.

    Useless output to console fixed;
    Test output files moved from cwd to temp folder.

commit 063d8b421136b2ed0f537c663b89828f6a2b263c
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Jan 31 12:40:40 2014 +0400

    disable performance test for gpu generalized hough

commit 1f3206af703cff2c616d96af72b7e21702eff99e
Merge: 77bbd65 b7f2b67
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 31 12:22:24 2014 +0400

    Merge pull request #2237 from ivylee:lbph_chi_square_alt

commit 69630ee9d9506259aab42099ffbae00cceef5694
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Fri Jan 31 10:46:29 2014 +0400

    fixed test

commit 68f5dd41706eb11cd0d8a002bc13dc2a805bbc83
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 30 19:37:01 2014 +0400

    simplified cv::boxFilter OpenCL impl

commit b7f2b671a27098929f0622b211ec450f1b3a3f7e
Author: Ivy Lee <ivyleexyg@gmail.com>
Date:   Thu Jan 30 21:53:05 2014 +0000

    Fixed Bug #3514 Incorrect Chi-Square distance used in LBPH FaceRecognizer

commit f756171f7be444920485b3e21eaea839e5954db2
Author: Cosmin Boaca <cosmin_267646@yahoo.com>
Date:   Thu Jan 30 16:43:56 2014 +0200

    Fixed alignment

commit 8782eb8657985786898820216e4f6030a402f1ba
Author: Cosmin Boaca <cosmin_267646@yahoo.com>
Date:   Thu Jan 30 16:41:38 2014 +0200

    Fixed alignment

commit b90f82e61fb77827164500f4c48a22423e134832
Merge: 2cd22a3 77bbd65
Author: Cosmin Boaca <cosmin_267646@yahoo.com>
Date:   Thu Jan 30 16:38:15 2014 +0200

    Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier

commit 77bbd65fa694bc8dce0d558cb2afb00eabd5afc7
Merge: 66cc440 0d19cbc
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Jan 30 17:33:06 2014 +0400

    Merge pull request #2220 from ilya-lavrenov:tapi_accumulate

commit 66cc440c8268ed0e5cda8ef4454e31fd87b63151
Merge: afa62c4 231bc17
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Jan 30 17:28:43 2014 +0400

    Merge pull request #2226 from ilya-lavrenov:tapi_calcHist

commit 1ab1594d00be987d18bc6a62151a93428a7b919b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 30 17:23:56 2014 +0400

    workaround

commit 2cd22a3ca32dfe52fde0926c5be6b3445e806354
Author: Cosmin Boaca <cosmin_267646@yahoo.com>
Date:   Thu Jan 30 13:37:53 2014 +0200

    Fixed broken alignment

commit e6f86ea39d97741c71b7bc4227eb0b62e4722cba
Merge: 97092e3 afa62c4
Author: Cosmin Boaca <cosmin_267646@yahoo.com>
Date:   Thu Jan 30 13:32:32 2014 +0200

    Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier

commit 372cdac07cbd305d9d9ac94c8dcc518b98d87c61
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 30 15:23:11 2014 +0400

    moved kernelToStr to ocl.hpp

commit d14e007fdb5c85f66506d074af99ae6335173cb2
Merge: 40f6f67 c815043
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 30 13:22:10 2014 +0400

    Merge pull request #2231 from asmorkalov:android_toolchain_update

commit 231bc17de79b773b001dc6dbf08e7ee533872c0b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Jan 29 23:00:33 2014 +0400

    added conditional compilation

commit 40f6f679b8b3a6518ec414ca62beaebdef5a1714
Merge: 2b3013f 0dad287
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 30 12:43:50 2014 +0400

    Merge pull request #2224 from SpecLad:obsolete-immediate

commit 2b3013fd2089cdb81459926a568c38a2341f5f5a
Merge: 5ae9add e7e63fa
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 30 12:23:20 2014 +0400

    Merge pull request #2229 from ilya-lavrenov:possible_memory_leak

commit c8150436073a4c25ec4f4273b80c1b76201b8be1
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Jan 30 11:08:49 2014 +0400

    Android toolchain file sync with original project.

    Original project: https://github.com/taka-no-me/android-cmake/
    Revision: 5db45cfb87fec180b74963d3680dd60d4d8d8c3a

commit 1862dbc5ab95762ecfdf914e01ba784e2674d0f1
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 30 05:48:15 2014 +0400

    fixed fp problem

commit 0d19cbcc7a80a18d4fa50fb74568d7a41c89c47f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Jan 29 16:33:44 2014 +0400

    added performance test

commit 86353eb54186c28581ad86fc61e90fce2ce33662
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 30 01:47:25 2014 +0400

    fix for PR 2196

commit e7e63fac6c3eaa65a8eb0926c7c9557f0614ab03
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 30 01:14:02 2014 +0400

    eliminated possible memory leak

commit 6d64907f18a3bbfc91404f22ae1964ba1a9244ae
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 30 00:19:18 2014 +0400

    async

commit 6fa41c5a6438e1391c6005ef0aa8154ce40a94a0
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 30 00:12:59 2014 +0400

    some experiments

commit faa6074f3d19a7fb59b5eda937dcd45c0e0c5fce
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Jan 29 20:34:37 2014 +0400

    added performance test

commit 384a28622d766c4ce302051152b40d7a1655ba85
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Jan 29 20:19:15 2014 +0400

    added cv::calcHist to T-API (only for CV_8UC1 with 256 bins)

commit 6fa49f6e806c452a7fdc032591a3a9eab0550d52
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Wed Jan 29 18:58:27 2014 +0400

    fix unintialized fields

commit f91f55927e2fcee80d407b4501aa1f705e39e8da
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Wed Jan 29 17:37:52 2014 +0400

    fix memory management problem

commit 0dad2876e29e2173505bdb36bc5adbeb9fea56f0
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Jan 29 19:34:02 2014 +0400

    Removed all use of the obsolete IMMEDIATE parameter to configure_file.

    It's not documented, and it does nothing unless CMake 2.0 compatibility
    is enabled (and it isn't):

    https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx

commit afa62c4161ae953e5e5266da30b280e26a3658bf
Merge: 9b9eadc 6a51175
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Jan 29 17:20:25 2014 +0400

    Merge pull request #2212 from SpecLad:hog-sample-const-mat

commit 9b9eadc941e874ee1372b08ffc1035f9f7b82b2b
Merge: fff5a6c 3985980
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Jan 29 17:12:48 2014 +0400

    Merge pull request #2214 from cosminBoaca:add_returnDFVal_parallel_predict

commit 5ae9add102a9c4e8965ade560ada4430a1757615
Merge: 3e59ddb d45350a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Jan 29 17:09:28 2014 +0400

    Merge pull request #2221 from asmorkalov:ocv_test_install_custom

commit d45350a06a287a8ab8a812659d5afea898ffe95a
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Wed Jan 29 12:01:06 2014 +0400

    opencv_run_all_tests.sh script added to -tests package.

commit 97092e31bc326f8fb8ac8a7f72a104a19e6cecd7
Author: Cosmin Boaca <cosmin_267646@yahoo.com>
Date:   Wed Jan 29 13:57:51 2014 +0200

    Added result_probabilities parameter to CvNormalBayesClassifier::predict method. Issue #3401

commit 96b6f338e14eb7dcf4ef5a06b203ca9b3fe32ec9
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Wed Jan 29 14:10:36 2014 +0400

    fixed

commit 7c96d98a24b08e2a1739ba34d612816b0d53e7b7
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Jan 29 00:10:06 2014 +0400

    implemented OpenCL version of cv::accumulate****

commit 17c6b4d306486bfc4dfe3d6dce951d9d30ff8e66
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Wed Jan 29 11:05:05 2014 +0400

    fixed warnings

commit 41bc5808c0cc59992ddf3f1b88dc45774d86d74c
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Jan 28 23:10:43 2014 +0400

    optimized createHanningWindow

commit 5474935a8180f51eee32de7a4174c280b015fff4
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Tue Jan 28 20:22:56 2014 +0400

    fixes for defects from code coverity

commit 3e59ddbace001aabdd2f822a756eeb94cfded85f
Merge: 7a0a9d0 d9dc5ff
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Jan 28 17:51:06 2014 +0400

    Merge pull request #2215 from asmorkalov:ocv_testpack_fix

commit d9dc5ffa918639e5d8be76644aef4385def13688
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Tue Jan 28 14:05:26 2014 +0400

    Multiple fixes for tests deb package build.

    Added opencv_testing.sh.in file;
    opencv_testing.sh installation guarded by OS check.

commit fff5a6c058aaf8d9605198d2c9e98b7be7aff29c
Merge: 84c2974 48a084c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Jan 28 16:31:29 2014 +0400

    Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid

commit 0edd0aaf69cb06eaaff1f05b3fddcff58f0c4238
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Tue Jan 28 16:22:42 2014 +0400

    fixed

commit 1391ca1da5c8a50a73c6472439961dffc9e34dde
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Mon Jan 27 17:32:51 2014 +0400

    Added ocl_Mog2

commit 3985980b2fca749c7e329a4ef6d7aed3e377a106
Author: Cosmin Boaca <cosmin_267646@yahoo.com>
Date:   Tue Jan 28 11:54:39 2014 +0200

    Added returnDFVal parameter to parallel CvSVM::predict function

commit 84c29745f2908c5fe4db57754ebdd0b063124141
Merge: 6deda99 bbc35d6
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Jan 28 12:44:29 2014 +0400

    Merge pull request #2211 from SpecLad:merge-2.4

commit 7a0a9d010baf60e5dd9ec40908c49c776e0de9d1
Merge: 51aa649 c41e800
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Jan 28 12:23:32 2014 +0400

    Merge pull request #2205 from jet47:bug-3477-fix

commit 51aa64949993a25f4d9b76f2db7ef0866a740511
Merge: 452ea4c eb9d7c4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Jan 28 10:51:11 2014 +0400

    Merge pull request #2097 from pclove1:blur_border_isolated

commit c41e8006c7e9a3e796b5f78d3bfc5a97a9e87c4c
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Tue Jan 28 10:28:00 2014 +0400

    fix #3477:

    CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING property is not supported
    by all VideoCapture backends. Some backends can return 0.0 or -1.0.

commit eb9d7c4dd54eea87950d98b843b349db7a95c951
Author: Seunghoon Park <pclove1@gmail.com>
Date:   Mon Jan 27 20:57:40 2014 -0500

    fixing bug #3345. use norm to make sure two matrices are the same.

commit 73389b2b9c42f814ef66118a644d24f9e74402c2
Merge: 2272a58 452ea4c
Author: Seunghoon Park <pclove1@gmail.com>
Date:   Mon Jan 27 20:44:03 2014 -0500

    Merge branch '2.4' into blur_border_isolated

commit 452ea4c15faa3ef66990aaa4fb285a4b23e4fbeb
Merge: d093cb5 39201e6
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 27 20:59:53 2014 +0400

    Merge pull request #2209 from asmorkalov:ocv_test_install

commit 6deda99f0748c8eaa851efed6e67b49df7b284c3
Merge: d9b2445 78c2b3c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Jan 27 18:56:05 2014 +0400

    Merge pull request #2207 from ilya-lavrenov:tapi_macro

commit 78c2b3ca2a30d66ddc0320248cf79b89c2dfb028
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 27 13:25:21 2014 +0400

    refactored imgproc

commit 39201e68e2649955f40936a1d07f2d1c64c560f5
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Mon Jan 27 17:57:11 2014 +0400

    Code review notes fixed.

    Env setup for testing package implemented using /etc/profile.d;
    Variable with path for all native samples added;
    Path for test binaries and test data updated.

commit 48a084c236c261668cf9cbd2b583a9b6d4bf3583
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 27 18:34:19 2014 +0400

    OpenCL version of cv::buildPyramid

commit d9b24457fa4a8fb5205c77aea08843302d8dfeab
Merge: ce48b6a 1ff9a8e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Jan 27 18:24:13 2014 +0400

    Merge pull request #2208 from alalek:ocl_dynload_warn

commit 6a511755b2a6a9b267b377b460ba6885ce41cce9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 27 17:39:33 2014 +0400

    Fixed build for samples/cpp/train_HOG.cpp.

    get_hogdescriptor_visu is passed img->clone(), which is not usable
    as a non-const reference (and it doesn't modify the argument, anyway).

commit ce48b6afdef775286acc56fd458d2351b4f9ed16
Merge: 4dd805b f767077
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Jan 27 16:06:12 2014 +0400

    Merge pull request #2203 from ilya-lavrenov:tapi_umat_vectors

commit 4dd805b7a9a16d859fa80c663c22e52bc34f301d
Merge: 06acf70 c8f2050
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Jan 27 16:05:54 2014 +0400

    Merge pull request #2206 from ilya-lavrenov:ocl_warn_fix

commit f332cba14b2a86017e1d2081130db110c2048c00
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Mon Jan 27 14:20:30 2014 +0400

    OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.

commit bbc35d609d5613c73c9597502f13ceeb97dc769b
Merge: 06acf70 d093cb5
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 27 15:28:14 2014 +0400

    Merge remote-tracking branch 'origin/2.4' into merge-2.4

    Conflicts:
    	cmake/OpenCVDetectPython.cmake
    	cmake/OpenCVModule.cmake
    	modules/core/src/gpumat.cpp
    	modules/cudaimgproc/test/test_hough.cpp
    	modules/gpu/CMakeLists.txt
    	modules/gpu/src/cuda/generalized_hough.cu
    	modules/gpu/src/generalized_hough.cpp
    	modules/python/CMakeLists.txt

commit 1ff9a8ef52308692da7038f4fe6ab842d8c066a1
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Mon Jan 27 13:38:47 2014 +0400

    core/ocl: added warning about incompatible configuration

commit c8f2050cc2801b968924629df330423bf0e8957f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 27 12:34:30 2014 +0400

    warn fix

commit 321782b9b7f20864793fb7383075f8feb7817258
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 27 12:32:26 2014 +0400

    added macro with ability of returning values

commit f767077a419c6ff7cf3b931cccb98b451378e004
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Jan 25 01:58:55 2014 +0400

    fixed condition

commit 2dd294cc84b3e07c82894cb06c5b40b4245006b6
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Jan 25 00:43:32 2014 +0400

    fixed cv::split; enabled test

commit fa5492343ac8bb40eeb25e72fecb481949d9ab7d
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Jan 25 00:27:33 2014 +0400

    added STD_VECTOR_UMAT support to _OutputArray::create

commit 06acf7090cbc33e364ab0b65011295f0ab714988
Merge: a64d3c1 d270c9e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Jan 27 09:49:46 2014 +0400

    Merge pull request #2027 from AD-530:brief_cl

commit 3dc2dbc17e7bf6d6001fd84d45c595bf02ea7a8c
Author: Anatoly Baksheev <no@email>
Date:   Fri Jan 24 21:44:59 2014 +0400

    VTK off by default

commit a64d3c174492595eaf4d29693fc8df6c7c158f1e
Merge: 1db8aa8 bb09d44
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Jan 25 17:08:06 2014 +0400

    Merge pull request #2155 from vbystricky:ocl_calcOpticalFlowPyrLK

commit 1db8aa8628051e863c60e4c66cc6952062bcc839
Merge: 3f61007 7184925
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Jan 25 16:53:59 2014 +0400

    Merge pull request #2204 from ilya-lavrenov:tapi_stitch_perf_fix

commit 3f6100756302d8fdc908c34b7bc58a5d5e50d1b6
Merge: ac3f06b 7f785e0
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Jan 25 16:32:54 2014 +0400

    Merge pull request #2191 from ilya-lavrenov:tapi_macro

commit 9968197ebf16ed55671e8f32e8295fdf9affebdb
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Jan 25 14:44:28 2014 +0400

    doc fix

commit 7184925105d94a0977b0e4949a774d03648dfb90
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Jan 25 11:50:28 2014 +0400

    fix

commit e559256719ea994c86dd59d8691bb748357f548e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Jan 24 19:39:05 2014 +0400

    added cv::GFTTDetector

commit 7f785e0a110b74f4a3315a56dd33515dfe8b839e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Jan 24 21:03:31 2014 +0400

    refactored core using new macro

commit bb09d44e0aa4cf109d39f566f9695f7b438a8a53
Author: vbystricky <user@user-pc.(none)>
Date:   Thu Jan 23 17:35:44 2014 +0400

    Unused code removed

commit 27fb7e180207879d52a561ab251fc4118f4c12c2
Author: vbystricky <user@user-pc.(none)>
Date:   Thu Jan 23 12:17:25 2014 +0400

    Change type of result vector of ocl version from row to column

commit 094bc923182272a50a378f914c0f7dd7e26192bd
Author: vbystricky <user@user-pc.(none)>
Date:   Mon Jan 20 17:22:39 2014 +0400

    Fix build error

commit a7e5a488a8f6cd2254cac326a7d9d0d62a8e821e
Author: vbystricky <user@user-pc.(none)>
Date:   Mon Jan 20 16:21:08 2014 +0400

    Change method of setting arguments to kernel to safe one

commit e96ba8140ce489e1fd85e134ad374a3dd5ce4482
Author: vbystricky <user@user-pc.(none)>
Date:   Mon Jan 20 14:50:47 2014 +0400

    Grow up epsilon for sanity checks

commit 3a798a27e50346f04dbdc831f592adb05ec15ed9
Author: vbystricky <user@user-pc.(none)>
Date:   Mon Jan 20 12:39:04 2014 +0400

    Add perfomance test

commit ece635bf3c6ca324807fa47922bbf4f854941128
Author: vbystricky <user@user-pc.(none)>
Date:   Thu Jan 16 16:24:10 2014 +0400

    Fix builds errors

commit 3ba663665168b231dcbc3bd522841a5f7de54485
Author: vbystricky <user@user-pc.(none)>
Date:   Thu Jan 16 16:24:10 2014 +0400

    Fix builds errors

commit 33fc46cdec5260989c57e08e8896de35583e1798
Author: vbystricky <user@user-pc.(none)>
Date:   Thu Jan 16 15:44:35 2014 +0400

    Validate parameters for using OpenCL version, before upload UMat

commit 4152135e63731cadd1eba17d0c53d1ad44169a7a
Author: vbystricky <user@user-pc.(none)>
Date:   Thu Jan 16 13:35:10 2014 +0400

    Fix error with some opencl functions on the build WITH_OPENCL=OFF

commit c57e427fba279bb08fa37b02f65cfa3d85e3032d
Author: vbystricky <user@user-pc.(none)>
Date:   Thu Jan 16 11:57:57 2014 +0400

    Move OpticalFlowPyrLK from ocl module to video module

commit ac3f06bc7f94bb8e2f1f232e53261801c5136e7d
Merge: 22c804d 07a88d4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 24 17:33:05 2014 +0400

    Merge pull request #2149 from ElenaGvozdeva:ocl_matchTemplate

commit cc514ac7a98409250f39bbc565e73da598bf5ecc
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Jan 22 15:51:28 2014 +0400

    added new macros useful for tracking whether OpenCL impl run or not

commit 22c804d97c24c5e392f0168a4af79458ca2af7fc
Merge: 5424c55 07778e1
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 24 17:03:42 2014 +0400

    Merge pull request #2182 from KonstantinMatskevich:ocl_tapi_samples

commit 5424c55565672b068bd664791b6029b0b45d2a65
Merge: b0caa58 133f91f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 24 16:50:03 2014 +0400

    Merge pull request #2142 from KonstantinMatskevich:ocl_tapi_bfmatcher

commit b0caa588ec9b61afda5bd2a317dc3993231f9868
Merge: ee88cc2 c7a6537
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 24 16:44:19 2014 +0400

    Merge pull request #2190 from KonstantinMatskevich:ocl_dumpinfo

commit c7a6537b8335a310a3e4e7ffdca0506229e31f00
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Jan 24 16:35:51 2014 +0400

    add brackets

commit d093cb54d5253608fce72ede183b5b0c196363b2
Merge: 24caa80 0a4a1d7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 24 16:13:19 2014 +0400

    Merge pull request #2194 from apavlenko:2.4_perf_haar_iter

commit 64fd54ffb4994103d82a34b4039d4938fdb87e46
Author: Matti Picus <matti.picus@gmail.com>
Date:   Fri Jan 24 13:03:47 2014 +0200

    fix tiled read for reading tiles into partial blocks in image

commit 24caa80143c2be029ec1e22dad80e960d490abfb
Merge: 078d496 086792e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 24 14:27:44 2014 +0400

    Merge pull request #2197 from asmorkalov:ocv_packaging2

commit ae827a638c4b4f25f8e314aa3585340b179f63f8
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Jan 24 14:01:31 2014 +0400

    fixes

commit 07778e17606ce34ecbf30eb397bde01111697021
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Jan 24 13:37:19 2014 +0400

    fixes

commit 450ea3131feb1f608cd4344cc8d0f9f0f70b6e86
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Mon Jan 20 10:25:05 2014 +0400

    samples

commit 086792ec06ff78a45fdd5e1b2fa7f72fe3b7c9a2
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Jan 23 20:57:30 2014 +0400

    Improvements in package build.

commit 07a88d48e9bdb63bf5b3ddf677296bfcd16248e4
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Fri Jan 24 11:41:23 2014 +0400

    fixed

commit 0a4a1d7526ba893e818365875cd5aa916fc9f92b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 24 10:07:21 2014 +0400

    temporary disabling hanging test

commit 078d49609e7952642f852deff5133b36aa0a9490
Merge: 7ff9d7e dca5684
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 23 17:13:51 2014 +0400

    Merge pull request #2193 from apavlenko:2.4_lic_remove

commit dca56841459dadfa01ac74eb1ac01cd7e05d8522
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Jan 22 21:47:50 2014 +0400

    removing duplicated legacy license, the actual instance is in 'opencv/LICENSE'

commit 9145985ff4ac7089d5082f49a0cc9dab14769b55
Author: Anatoly Baksheev <no@email>
Date:   Thu Jan 23 14:41:21 2014 +0400

    added guard to prevent linking VTK with Qt5

commit 4d86804f1120e655031a372d14f754ab756f45b5
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Thu Jan 23 15:31:32 2014 +0400

    Fixed merge conflicts

commit 7bd8f9294d9d28895456b13f31d116f13c7651b7
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Wed Jan 22 13:34:40 2014 +0400

    fixed

commit 8c5e19c27058e9ec9fb0b3272d6a4175222d10a8
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Tue Jan 21 16:57:01 2014 +0400

    fixed pref test

commit b4652e2cb32a3824ec70cd0c5f7ca6df09c99685
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Mon Jan 20 15:48:16 2014 +0400

    Added perf test for ocl_matchTemplate

commit 2c0765b4d13260a53103b2693a13d997efd15784
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Fri Jan 17 18:37:57 2014 +0400

    fixed trailing whitespace

commit 7e2bdb590f781de8c2fb6c2109641e81fae4146b
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Fri Jan 17 16:26:11 2014 +0400

    fixed

commit 4da1ba56b3c705bd9217ee16d810d754368ff5de
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Fri Jan 17 15:01:22 2014 +0400

    fixed

commit 47b572f99f4f818ac4cc3ac8c7ac50228aa64a0d
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Thu Jan 16 14:26:48 2014 +0400

    fixed

commit da4d33ec2699575311474ccb42d4fa456d1fae56
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Wed Jan 15 10:24:14 2014 +0400

    Fixed test_match_template

commit 9de70c9a00e60f0ae333e23de939a2fb4c7300e9
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Tue Jan 14 17:34:05 2014 +0400

    Fixed trailing whitespace

commit ba5d480f80bee48e238a7ff42b6097cbd0bc4ccf
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Tue Jan 14 16:31:04 2014 +0400

    Fixed warnings

commit 86636dc265a0d2c5733293a433d15c0ad73e4b10
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Tue Jan 14 14:45:01 2014 +0400

    Added ocl_matchTemplate( without dft)

commit ee88cc2c5216f780cca0dc48a71f9d06a5c79372
Merge: ba77719 d8e5f16
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Jan 23 14:37:33 2014 +0400

    Merge pull request #2110 from hmax:master

commit 7ff9d7eb2d330f79614293e5d177c79626a68a09
Merge: 3715f71 dda9995
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 23 13:28:12 2014 +0400

    Merge pull request #2188 from jet47:gpumat-copyto-fix

commit 3715f71aafb4b694d61466af974ac21998497dd4
Merge: a4b34e7 167a266
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 23 13:27:37 2014 +0400

    Merge pull request #2175 from vrabaud:2.4

commit 133f91f3f25dbfb971150d91de613417a5b45ebc
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Jan 17 11:23:00 2014 +0400

    added perf test

commit ba77719914d3889d0f60043628b9f0989c1d366b
Merge: 7ce6c28 059e6e4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Jan 22 19:13:05 2014 +0400

    Merge pull request #2189 from ilya-lavrenov:tapi_sepFilter2D_fix

commit 7ce6c28bb4a1530db8058f7b141fb3a30d8adc9b
Merge: 9aa4410 d2ffd8e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Jan 22 19:09:34 2014 +0400

    Merge pull request #2186 from ilya-lavrenov:tapi_precornerdetect

commit 9aa4410509fcc60dfabb78c14a96ed5153ee117e
Merge: ee33100 e0c6377
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Jan 22 18:57:33 2014 +0400

    Merge pull request #2134 from vbystricky:ocl_calcOpticalFlowFarneback

commit 167a26642e58486a06517bdf6c1b3cdeae7152ac
Author: Vincent Rabaud <vrabaud@aldebaran-robotics.com>
Date:   Wed Jan 22 15:26:14 2014 +0100

    fix message sent to user during cross_compilation

commit f90e41d54e12d92ac7f9c0f2cf665b30260b213b
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Jan 22 10:08:42 2014 +0400

    dumpinfo

commit 2f8c29a1f00073472551c5d7155f38f5d4c669e1
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Jan 17 10:09:44 2014 +0400

    removed unnecessary functions and variables

commit 3b7683e72f6314a6f8d17eeb75806c16859ddcea
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Jan 15 10:01:40 2014 +0400

    fixed docs

commit ca5689e0dbb2c91f3a9d3072074786f0dc66d054
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Dec 27 13:04:02 2013 +0400

    BFMatcher

    match

    radiusMatch

commit d2ffd8ed211c3ce814e7b1f37faee67080844596
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 20 18:35:32 2014 +0400

    implemented OpenCL version of cv::preCornerDetect

commit 059e6e43056a3eba051c8711d63d379df95d01a7
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Jan 22 13:40:48 2014 +0400

    fixed cv::sepFilter2D

commit ee331001f5e3f0bd943793fccd67da9b436730d2
Merge: 069bb9a a502ffb
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Jan 22 12:04:47 2014 +0400

    Merge pull request #2161 from SpecLad:doc-req

commit a4b34e7ae10351fc4d30dc55995679340efc488e
Merge: a548a08 7821fe2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Jan 22 11:54:07 2014 +0400

    Merge pull request #2181 from asmorkalov:ocv_packaging

commit dda999545c9dd1cca56081a4b2d56755210b840a
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Wed Jan 22 10:40:14 2014 +0400

    fix GpuMat::copyTo method with mask:

    fill destination matrix with zeros if it was reallocated

commit e0c6377d58e229b741e67d8121ee348cce09bef1
Author: vbystricky <user@user-pc.(none)>
Date:   Wed Jan 22 10:34:27 2014 +0400

    Change the sanity checking type to ERROR_RELATIVE

commit 069bb9a92978653384057315f8db2ace0ebf322e
Merge: 665d9cb 3177a68
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Jan 22 10:25:40 2014 +0400

    Merge pull request #2185 from ilya-lavrenov:tapi_corners

commit 665d9cb29ce2927e6eaee520cb384473e4ce9c43
Merge: 5d818c0 3db3397
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Jan 22 10:14:38 2014 +0400

    Merge pull request #2168 from ilya-lavrenov:tapi_perf_stitching

commit 5d818c010e7f6eaec5855161e098f8af479acd37
Merge: 1400f53 ae4be41
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Jan 22 10:12:07 2014 +0400

    Merge pull request #2156 from ilya-lavrenov:tapi_reduce

commit 1400f534363e231f2d5c64a53bfac4203027f5dd
Merge: 99942e8 303c37a
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Jan 21 23:27:15 2014 +0400

    Merge pull request #2184 from ilya-lavrenov:bioinspired2contrib

commit 99942e80433f768ff0778eb60a1e3b8834c0dbdb
Merge: c8afe7e bfa382c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Jan 21 22:29:41 2014 +0400

    Merge pull request #2166 from ilya-lavrenov:tapi_gftt

commit 7821fe2bde331c6b1abd612315ca9fc59da58619
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Sat Jan 18 23:50:07 2014 +0400

    Initial Linux packages build rools for CPack.

commit b75cbfde45c00fc956f033d0af7fe6d63312fd33
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Jan 17 16:30:31 2014 +0400

    All installed files marked with component names for install customization.

commit 3177a683e93f9cbaad75e15d023842c535e3d945
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 20 18:35:32 2014 +0400

    ported corners to T-API

commit a548a0812936992553f6e8d54dee198ec50d1e70
Merge: 32bc89f 33d42b7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Jan 21 19:27:54 2014 +0400

    Merge pull request #2183 from jet47:cuda-hough-fix

commit c8afe7efc63b4b1da4b075123867cb6ff820309b
Merge: 4fbd2ef 089b8e2
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Jan 21 19:23:04 2014 +0400

    Merge pull request #1320 from mbarnach:svm_hog

commit 4fbd2ef87a638f44b47ed786a9e4d9cd058d6f77
Merge: 9eca3ec fb9c59d
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Jan 21 19:22:46 2014 +0400

    Merge pull request #1290 from mbarnach:bow_desc

commit 32bc89f094a838d2e08ce01207629e64c968ee7e
Merge: 64244e1 d3e24f3
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Jan 21 19:11:11 2014 +0400

    Merge pull request #2107 from nghiaho12:nn_doc

commit 303c37a175ba81dd186880a9458ec1b886e400a3
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Jan 21 18:47:22 2014 +0400

    removed TOC

commit c1172b83dd0feebd61797afeb508d8a94186d77d
Author: vbystricky <user@user-pc.(none)>
Date:   Tue Jan 21 18:46:26 2014 +0400

    Change epsilon value to 0.01

commit 5d206059a8578499d5ed2f0d51f1f0d5e4876dd2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Jan 21 18:02:53 2014 +0400

    moved bioinspired to opencv_contrib

commit 9eca3ec8f651e55c25094e4e76446f4bd904826c
Merge: 494f7e3 ac2e613
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Jan 21 17:05:50 2014 +0400

    Merge pull request #2177 from ilya-lavrenov:ocl_superres

commit 33d42b740c6fe938b63a0b25c9ad51741aba48c3
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Tue Jan 21 14:35:51 2014 +0400

    disable CUDA generalized Hough Transform

commit d84738769422aad33038d90681c47486e47a0380
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Tue Jan 21 14:35:34 2014 +0400

    split CUDA Hough sources

commit bfa382cf9d6126759990ba0688b9ef2998280cac
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 20 16:46:20 2014 +0400

    fixed copying UMat -> std::vector

commit ae4be413c3a6dda6eacad198a7cedb033640a3bd
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Jan 17 01:05:59 2014 +0400

    added perf tests for cv::reduce

commit eabcfa56527de1117f09665f9c6c18b8d4212d9d
Author: Vincent Rabaud <vrabaud@aldebaran-robotics.com>
Date:   Tue Jan 21 10:01:52 2014 +0100

    reorder the if's for clarity

commit ac2e61397503b55ba6f709deb6469d95b69a7aa1
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 20 17:52:32 2014 +0400

    skip OCL tests if OpenCL isn't available

commit 6cb90c0e976ff24af85167e71d88c9d9b2ed06c7
Author: Vincent Rabaud <vrabaud@aldebaran-robotics.com>
Date:   Mon Jan 20 10:23:46 2014 +0100

    fix cross-compilation issue with Numpy

commit 130914d9f4a96e3e6da8b548b9c3a897085fee63
Author: Anatoly Baksheev <no@email>
Date:   Mon Jan 20 23:51:33 2014 +0400

    fixed documentation warnings

commit 494f7e3657a0b9d2b443f08259b3fcba734055b5
Merge: 801d2d0 e9e9e00
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Jan 20 23:35:06 2014 +0400

    Merge pull request #2158 from KonstantinMatskevich:testdata_path_calib3d

commit 801d2d0a32b9166a492749c4974fdc404c666650
Merge: a509819 6b8bee6
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Jan 20 23:33:55 2014 +0400

    Merge pull request #2167 from ilya-lavrenov:tapi_kern_warn

commit 02ebc4368c34df1904f1a6f3b5eef96a496aaf9f
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 19 03:16:06 2014 +0400

    Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style

commit 64244e160b2494751ac567d8befe070f36b26bd2
Merge: 088535f 6bf599b
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 20 19:30:29 2014 +0400

    Merge pull request #2171 from djetter99:fix_static_init_order

commit a509819b21f8c643df8e69c13920049cdb4373a4
Merge: 9710b25 5d18cf9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 20 18:48:52 2014 +0400

    Merge pull request #2163 from ilya-lavrenov:tapi_channels

commit e5130cf83f011ba13c2d20b34329d35a07a6f740
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 20 18:09:43 2014 +0400

    enabled tests

commit 9710b25c7dde34f5864e2527a8743eee81d0d8bc
Merge: 9dc93ce ac035b9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 20 18:05:11 2014 +0400

    Merge pull request #2173 from Nerei:viz

commit 9dc93ce3287992616320a612dc60af50816c74c6
Merge: 69ba0c5 e45fd93
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 20 18:04:55 2014 +0400

    Merge pull request #2176 from SpecLad:merge-2.4

commit ac035b9b8e77ea6590995ab4651b90b3c6ae9593
Author: Anatoly Baksheev <no@email>
Date:   Mon Jan 20 15:17:35 2014 +0400

    review comments

commit 69ba0c53ad3c57d0635bf1d72e351f995ddd5386
Merge: 087371c 5af2e6f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Jan 20 15:18:55 2014 +0400

    Merge pull request #2165 from ilya-lavrenov:tapi_upload

commit e45fd939c25b29a1c3e8c28b724cce5b5e3727d8
Merge: 8386ce2 088535f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 20 15:10:19 2014 +0400

    Merge remote-tracking branch 'origin/2.4' into merge-2.4

    Conflicts:
    	modules/ocl/src/cl_runtime/cl_runtime.cpp
    	modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
    	modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
    	modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
    	modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in

commit 087371c0212b9fbeb7481bb3ca7478c5bb405552
Merge: 8386ce2 37789f0
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 20 14:15:04 2014 +0400

    Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2

commit 5abfd40989674e37f398e8c00b1f2b32891d8531
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Jan 18 21:13:50 2014 +0400

    added perf test for cv::goodFeaturesToTrack

commit 52ed6d0d2780cd524310e338f01f47ef965eaf8d
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Jan 17 19:00:52 2014 +0400

    ported cv::goodFeaturesToTrack to T-API

commit 5d18cf9989d36bc566a8ac1041e110793e110ce7
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Jan 17 23:31:03 2014 +0400

    added cv::[extract|insert]Channel to T-API

commit 8386ce2b2f9023c7ba240ed97b46220877aeaa7c
Merge: d47f325 0de799b
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 20 12:20:21 2014 +0400

    Merge pull request #2160 from SpecLad:norm-assert

commit d47f32581ce4ba509bca7f9462dfb416a54db701
Merge: f60f8a7 5ea3ecd
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 20 12:06:43 2014 +0400

    Merge pull request #2174 from Nerei:yet_another_fix_for_pr2172

commit 4cc8f7012be67571daac483ca101987bd39c7314
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 19 08:47:07 2014 +0400

    closing window

commit 4e180070669008247920276ce057a69e5c8b428a
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 19 03:22:45 2014 +0400

    fixed white spaces

commit d29c3d2f0db141d0e2423cdda3b6a10f41f414e3
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 19 03:03:05 2014 +0400

    fixed documentation warnings

commit 8f15a8abdb93e5ca02d7c810766737ec35238e9e
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 19 02:16:59 2014 +0400

    disabled Ubuntu workaround code for Windows

commit 0d12fb0346b016f4207a4feaf37f6fe9767c48ac
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 19 01:55:40 2014 +0400

    implemented workaround of a problem with x-server for ubuntu

commit 7410593d55d09524cff5e9cd6584fa68a95a2996
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 19 00:13:47 2014 +0400

    fixed warnigns and compiler errors for Ubuntu

commit d7ca0bb757c38d4f54f5c8e565f211fdaa7dab66
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 18 22:25:40 2014 +0400

    merged background color with background gradient methods, updated tests to show description of scene

commit 16281027af498e3e63ed270cfde7b826480c6885
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 18 21:43:10 2014 +0400

    resolved problem with multiple spin()/spinOnce()

commit 57d5ad5131d400c349f5edf97cabb95ea3960b65
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 18 17:19:17 2014 +0400

    minor iteractor refactoring

commit ffad7b699c0676a758233fe4e4fb9aaa5754eb18
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 14 01:01:51 2014 +0400

    added test for textured mesh

commit 8d327fa497123f2b2281bd0407253787be67bea1
Author: Anatoly Baksheev <no@email>
Date:   Mon Jan 13 22:42:49 2014 +0400

    updated for compatibility with VTK6.0

commit e472d45d999bf3bcab5b5c7afe051d5854ef0d56
Author: Anatoly Baksheev <no@email>
Date:   Mon Jan 13 13:30:34 2014 +0400

    updated mesh reading (texture support)

commit 625c35a9f9eccc73d37a353ec042c4c9ca77f9d6
Author: Anatoly Baksheev <no@email>
Date:   Mon Jan 13 00:46:24 2014 +0400

    added support of texture for mesh

commit 74206e015956737d97b3a115f2de62e6e39a45df
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 12 18:05:07 2014 +0400

    added painted cloud widget

commit 3086095837e01f96ac43d40c11c813aa8fd206b2
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 12 16:40:41 2014 +0400

    improved background gradient

commit b0ca93b22ca359ddb596e7eb7831d46b0b38c7c2
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 12 15:56:54 2014 +0400

    by default enabled tests vtk

commit d7c30281a587b6b136668e50cb37a6ee15389ca1
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 12 15:46:03 2014 +0400

    set background texture method

commit e2ef558c8a85cc3258a87c0d525f286a37704097
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 12 15:22:26 2014 +0400

    refactored WGrid

commit 658f4a7d386cb2fd421494921944c592960ebd87
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 12 14:58:22 2014 +0400

    refactoed plane

commit 53b8218652536d58dd71eb8690fff263b6122b9a
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 12 00:31:45 2014 +0400

    addeed test for text 2d/3d

commit bb891f05702ef08f04d090a763af03063022b902
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 12 00:05:59 2014 +0400

    added cone implementation

commit 08f50314cb0b8ca484c2e91f28f4eb58807e7605
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 11 23:40:56 2014 +0400

    updated cylinder and cube

commit c0cc5512285caf038dd329f54f1e43a921aded6b
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 11 23:29:28 2014 +0400

    refactored circle

commit dac27c99138ac2a578bbf2fd650b18b0704ccf5c
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 11 23:07:30 2014 +0400

    refactored arrow

commit 1449823bcd5a1fd396bd90426fdf046fb232e4ac
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 11 22:43:58 2014 +0400

    implemented showImage

commit d90a068e0e725ff0c23c9379f3c3aac1350da0a5
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 11 22:13:45 2014 +0400

    fixed bug with setImage

commit cad9a786c4d64b9a4df0686e2f4cea345fea3f3c
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 11 22:00:28 2014 +0400

    optimized Mat to vtkImageData conversion

commit e21f2a81fff4a21a5bf9ef6a3b71588da24e28d9
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 11 20:40:10 2014 +0400

    factored camera postions with image

commit a23f1447a8005c0d85a82b4afccd7c6e5bc0408b
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 11 20:01:57 2014 +0400

    minor

commit f930f2f19d115c89efb4790f342deb4f9814af1c
Author: Anatoly Baksheev <no@email>
Date:   Sat Jan 11 16:44:01 2014 +0400

    simplification of cloud collection

commit e3ff28dacc312d86b236c2e32848b3cdc6fe138f
Author: Anatoly Baksheev <no@email>
Date:   Fri Jan 10 19:57:16 2014 +0400

    refactored WImage3D

commit f37c31742ae6a94f8d4bd2f9cda0725ed39e5c3d
Author: Anatoly Baksheev <no@email>
Date:   Fri Jan 10 01:57:11 2014 +0400

    created tests for images, created vtk/vtkImageMatSource, and switched all images to that class

commit 462d516743bf9bc5d6fc8eabe1a250828e6b8bae
Author: Anatoly Baksheev <no@email>
Date:   Fri Jan 10 00:31:27 2014 +0400

    added test for camera positions, slightly refactored the widgets

commit 8309d19f319df0ac23aa7e27f859d6bf2e40b0e5
Author: Anatoly Baksheev <no@email>
Date:   Thu Jan 9 20:26:51 2014 +0400

    renamed Mesh3d -> Mesh

commit d591bd875b659d6128d47e3b1cbd52e906d7d762
Author: Anatoly Baksheev <no@email>
Date:   Thu Jan 9 19:34:55 2014 +0400

    fixed crash in enabling shading for polydata widgets

commit e478d6b1e9d7eabc1901875b75da945dcba114f9
Author: Anatoly Baksheev <no@email>
Date:   Thu Jan 9 19:08:06 2014 +0400

    renamed cv::viz::get() to getWindowByName()

commit 25b417e8b27ee6d6007c97ff56992551d103e2d1
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 8 19:43:20 2014 +0400

    added test for trajectories and fixed bug with float type

commit 64566e617805e28d25d213539d7097bc04ad5764
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 8 17:46:32 2014 +0400

    minor

commit 0d702b83f4bbcdcaed1f3463e21c7bbe89445dee
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 8 17:16:25 2014 +0400

    updated code to use mapper->SetInput instead of SetInputConnection. All widgets except plane, images ans texts

commit a3b1f29d23de60b4eaec656489d69e02e510ad33
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 8 16:25:14 2014 +0400

    refactored spheres trajectory

commit 38c9fa4a92edbce45265ce92b3f79d87962defb4
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 22:59:40 2014 +0400

    more refactoring

commit 4833976a0c7fce492cf69a33f2815fcedd3a2890
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 22:35:21 2014 +0400

    refactored frustum trajectory to use glyphs

commit 42dc90295dc6cc179939605cad170f5f957ba37a
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 22:21:42 2014 +0400

    refactored camera position - simplified frustum creation

commit 45879fb9db59701f9f57e25224860a70ee05b1a6
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 21:48:32 2014 +0400

    more refactoring

commit a8556134aef1c1c9a5ea90b3d97eaf20dd67b77f
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 21:37:33 2014 +0400

    refactored simple trajectory to use TensorGlyph

commit 771d9509a8dcf50b84ecd60c1340e49a4c62cf81
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 21:32:54 2014 +0400

    polyline now uses scalars for color data (for reuse by other widgets)

commit e94ee94be329e40bdd32cf08e2748529838d45f6
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 21:28:29 2014 +0400

    refactored WCoordinateSystem widget

commit 56819eaf198ddcca5ebab5039676e84ac8f0250b
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 21:27:11 2014 +0400

    switched completer API to doubles, updated docs

commit d26446542248d4d3442a761a46bcd77e36a8e45c
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 21:13:15 2014 +0400

    more refactoring

commit 406444037d9e03ed7a5136cc4fcf8d8a1df86ec0
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 18:18:06 2014 +0400

    refactored polyline

commit b100299644d8c2c486fcbe4e5e281056de056d82
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 14:51:32 2014 +0400

    code beatification

commit e26b7e1e4fa855a30798fdd11ad92b7cd87aa518
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 12:34:42 2014 +0400

    ported some trajectories functionality to InputArray style

commit 7b28f730f42c419bc9d17e394a91e5df4a65a20b
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 12:32:33 2014 +0400

    traits for Affine3

commit cd57c4e189cb70318875534dadae1dcf10a35e89
Author: Anatoly Baksheev <no@email>
Date:   Tue Jan 7 10:53:04 2014 +0400

    refactored CloudNormals and added test for it

commit b7cb3fe8e0a3cd210ed47b9d09ab53fed0c5cb8c
Author: Anatoly Baksheev <no@email>
Date:   Thu Jan 2 16:33:47 2014 +0400

    switched more to doubles

commit a76a34d28e9e0cb6b15c419181dccee77078d6fb
Author: Anatoly Baksheev <no@email>
Date:   Thu Jan 2 16:16:29 2014 +0400

    added Affine3: 3x4 input Mat support

commit 3e071491c93e22c7bd5bead117fae196738ba759
Author: Anatoly Baksheev <no@email>
Date:   Thu Jan 2 16:10:08 2014 +0400

    added Affine3 ctor from array

commit baee8c3aa58fb88ec25b231ac41c65df122531f1
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 1 22:36:08 2014 +0400

    refactored Mesh, added tests, added failing "twice spin()" test

commit 70a81db5672b17f14ffdd461cf9f5f75cb55f751
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 1 20:51:04 2014 +0400

    fixed bugs in cloud collection and added test

commit cb5806164946379b77f328cbb7bf00959b194f6f
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 1 20:13:39 2014 +0400

    getViewerPose implementation simplified (and error seems to be fixed)

commit 186853a50fddc7a814433cb082956ace780a4f47
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 1 19:58:41 2014 +0400

    mass switch from Affine3f to Affine3d

commit b1c0bf1fee85b37e52dbbf6e491a7fbab8639861
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 1 19:26:04 2014 +0400

    Affine::rotate(rvec) method

commit 1615527426dab092712665f05610440432bfbcc7
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 1 18:21:23 2014 +0400

    switched source to InputArrays

commit f610c295f2badb79386e81d0b4df4b594f5d4ced
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 1 17:55:18 2014 +0400

    more tests

commit e7791e1590a81010afb18a61fe913c90dbface74
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 1 16:35:16 2014 +0400

    colors minor

commit c1b41caa7cec1bb42cfde238f0ba1ea7c178f1d2
Author: Anatoly Baksheev <no@email>
Date:   Tue Dec 31 21:50:38 2013 +0400

    added vtkCloudMatSink, reworked cloud IO functions, added normals support

commit 1c4cfd8eaf2dee020303733f23532ed7cabf30d3
Author: Anatoly Baksheev <no@email>
Date:   Tue Dec 31 21:03:10 2013 +0400

    normals support for CloudMatSource

commit 7e952e2f101c17aeceedad76534981211069a579
Author: Anatoly Baksheev <no@email>
Date:   Tue Dec 31 18:52:10 2013 +0400

    removed incorrect and unnecessarily methods from Affine3f

commit bf30c33e6e3fd8c3735ba9e713419790acc05209
Author: Anatoly Baksheev <no@email>
Date:   Fri Dec 27 18:10:51 2013 +0400

    getting data from opencv_extra

commit b131faa8f958e3eff8749a776c437984d3bd7108
Author: Anatoly Baksheev <no@email>
Date:   Fri Dec 13 20:05:19 2013 +0400

    export scene to vrml and obj formats

commit b2cd526e6ab15b897a9935750a584c69715d3020
Author: Anatoly Baksheev <no@email>
Date:   Fri Dec 13 19:35:48 2013 +0400

    removed extra code

commit 84d6fe397d90887c4a823d9e7e6666821aadf969
Author: Anatoly Baksheev <no@email>
Date:   Fri Dec 13 19:20:20 2013 +0400

    reading/writing clouds functionality

commit 80ab6e889fc30ef42dd5420e3f372db192284927
Author: Anatoly Baksheev <no@email>
Date:   Thu Dec 12 23:46:41 2013 +0400

    refactoring

commit 7dbf6bc8df019240ff6f07bcb52e4d078c9a087c
Author: Anatoly Baksheev <no@email>
Date:   Thu Dec 12 23:21:55 2013 +0400

    rewrote cloud widget in vtk filters style

    Conflicts:
    	modules/viz/src/clouds.cpp

commit 159de9cc477123429941f0ad7582f2c17a241b70
Author: Anatoly Baksheev <no@email>
Date:   Thu Dec 12 22:05:10 2013 +0400

    fixed potential crash

commit 270506829055623504e6c7313524beaedfb44ebb
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 8 21:00:00 2013 +0400

    refactored Keyboard and Mouse Events

commit cad2f98007ea2e69157d8f300528b068e60635ff
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 8 20:58:55 2013 +0400

    removed vizActor (since unnecessarily in new design concept with simplified widgets)

commit 45aeecb0431f809fd5f4e1b27fd5f895cec6e588
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 8 20:33:53 2013 +0400

    renaming

commit abc94657980594ac1aea311c194a3ceb2776f2dc
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 8 19:37:44 2013 +0400

    kinect camera CAD parameters

commit e990d5b99913ac48da075d5f2048c797c31c6e8b
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 8 19:31:23 2013 +0400

    reading/writing trajectories

commit e048df51ced6ff5863c806104ae0019deafcbb38
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 8 18:31:04 2013 +0400

    for shapes switched vtkDataSetMapper to more efficient vtkPolyDataMapper

commit 4979f44cfa83a3fb0b18fec9a56fdb36efb97adb
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 8 18:11:19 2013 +0400

    minor

commit 31d42ce18f55f4f42388eaa52e106a8733a099de
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 8 18:07:16 2013 +0400

    refactored Trajectory: split into Trajectory and TrajectoryFrustums)

commit 54fa69cab2266ffe4ad8e0ad8a57bf29ee2b5979
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 8 17:12:02 2013 +0400

    renamed Spheres Trajectory, minor changes in Trajectory

commit c7ff13873d6e5e371f2658f128d7fbfc4ef77832
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 8 16:57:09 2013 +0400

    minor

commit f6e9b81188c634de6254136987d36c14e6fa4540
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 1 15:25:44 2013 +0400

    reduced exported interface names (to make IntelliSense hints less littered)

commit 44c1d4dfdc8fc14093966d08d48cbf3666b41680
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 1 14:58:29 2013 +0400

    allow fast switch between actors (except mesh, cloud, cloud collection)

commit 2d63f60d435d7a7db0b79479b68c8051216ab8f6
Author: Anatoly Baksheev <no@email>
Date:   Sat Nov 30 17:57:53 2013 +0400

    minor changes, opencv cross-branch code

commit 15fd3faa40bc5bc21283cab4414c67a452f03e1d
Author: Anatoly Baksheev <no@email>
Date:   Sat Nov 30 19:00:10 2013 +0400

    support gray color clouds

commit 2cbfb0414464053a20c9f2a6b2a93792a9a55b3c
Author: Anatoly Baksheev <no@email>
Date:   Thu Nov 28 12:45:22 2013 +0400

    viz: rich set of named colors

commit 5ea3ecdc3b62f43d79bfbb706b77370a5efdff21
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 19 18:32:22 2014 +0400

    horisontal mwhell support

commit 3db33979e1a5f29a71fc42f5a3902eedc55f94e6
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Jan 18 23:41:49 2014 +0400

    added perf tests for stitching warpers

commit 5af2e6f1c9cbd35090faff359616326c2952f25a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Jan 18 14:27:30 2014 +0400

    removed useless CRC calculation

commit f60f8a7346766331ffc1c6314e278c368d8dbf03
Merge: e965f3d 4e20e06
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sun Jan 19 11:44:36 2014 +0400

    Merge pull request #2172 from Nerei:compilation_and_warnings

commit 6bf599b1bca8a58c7a656ddc169f7be0fc3094c6
Author: Drew Jetter <djetter@gmail.com>
Date:   Sat Jan 18 16:39:50 2014 -0700

    Fixed bug #3489: The code assumed that two global variables would be constructed in a particular order, but global variable initialization order is compiler-dependent.

commit 4e20e06ee7fd7aaff8be51613daf14e6f46ede26
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 19 04:07:24 2014 +0400

    warnings

commit 0fc4ac4f1f9602fcb54beaa04e42a7c1b2befcb6
Author: Anatoly Baksheev <no@email>
Date:   Sun Jan 19 04:07:17 2014 +0400

    warnings and compilation with installed Windows 8.1 SDK

commit 6b8bee6e0bc4afc21c991ba4f1030b393d4d2fc2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Jan 18 22:37:47 2014 +0400

    fixed kernel compilation warnings

commit d270c9e8b611e200866a624b351f14999238fa41
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Sat Jan 18 11:12:13 2014 +0100

    Type conversions to fix warnings

commit 67e2d7ec43a14d64d3141bb21999c2c0a0d0907d
Merge: 06fb073 e965f3d
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Sat Jan 18 10:38:07 2014 +0100

    Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl

commit 37789f015af3909e66f47c866ee505b754d71c36
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Jan 18 01:30:29 2014 +0400

    deleted excess semicolons, commas

commit e965f3d3d4a63b87021f9884fab05c5391023655
Merge: 79fcc06 711f07a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 19:00:19 2014 +0400

    Merge pull request #2157 from k0da:master

commit 0de799b3b03c1320b84d2c702a629867362b9fc3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 18:25:28 2014 +0400

    Removed some duplicate assertions.

commit 088535fa565365c68c8fde20a66616b9880f3721
Merge: 58afe5d 5f8d8c0
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 18:23:53 2014 +0400

    Merge pull request #2159 from SpecLad:1xN

commit 79fcc06a4b463d411da2b22d1fb2823b16ea6a26
Merge: 659c534 092f916
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 16:28:29 2014 +0400

    Merge pull request #2146 from SpecLad:merge-2.4

commit f1541b528712c07343e9916380d845ac8afd1443
Author: vbystricky <user@user-pc.(none)>
Date:   Fri Jan 17 15:23:16 2014 +0400

    Add perfomance test

commit fc8b385ff6c6e02fb3c696dda65c244878fdab0a
Author: vbystricky <user@user-pc.(none)>
Date:   Tue Jan 14 17:53:28 2014 +0400

    Return false if ocl version not properly worked

commit 3762036b0814e7cc27bd9d68ce9760708174fbab
Author: vbystricky <user@user-pc.(none)>
Date:   Fri Jan 10 12:44:21 2014 +0400

    Fix compiler warnings. Add additional test case for UseInitFlow

commit 3b0fa68a973113f398c217ca8402e82cc3e8867f
Author: vbystricky <user@user-pc.(none)>
Date:   Thu Jan 9 16:34:01 2014 +0400

    Move OpticalFlowFarneback from ocl module to video module

commit 659c5345d904d07e293fe4b8212e3a668449687a
Merge: 664c9b1 8fd0fd5
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 14:58:27 2014 +0400

    Merge pull request #2122 from adishavit:feature-HandleMouseWheel

commit 58afe5dd177d9ebae181c3c95807459576aa409c
Merge: 8dbc96f 5d2edce
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 14:57:57 2014 +0400

    Merge pull request #2140 from Daniil-Osokin:fix_saving_untrained_svm_model

commit 664c9b15cf3fdb8fd7cb9f2c1d96a51945b54748
Merge: 07e08f7 93a8186
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 17 14:52:17 2014 +0400

    Merge pull request #2152 from ilya-lavrenov:tapi_canny

commit a502ffbd2caac45adabf94e593709f71397f404a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 14:50:40 2014 +0400

    Updated required CMake version in docs to match reality.

commit e9805e444f66487a177b91032ee6eced7fccb0c8
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 14:49:42 2014 +0400

    Fixed an overly-narrow assertion in cv::norm.

    size() requires that the matrix is two-dimensional, and norm()
    works on higher dimensions.

commit 5f8d8c0069a715dd3dfbbcd6a01a6715e74571b2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 14:18:31 2014 +0400

    Added a test for matrix-to-vector copy and convert.

commit 4e4a7d035335b8db373f479335abd095fc582446
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 14:16:22 2014 +0400

    Removed an unnecessary workaround for matrix-to-vector copyTo.

commit ee97a5e7573e292ea0d029a257fea0542c38e4a5
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 14:13:21 2014 +0400

    Re-fix bug #3319 with less side effects.

commit f02204847af64656a8bff7a4b5ec1f55df11643b
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 13:02:35 2014 +0400

    Revert "fixed bug #3319"

    See 092f916 for explanation.

    This reverts commit 4f9c081dc313f8fdfee3f0a4572779ae13e27e40.

commit e9e9e00d45ab206e59aff30eab7d38e073dad789
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Thu Jan 16 16:18:02 2014 +0400

    replaced sprintf with cv::format

commit 092f916db94186758027dd0fc56655ea2e7b4a98
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 17 12:51:52 2014 +0400

    Revert 4f9c081

    That commit introduces problems, as it breaks certain use cases of
    OpenCV functions; for example, convertTo of an Nx1 matrix to an
    std::vector.

    Since vectors can't store separate width and height values, OpenCV
    considers them to always be 1xN. So even though the vector is created with
    .create(N, 1), the Mat passed to getContinousSize has dimensions 1xN,
    and the size comparison fails, even though the operation itself is safe.

    This is a use case we probably don't want to break, at the very least
    for backwards compatibility. So I'm reverting the commit. This will also
    unfix bug #3319; I'll submit a less intrusive solution as a PR to 2.4, which
    will also revert 4f9c081 there.

commit 93a818684cd0d2403dcafec392c0e44aba6bf1ed
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Jan 14 14:10:24 2014 +0400

    ported cv::Canny to T-API

commit 8dbc96fed8dfe6f51242589e88b436a75e24f102
Merge: 2fde4d8 8ce691e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 17 10:43:39 2014 +0400

    Merge pull request #2143 from Daniil-Osokin:fix_docs_cvt_color_alpha_channel

commit 711f07a34ceb504e8f75e978692201efa58268ca
Author: Dinar Valeev <dvaleev@suse.com>
Date:   Thu Jan 16 21:53:49 2014 +0100

    Use __vector instead of vector as suggests Eigen

    This fixes build on PowerPC where Eigen unsets vector, bool and pixel

    Signed-off-by: Dinar Valeev <dvaleev@suse.com>

commit 63a5e39e2cb9aad19695c29e3e4c480659ff18c8
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 16 20:52:45 2014 +0400

    added cv::reduce to T-API

commit 8ce691e67966954cbab1e61f123f8206a42b1e90
Author: Daniil Osokin <daniil.osokin@itseez.com>
Date:   Mon Jan 13 14:20:42 2014 +0400

    Fixed cvtColor alpha channel docs

commit 8fd0fd538d567828bfd12861493c69f407b9dc23
Author: Adi Shavit <adishavit@gmail.com>
Date:   Thu Jan 16 16:30:54 2014 +0200

    Doc fix.

commit 07e08f7a3dfc1852c0b6de7a664c23dba474cf78
Merge: 63c61b4 82d3efc
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 16 18:03:21 2014 +0400

    Merge pull request #2141 from ilya-lavrenov:perf_warp

commit 63c61b4b988d27aab04a994a4573ecaaae9b6242
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 16 17:58:26 2014 +0400

    Revert "replaced sprintf with cv::format"

    Fixing build breakage.

    This reverts commit b83eff7ecf0a3a8a9d706168150d569c94f0b71e.

commit ddfd1854a7e8fdc6245aa271d62cdcb4faebac6c
Merge: b0af6a2 b83eff7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 16 16:44:24 2014 +0400

    Merge pull request #2151 from KonstantinMatskevich:testdata_path_calib3d

commit b83eff7ecf0a3a8a9d706168150d569c94f0b71e
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Thu Jan 16 16:18:02 2014 +0400

    replaced sprintf with cv::format

commit 46f06d82c9775b8572ded9cefd02c68cce61be00
Author: Adi Shavit <adishavit@gmail.com>
Date:   Thu Jan 16 12:51:14 2014 +0200

    Update docs.

commit 8802d62cc5afd16987947ff4c0334e528141a4a4
Author: Adi Shavit <adishavit@gmail.com>
Date:   Thu Jan 16 11:25:57 2014 +0200

    Updated docs.

commit 75b80e5d7d7bba39b8cca1160ab14ccaa068f0f5
Author: Nick D'Ademo <nickdademo@gmail.com>
Date:   Thu Jan 16 20:17:49 2014 +1100

    Added missing comma in enum.

commit 24333569aa8096f863b115814c10f0917630040c
Author: Adi Shavit <adishavit@gmail.com>
Date:   Thu Jan 16 11:09:25 2014 +0200

    Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect()

commit b0af6a2b581c5a34c34927ad7a81446d48efc695
Merge: a164381 c7d90c8
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 16 12:37:02 2014 +0400

    Merge pull request #2127 from apavlenko:perf_cascades

commit 0ea454301f64e813b6e6470be23fb550324a17c9
Author: Scott Breyfogle <swb02009@mymail.pomona.edu>
Date:   Fri Jan 10 16:42:25 2014 -0800

    Added optional constraints to non-probablistic hough lines functions

commit 82d3efc6c053455f1217e5af32732b69ef834a51
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 19:46:00 2014 +0400

    added perf test for cv::Canny

commit ab18c2d1323a58294db30b0eaac08917cf0aa4b8
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Jan 15 15:08:09 2014 +0400

    changed testdata path for calib3d

commit a164381cc6fe0d77fec8e3195ec10179710cb365
Merge: fdb1019 7ed692b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Jan 15 13:45:28 2014 +0400

    Merge pull request #2150 from ilya-lavrenov:tapi_cvtcolor

commit 2272a5876972f74684c43f2069c3046bd2888d01
Author: Seunghoon Park <pclove1@gmail.com>
Date:   Tue Jan 14 20:47:23 2014 -0500

    fixing bug #3345. don't use BORDER_ISOLATED alone. it should be combined with some border type

commit e45cf2173f28c51eadfe799d18f342b7163f9590
Author: Adi Shavit <adishavit@gmail.com>
Date:   Sun Jan 12 09:33:08 2014 +0200

    [HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated C++ API.

commit fecd5c994b79f0480b5d893fd53e062edccef0ad
Author: Adi Shavit <adishavit@gmail.com>
Date:   Tue Jan 7 21:17:57 2014 +0200

    Added support for mouse-wheel events on Windows.
    To be used in the mouse callback like this:
        if (CV_EVENT_MOUSEWHEEL == CV_GET_MOUSEWHEEL_EVENT(event))
        {
           int delta= CV_GET_WHEEL_DELTA(event);
           // use delta...
        }

commit 9dc0bfc755b5ba074b9e7c23a311c132e6926f37
Author: Adi Shavit <adishavit@gmail.com>
Date:   Sun Jan 5 17:21:59 2014 +0200

    Small fix for extracting mouse coordinates on Windows, in a way that will always work with multiple monitors.
    This is the way recommended by Microsoft.

commit c7d90c8b326d4f47f371b63292158cce8b3834b0
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Jan 14 23:15:50 2014 +0400

    adding old cascade

commit 9b7b360bf71c3602d4a52858b61139f2cf40930f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Jan 14 17:50:00 2014 +0400

    fixing compilation if `WITH_OPENCL=OFF`

commit 7ed692bf923d765e83e04b5b2a345e1463218fd0
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Jan 14 16:15:42 2014 +0400

    fixed cv::cvtColor

commit 25870fa66ba59537f5e034c807f23f121fa05859
Author: Nick D'Ademo <nickdademo@gmail.com>
Date:   Tue Jan 14 21:38:57 2014 +1100

    Added PVAPI enums to highgui.hpp
    Added "PVAPI_" prefix to FrameStartTriggerMode definition

commit 2fde4d8a948b1b6b206a998da331dd63d118f267
Merge: 2443e80 49dfa5a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Jan 14 11:55:28 2014 +0400

    Merge pull request #2145 from andreasBihlmaier:2.4

commit fee2ed37fc27dbfd25f850f627b8121a308eb200
Merge: c3bfe3f 9628abc
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 13 19:28:43 2014 +0400

    Merge remote-tracking branch 'origin/2.4' into merge-2.4

    Conflicts:
    	modules/contrib/src/retina.cpp
    	modules/core/include/opencv2/core/mat.hpp
    	modules/core/src/algorithm.cpp
    	modules/core/src/arithm.cpp
    	modules/features2d/src/features2d_init.cpp
    	modules/gpu/include/opencv2/gpu/gpu.hpp
    	modules/gpu/perf/perf_imgproc.cpp
    	modules/imgproc/src/generalized_hough.cpp
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	modules/video/src/tvl1flow.cpp
    	modules/video/src/video_init.cpp

commit fdb1019b9ee16fb04571780a68f8ad4848e3c44b
Merge: c3bfe3f 09bff78
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Jan 14 11:34:02 2014 +0400

    Merge pull request #2147 from ilya-lavrenov:tapi_sqrt

commit 06fb073b8b58fc0f9ac75dcddb5464f4667453e2
Merge: e17da9a c3bfe3f
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Mon Jan 13 18:14:56 2014 +0100

    Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl

commit 09bff78d63abf6c347af185b9c039e6001fd56a9
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 19:58:27 2014 +0400

    deleted extra arg in case of power=0.5

commit 2443e8090eb006e59c79a187a709ecd6d0aa566d
Merge: 9628abc 4c99196
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 13 19:28:09 2014 +0400

    Merge pull request #2133 from apavlenko:2.4-perf_haar

commit 49dfa5a17f00a82f0c160e20395c193b992d286e
Author: ahb <andreas.bihlmaier@gmx.de>
Date:   Mon Jan 13 16:09:42 2014 +0100

    Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8
    OpenCV Error: Unknown error code -6 (OpenCL function is not available: [clGetPlatformIDs]) in opencl_check_fn, file /home/ahb/software/opencv/modules/ocl/src/cl_runtime/cl_runtime.cpp, line 83

    The issue results from modules/ocl/src/cl_runtime/cl_runtime.cpp checking for
    "linux" instead of "__linux__" (cp.  http://sourceforge.net/p/predef/wiki/OperatingSystems/)

    Adjust all other occurrences of "defined(linux)" as well.

commit 30b5234e9afca8ad60a8a139e8bc5b25b6e2e0bb
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 18:51:49 2014 +0400

    added perf test for cv::sqrBoxFilter

commit 8702fceb4b609ed090a1a8dc6930aa4376dc157d
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 18:36:25 2014 +0400

    fixed cv::integral perf test

commit c3bfe3f33e821e27dacc34a6c72e5a8ab038079e
Merge: 85c713b 9e3673e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 13 18:16:59 2014 +0400

    Merge pull request #2136 from SpecLad:python-ver

commit 4c99196399288d2a97af37366c9a938d9092f0f1
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Jan 13 18:12:30 2014 +0400

    adding `finish()` to flush CL queue, renaming the test to match 'master' branch

commit a7a7b80ff8602f7ff4a05eef2032a7e86379acea
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 17:50:14 2014 +0400

    added perf test for cv::Moments

commit 520a692fda29176efeaa7fc3c63676addaac841f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Jan 13 16:58:36 2014 +0400

    switching to `CL_PERF_TEST_P`, adding `safeFinish()` to flush CL queue

commit 9628abc7867c507201da2c5030195264de81aa27
Merge: 87e0c26 f197d8b
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 13 16:33:15 2014 +0400

    Merge pull request #2137 from ilya-lavrenov:gitignore

commit 85c713b59e7bc76c40ff27f03a8907fe8f08fb17
Merge: af9cd79 e90d0b6
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 13 16:32:41 2014 +0400

    Merge pull request #2138 from alekcac:python_tutorial_fix

commit af9cd79e16f99ed1ef7bb1b8fe77ae0691ecc8db
Merge: 6071671 da27902
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 13 16:30:33 2014 +0400

    Merge pull request #2121 from ilya-lavrenov:tapi_perf

commit 87e0c261293678b1877d6ba4689f6fc9db3233c0
Merge: 890f1ba 3f458c6
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Jan 13 16:26:02 2014 +0400

    Merge pull request #2108 from pemmanuelviel:flannMemoryLeak

commit 6fb878a65fc9603c9a2cfae955d08bdeaaf29864
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 15:59:24 2014 +0400

    added perf tests for cv::medianBlur

commit d8e5f1611b338290cc73b8c20a3076599d688fbd
Author: Max Khardin <max.khardin@gmail.com>
Date:   Mon Jan 13 15:55:49 2014 +0400

    Rewrite definition/declaration of variables to be more compact

commit 5e7fd8bd7e95ab4f8e146de85e9d5bbf3cf735b9
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 15:43:09 2014 +0400

    added perf tests for cv::morphologyEx

commit 5a2a0b326a47f647eec9b438e6d1789a3b3678fa
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 15:30:35 2014 +0400

    added perf tests for cv::dilate

commit f61597dce845732e7adef4eafa654dc6530f3348
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 15:26:50 2014 +0400

    added perf tests for filters

commit 04ae46e21c3c2df807764313b70a6e87bb2b082e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 15:01:52 2014 +0400

    added perf tests to some imgproc functions

commit 3cf5c0b991ac3fb49115de59fbe7d77fc4599e36
Author: Nick D'Ademo <nickdademo@gmail.com>
Date:   Mon Jan 13 22:01:09 2014 +1100

    Added get and set for extra PVAPI property: CV_CAP_PROP_FRAMESTARTTRIGGERMODE

commit e76d51511ed27517210d2e5c28c439716ebbc4da
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 14:14:22 2014 +0400

    added perf test for cv::cvtColor, pyr operations

commit 4bd4c8d12abfd6dbd5fedad477f71a34be00c0d1
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 14:06:15 2014 +0400

    added perf tests for cv::blendLinear

commit 5d2edced2670e4d2305b5799da9378f21c18d24e
Author: Daniil Osokin <daniil.osokin@itseez.com>
Date:   Mon Jan 13 11:41:54 2014 +0400

    Added throwing exception when saving untrained SVM model

commit 6fbaff6d837a1f297d4e281e15aae8b7a72a59ed
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 13 13:09:58 2014 +0400

    added perf tests for T-API warp operations

commit a7821c60e55be5968aec41f31349f58db789671e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Jan 13 11:20:17 2014 +0400

    refactoring the test as it should be in 2.4

commit 6071671bdaa6ffdf751710111143a6523d41c78a
Merge: d64f05c f7b0940
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Jan 11 17:15:21 2014 +0400

    Merge pull request #2135 from alalek:ocl_runtime_cleanup_2

commit d64f05cd5934fd267dae20161ac82f73045b49ce
Merge: 5a99004 7852b2f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Jan 11 16:39:21 2014 +0400

    Merge pull request #2112 from ilya-lavrenov:tapi_stitching

commit e90d0b6e4c74fbd0acbe90cb61dc4545175ec79f
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date:   Sat Jan 11 16:35:41 2014 +0400

    changed code in python tutorial, these functions don’t return image

commit f197d8b91c1b89037aaf81bfeb8217c0a7aa0f9c
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Jan 10 18:59:06 2014 +0400

    updated .gitignore

commit da2790249e06235d613bad077c121ad058d87e00
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Jan 7 20:32:22 2014 +0400

    added NORM_L2SQR type to cv::norm

commit 2e5e278271c00cd78b3a39c31de3e390c2b1c33c
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Jan 7 20:17:45 2014 +0400

    added cv::PSNR performance test

commit a01e81c8f711a9218a5ed9968cc8b26671c5db05
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Jan 7 15:08:48 2014 +0400

    added some performance tests

commit 1592234f1a54a1cc8ce0040f0b29b0b6ba9055c3
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 6 00:12:13 2014 +0400

    added mask support to cv::norm, cv::meanStdDev

commit 9e3673ef538916d2f6be0e4def4ca4b3a0fa886a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 10 18:40:47 2014 +0400

    Don't use PYTHON_VERSION_STRING when searching for Python libraries

    It may be an arbitrary string, and, for example, in Ubuntu 13.10
    it's set to "2.7.5+", which breaks the find script.

commit 7852b2f155fc4f7adfa42955cc264037d21f9a99
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 9 17:00:08 2014 +0400

    updated docs according to the last changes

commit 8f9ccc099bda7c2407c9373f99851a45c513e282
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 9 15:21:07 2014 +0400

    replaced Mat by Input/Output arrays

commit 118709fd9f3d5ad036fdd596dc1e777ee9703589
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Jan 1 23:46:19 2014 +0400

    added OpenCL accelerated warpers

commit 5a9900481a3365d77adb85a86853af96c140b656
Merge: a75cfe1 dd30215
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 10 18:12:08 2014 +0400

    Merge pull request #2105 from ilya-lavrenov:norm

commit 890f1baff0b8d79060b43fa40f89b77b7b22d63c
Merge: a13e32f ae795e5
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Jan 10 11:44:45 2014 +0400

    Merge pull request #2132 from ComFreek:patch-2

commit f7b0940d44baf430459c9485c1219fca4edc9a99
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Jan 9 19:07:39 2014 +0400

    core/ocl: runtime, remove unused declarations

commit 4d28e8243c6fe78eeeef0a4f59d72c6812578f29
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 10 00:14:48 2014 +0400

    'master'-like Haar perf test

commit 2c0e24e9483bc368eadb43d9ab397c935b8960e9
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Jan 10 00:08:15 2014 +0400

    adding Haar & LBP cascades perf test using UMat, removing old incomplete test

commit ae795e5797ba3b85812d56edc7fe497d05cc2d77
Author: ComFreek <comfreek@outlook.com>
Date:   Thu Jan 9 17:24:20 2014 +0100

    Corrected package name in tutorial

    See also #2101

commit dd302158e0da94ea470773d0a163c68b34549f12
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 9 17:32:13 2014 +0400

    fixed case with zero mask

commit a75cfe13e79e4eb6ffd01c49ff64bacbab2d895f
Merge: 560cfa5 70a0327
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Jan 9 17:08:48 2014 +0400

    Merge pull request #2128 from alalek:ocl_cleanup_runtime

commit 560cfa567296ef3f87b5c153f387dc29521df02d
Merge: dfeba1e 9899cf7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 9 17:04:03 2014 +0400

    Merge pull request #2129 from ilya-lavrenov:mix_fix

commit a13e32f5ab68ff17f18b1a4674f83c558e78476d
Merge: d509165 bf49945
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 9 16:58:29 2014 +0400

    Merge pull request #2115 from nghiaho12:kmeans_sample

commit d509165d96f49c886a897e39919895ebad81ce89
Merge: 7acea48 6b9ebcb
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 9 16:21:48 2014 +0400

    Merge pull request #2118 from ilya-lavrenov:semicolons

commit dfeba1e8dd6fdb0c19d7adb936767bfd9181294c
Merge: b45bb60 ef61964
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 9 14:44:06 2014 +0400

    Merge pull request #2119 from d-schmidt:patch-1

commit 9899cf7519a8a8bd59a032e1bb04634dc4590493
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Jan 9 14:26:44 2014 +0400

    fixed cv::mixChannels perf test

commit bf4994554df10e9c070da5490b5c274fa152fe84
Author: Nghia Ho <nghiaho12@yahoo.com>
Date:   Thu Jan 9 21:04:17 2014 +1100

    Removed unecessary initialisation of Mat centers.

commit b45bb60c8bcae37edb2251b4caccdeb178b3e8e3
Merge: cab67cd b24f7ee
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 9 14:00:52 2014 +0400

    Merge pull request #2126 from yinghau76:master

commit 6ee0b6eb56148d5bf240d74a51e2ffe665040306
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 6 00:12:13 2014 +0400

    added mask support to cv::norm, cv::meanStdDev

commit 70a032700429f08b347bcf459888a01b2cab5384
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Jan 9 13:47:04 2014 +0400

    core/ocl: cleanup unused files

commit 7acea487885fe06aff20eeec4fd405b354ef1586
Merge: 58882e5 e21c6e1
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 9 13:25:59 2014 +0400

    Merge pull request #2106 from robbertkl:patch-2

commit 58882e5c222d34ecf6df9414afa2e640b13debcf
Merge: 5327482 2ae20c7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 9 13:24:20 2014 +0400

    Merge pull request #2114 from kazuki-ma:SparseMat_convertTo_typofix_24

commit cab67cd9ac7b0680d49d1b26c08c779b3118a9f6
Merge: 6d84671 984c4d2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 9 12:42:58 2014 +0400

    Merge tag '3.0-ocl-tech-preview' (-s ours)

commit 6d84671e8b5e402b3b2418e6e8fb98a3db447107
Merge: ea3dd9d 0119e85
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 9 12:41:57 2014 +0400

    Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix

commit ea3dd9d5e7e86217d08c5c8bfd8927919b2f8bad
Merge: 4e35ebb 0c49360
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 9 12:38:55 2014 +0400

    Merge pull request #2103 from ilya-lavrenov:typo

commit 4e35ebb52f06675636642994e5ef2f278b5c2c87
Merge: 1c3bfae c2dd7fd
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Jan 9 12:35:30 2014 +0400

    Merge pull request #2102 from Nerei:compilatin_for_windows

commit b24f7ee57c16f9748809ae20583178177b9c1bf6
Author: Patrick Tsai <yinghau76@gmail.com>
Date:   Thu Jan 9 14:41:44 2014 +0800

    Fix compiler error with Android NDK r8e

    Original error without the fix:

    opencv/modules/objdetect/src/cascadedetect.cpp: In member function 'bool cv::CascadeClassifierImpl::ocl_detectSingleScale(const cv::_InputArray&, cv::Size, int, double, cv::Size)':
    /opencv/modules/objdetect/src/cascadedetect.cpp:1215:
    error: no matching function for call to 'cv::ocl::Kernel::args(cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, int, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::Size&, int&, float, cv::Rect&, cv::Size&, cv::CascadeClassifierImpl::<anonymous enum>)'

commit d155639db50bdced01df2563556c46d26fe212ad
Author: Bo Li <prclibo@gmail.com>
Date:   Tue Jan 7 09:57:40 2014 +0800

    grammar fix

commit d444af5bb22691b1109870135beb2d8585c65066
Author: Bo Li <prclibo@gmail.com>
Date:   Tue Jan 7 09:54:12 2014 +0800

    updated decomposeEssentialMat doc

commit ef61964768548999855bb1b652b1396ab5909fbf
Author: David Schmidt <david.schmiddi.86@gmail.com>
Date:   Tue Jan 7 00:11:33 2014 +0100

    Update py_face_detection.rst

    bug in example

commit 6b9ebcbf3d332f6963b2ab8c37d6a14223921e15
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Jan 7 02:38:41 2014 +0400

    deleted extra semicolons

commit 0119e8553c6399ba4ba4c1715f02bb569c185e3a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Jan 6 14:41:57 2014 +0400

    fixed cv::mixChannels OpenCL version

commit 601b7d1dd3a3ec9e8af5df461d43632d98ed3a7a
Author: Nghia Ho <nghiaho12@yahoo.com>
Date:   Mon Jan 6 20:19:07 2014 +1100

    Fixed a valgrind 'Conditional jump or move depends on uninitialised value(s)' on cv::kmeans(...). The original code used points(sampleCount, 1, CV_32FC2), which confused generateCentersPP into thinking it is a 1 dimensional center, instead of 2. As a result it would set only the x variable and leave y unitialised.

commit e17da9a843fc99b590bed3d7ce7f0a5101a8ed17
Merge: 928924d 1c3bfae
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Sun Jan 5 19:00:25 2014 +0100

    merge with upstream

commit 2ae20c74a2661d5975529211f4c95206e8558243
Author: Kazuki Matsuda <matsuda.kazuki@facebook.com>
Date:   Mon Jan 6 02:24:14 2014 +0900

    Fix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m)

    Fix compilation erros when compiling this constructor.
    First argument type of "convertTo" should be instance, not a pointer of instance.

    First pull request was created for master branch.
    But it should be marged for 2.4.
    https://github.com/Itseez/opencv/pull/2113

commit 699eda46b6278a6aeb6a9c58cbb605387b8a0075
Author: Max Khardin <max.khardin@gmail.com>
Date:   Sat Jan 4 20:09:30 2014 +0800

    Remove three sneaky tabs

commit 3a4d4080f4a7a682c0a584a693f3be438900ae4b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Jan 1 23:46:19 2014 +0400

    fixed overflow for cv::norm NORM_L2

commit 34b05794d60e9f7043f652a55a4ad250b22a2dac
Author: Max Khardin <max.khardin@gmail.com>
Date:   Sat Jan 4 19:01:32 2014 +0800

    Fix source code indents

commit 214e9d4b12c65a406ec5b6a8e21214079535427b
Author: Max Khardin <max.khardin@gmail.com>
Date:   Sat Jan 4 18:56:32 2014 +0800

    Add performance tests for elementwise multiplication

commit 3f458c6eb114bd46ce7f08b8ca471822ea16d26e
Author: Pierre-Emmanuel Viel <p.emmanuel.viel@gmail.com>
Date:   Fri Jan 3 13:16:36 2014 +0100

    Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified

commit d3e24f3cbff8a5f1503ff45cdf8d1d8118e4c049
Author: Nghia Ho <nghiaho12@yahoo.com>
Date:   Fri Jan 3 14:18:07 2014 +1100

    Improved documentation for neural network

commit e21c6e19db0183e40d12b6634aec2d1923496336
Author: Robbert Klarenbeek <robbertkl@renbeek.nl>
Date:   Thu Jan 2 21:17:55 2014 +0100

    Fix algorithm setter argument validation for uchar

commit 0c49360318111360c12f8cc7857983cda64bff7b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Jan 1 19:41:14 2014 +0400

    fixed typo

commit c2dd7fd76242e62f92ac05f3794c30769737a434
Author: Anatoly Baksheev <no@email>
Date:   Wed Jan 1 15:38:59 2014 +0400

    compilation for windows

commit 5327482b466ab03fd8241a26165a7170cd6fb76f
Merge: 157202f 4f9c081
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 31 16:51:29 2013 +0400

    Merge pull request #2084 from ilya-lavrenov:cont

commit 1c3bfae2121f689535ab1a17284f40f5d64e0927
Merge: cd576c7 262f70f
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Dec 31 15:54:59 2013 +0400

    Merge pull request #1957 from Nerei:format_declaration_by_default

commit 984c4d200f57c0a23ca269e7646c5ad8e6d44722
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 31 15:37:47 2013 +0400

    Set the version status to "-tp", for "technical preview".

commit 4f9c081dc313f8fdfee3f0a4572779ae13e27e40
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Dec 28 01:40:21 2013 +0400

    fixed bug #3319

commit cd576c73643a1574dff32b45b420533953f74581
Merge: 2d5723c 3f07655
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 31 11:53:24 2013 +0400

    Merge pull request #2096 from kamjagin:master

commit 157202fc8d04df71c389f776b9f928376268c79c
Merge: 4ce684e 795c108
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 31 11:40:43 2013 +0400

    Merge pull request #2094 from SpecLad:multimon-be-gone

commit 203a9acdbc7ea130aabb05e98d35b0033fa552d1
Author: pxli168 <pxli168@163.com>
Date:   Tue Dec 31 12:53:31 2013 +0800

    Add support to bool type

    Add the bool support to the get function

commit b036fc756a65c8be5b9b0e4d77d94b6f8099fc20
Author: Seunghoon Park <pclove1@gmail.com>
Date:   Sat Dec 28 14:45:41 2013 -0500

    fixing bug #3345

commit 2d5723ccca0336cea2fbe7bf30e85ca758af29f1
Merge: 967703c a2e683d
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 31 00:35:39 2013 +0400

    Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix

commit 967703c3acbd56fed797bef018f13a7eb6c5fa06
Merge: 8a456c5 cdc10de
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 31 00:26:22 2013 +0400

    Merge pull request #2093 from SpecLad:merge-2.4

commit 8a456c5a6b6856c5c90cea10c76e33346b4eebb7
Merge: 8151571 55634c1
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 31 00:17:33 2013 +0400

    Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe

commit 3f0765523113ae7fc1b300f27dd78c642bb2b6c7
Author: Miroslav Kobetski <miroslav.kobetski@gmail.com>
Date:   Mon Dec 30 17:00:17 2013 +0100

    Fix for bug #3469 CV_XADD failing in clang+nvcc combination

commit 8151571dd676cdc4abeb647a461ba6125f0c6188
Merge: 5f9c117 3e1bec5
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Dec 30 19:54:26 2013 +0400

    Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs

commit 3e1bec52486bab3002e39fd912727b1a85d0a30a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Dec 30 01:21:04 2013 +0400

    added OpenCL version of cv::patchNaNs

commit a2e683d1339bb1a56abf2b994f76d622f1821448
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Dec 30 19:27:06 2013 +0400

    fixed umat access

commit 4ce684e61c78791cdf5cd224d00bf99937c637ff
Merge: 6811d2a 5db1754
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 18:18:41 2013 +0400

    Merge pull request #2087 from ilya-lavrenov:remap_sse2_cond

commit 795c108f2bf2880a81a8d0db1ddc2da71c91864e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 18:00:29 2013 +0400

    Fixed MinGW build by declaring the minimal required Windows version.

    Also deleted miscellaneous remaining multimon cruft.
    Deleted #include <winuser.h>, because <windows.h> includes it
    already.

    This should have a nice side effect of preventing us from
    accidentally using any Windows API that's too new.

commit 6811d2ab24da33895b9267557aa4b8229b951ab3
Merge: a0c98dc 09d25e1
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 17:57:43 2013 +0400

    Merge pull request #2086 from ilya-lavrenov:mul_fix

commit 5f9c117d78870e6674bb5dcfac03ddf84c527fe5
Merge: 6d4c800 9e13e3a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 17:56:59 2013 +0400

    Merge pull request #2085 from severin-lemaignan:emscripten

commit 6d4c80083eb2185684826b21783f9317c9e46551
Merge: 4a6c2ce c4c913f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 17:42:49 2013 +0400

    Merge pull request #2089 from ilya-lavrenov:tapi_examples

commit cdc10defa34ea7ba0edda7d4a3fa0701d451912a
Merge: e33759b 05b9c99
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 17:30:59 2013 +0400

    Merge commit '05b9c991dd' into merge-2.4

    Conflicts:
    	modules/cuda/test/test_objdetect.cpp
    	modules/gpu/perf/perf_core.cpp
    	modules/gpu/perf/perf_video.cpp
    	modules/gpu/test/test_core.cpp

commit 5db1754d499d21b9dda4a6ad36f98c22db97b994
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Dec 28 16:28:17 2013 +0400

    SSE2 optimization of cv::remap doesn't work with big images

commit 9e13e3a5a41de6d2a410f1d11b8c700400873f4f
Author: Séverin Lemaignan <severin.lemaignan@epfl.ch>
Date:   Sat Dec 28 11:05:00 2013 +0100

    [emscripten] Do not link to system libraries

    This is not meaningful when compiling to javascript, and causes warning
    at linking stage.

commit e33759b358a113ad97dd89779cd3c2bed7e29465
Merge: 1312eca 46be47c
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:52:16 2013 +0400

    Merge commit '46be47cb4b8' into merge-2.4 (-s ours)

commit 1312eca220430cfbc9d6f1aa7f0e472fc5b84974
Merge: 82e2e6d 0566ab4
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:51:46 2013 +0400

    Merge commit '0566ab4d3d' into merge-2.4

    Conflicts:
    	modules/core/src/system.cpp

commit 82e2e6dbc304cd2935052893a53c1e6f0add1d7c
Merge: 7f795e9 7191498
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:50:09 2013 +0400

    Merge commit '719149877e' into merge-2.4 (-s ours)

commit 7f795e964f27bd52dca05f692be4da8be6d3a1a5
Merge: 9dfb963 ee36717
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:49:39 2013 +0400

    Merge commit 'ee36717d' into merge-2.4

commit 9dfb96389c485af9db60c10a45c2ba342a1d979c
Merge: d611509 4b885e2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:48:45 2013 +0400

    Merge commit '4b885e206' into merge-2.4

commit d61150984242938ca836f3a0ea129d946bfc58ec
Merge: 09e154d 709e8e8
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:48:30 2013 +0400

    Merge commit '709e8e8e0' into merge-2.4

commit 09d25e11c65fa20f9ddba1d25ee4f3344ba4e655
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Dec 28 15:09:45 2013 +0400

    fixed bug #3341

commit 09e154d2140d332c63214bf049000233a2516976
Merge: 2cdbf6c 60906d9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:47:05 2013 +0400

    Merge commit '60906d917' into merge-2.4

    Conflicts:
    	modules/ts/src/cuda_perf.cpp

commit 2cdbf6c0b6f260b67be403cfb9c10748c3bd936f
Merge: 39fb8e0 8fe7973
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:41:10 2013 +0400

    Merge commit '8fe79738c' into merge-2.4

commit 39fb8e03d71e2bd90d050ed79d5e21f89d942a18
Merge: ce7a2f7 b94963d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:39:51 2013 +0400

    Merge commit 'b94963d38' into merge-2.4

    Conflicts:
    	cmake/OpenCVGenAndroidMK.cmake

commit ce7a2f7edc024d18b02e51e639542b4d6f01765f
Merge: 0e552ea 24be7b2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:38:52 2013 +0400

    Merge commit '24be7b26c' into merge-2.4 (-s ours)

commit 0e552ea6e2719ad26cd4d51cae929017b3b8bc6f
Merge: 2de4ad0 1acc108
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:37:39 2013 +0400

    Merge commit '1acc1085d' into merge-2.4

commit 2de4ad059834effedb27c78ab0c15f47922013b1
Merge: 9b7e77c edce617
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:37:26 2013 +0400

    Merge commit 'edce617a5' into merge-2.4 (-s ours)

commit 9b7e77ccda7a3d9ab532f9a0c7a62a2c2e9d3896
Merge: 8c58943 83cdd43
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:36:35 2013 +0400

    Merge commit '83cdd43a' into merge-2.4

    Conflicts:
    	modules/core/include/opencv2/core/version.hpp

commit 8c589438d1ae24a8fc0987d7205c73cd6e03c046
Merge: 4a6c2ce f22d9a2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 16:34:59 2013 +0400

    Merge commit 'f22d9a23' into merge-2.4 (-s ours)

commit a0c98dcefa37f45235252584da51491a7c902d61
Merge: 05b9c99 44970dd
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 30 15:34:16 2013 +0400

    Merge pull request #2092 from alalek:fix_mingw_warn

commit 55634c1f52e9bdaadeba6a5a6f836b2bd2666d65
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Mon Dec 30 13:06:32 2013 +0400

    fix

commit 44970ddf560a531f8ce71f9856855b7e2528b4e0
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Mon Dec 30 12:31:00 2013 +0400

    eliminate MINGW pragma warning

commit c4c913ff131b29aed1db47f3378585213682f729
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 29 14:36:30 2013 +0400

    converted CPU-based example to T-API (Mat 2 UMat, etc)

commit 6b64257c811ff63effa95026950d2dca14efd95e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 29 18:46:25 2013 +0400

    added OpenCL version of cv::scaleAdd

commit abcf8d9e610e08227de9cada14868e46a651b8d7
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 29 18:01:01 2013 +0400

    implemented OpenCL version of cv::convertScaleAbs

commit 63e4af85365a7ca004fa588e18429e3ffd468c93
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 29 02:28:43 2013 +0400

    added the first T-API example - CamShift tracking

commit 4a6c2ce3788cc142363733f6a772e4b4c76aedc9
Merge: dbaf125 bb7e963
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Dec 28 22:06:12 2013 +0400

    Merge pull request #2081 from ilya-lavrenov:tapi_perf

commit dbaf125fcd38748730f85a75e12ca1c71f29f606
Merge: 0913dd7 73c96cb
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Dec 28 22:05:49 2013 +0400

    Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels

commit 0913dd7ffacc200d0fbb2d2ff8291a01b17c1882
Merge: 2d2312d 26d53c7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 27 22:38:08 2013 +0400

    Merge pull request #2055 from vbystricky:ocl_sepFilter2D

commit bb7e96311ea9dce813c561c762a82a54403adf4d
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 27 21:57:20 2013 +0400

    disabled cv::split perf test

commit 05b9c991dd6a1309dfa9eda29685eaef43518ac4
Merge: 46be47c 53494ba
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 27 21:09:18 2013 +0400

    Merge pull request #2083 from jet47:gpu_android_tests

commit 46be47cb4b8ad6a86b00d18ee450c28ef7483a1a
Merge: 4eb9b9d df63060
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 27 20:53:42 2013 +0400

    Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix

commit 2d2312d742b80f5c090c059c9fd47a28e30c8d25
Merge: 80816f6 f221f57
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 27 20:23:56 2013 +0400

    Merge pull request #2077 from ilya-lavrenov:tapi_context

commit 31e6251793989177693d081599bd81c28a25a51e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 27 16:33:18 2013 +0400

    added new perf tests to core

commit 4eb9b9d6cfc3caf6d64d7b585ba121d34327af78
Merge: 0566ab4 4175916
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 27 19:58:57 2013 +0400

    Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix

commit 53494ba39730cd3e5d3a22f6c3313b48e4373b31
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Dec 27 18:20:14 2013 +0400

    increase thresholds for some tests

commit 15678efe847d3ec12381d3b2a7fff07bbe243830
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Dec 27 18:20:01 2013 +0400

    disable 2 problematic tests

commit 8399568edfeba41912b87642def96f6e8bc4f838
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Dec 27 18:19:29 2013 +0400

    disabled GEMM test if library was built without CUBLAS

commit 0566ab4d3d0da080897bfd0462a22adb01d51397
Merge: d649f47 d014cb8
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 27 18:17:21 2013 +0400

    Merge pull request #2078 from ilya-lavrenov:warn

commit df63060e4d7c132f26b9601867240eb779534f0c
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Dec 27 16:49:26 2013 +0400

    Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.

commit 4175916b2a5b25789debdb7f79bc14abf039f5de
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Dec 27 17:19:38 2013 +0400

    dynamicuda became private module.

commit 26d53c7435a5828ab694309cda48e46c396e9dad
Author: vbystricky <user@user-pc.(none)>
Date:   Fri Dec 27 16:26:34 2013 +0400

    Change threshold from 2.0 to 1.0 in the test

commit b719ed79c2622c2ada6bf673f721ccbea4985f5d
Author: vbystricky <user@user-pc.(none)>
Date:   Fri Dec 27 16:21:32 2013 +0400

    Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR

commit 80816f68f355a0264f4568e38e90a4ed300887c0
Merge: 5c25d82 07c5e33
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 27 15:49:27 2013 +0400

    Merge pull request #2034 from pentschev:ocl_features2d_orb_master

commit 5c25d821b1df41ef24c48caf52a7d9a4de48cba5
Merge: 01cd957 48c7378
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 27 15:44:11 2013 +0400

    Merge pull request #2063 from vpisarev:ocl_moments

commit 01cd9574952f1a63cc0e31496d9fef77a5421965
Merge: 4644a86 2eab07f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 27 15:38:51 2013 +0400

    Merge pull request #2076 from ilya-lavrenov:tapi_dft

commit d649f47eeb0bc16aae91a7209798920f8caf64cd
Merge: c454923 0ccc903
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 27 15:36:24 2013 +0400

    Merge pull request #2072 from pengx17:patch-3

commit d014cb8fb48982ffec87dad36a40a455896ca88f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 27 14:44:58 2013 +0400

    fixed warning [-Wempty-body]

commit f221f57c7cdf23055f79eb50bd9d4b0b4f42c703
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 27 14:02:03 2013 +0400

    this commit prevents segfaults in case of opencl disabled

commit 73c96cbd50678e87edfc33c0fabade5532b23f19
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 27 13:59:55 2013 +0400

    some fixes of cv::mixChannels

commit 2eab07f0a485461016e6ffd0633875c9c063cdb0
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 27 13:39:29 2013 +0400

    disabled cv::dft opencl impl for CPU devices

commit 52b8bb6761d2e3270bdd9f5a9dea3a00a85914c0
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 27 13:18:31 2013 +0400

    fixed getUMatIndex

commit a7d2830d3fb5f985d4cd0021fff6a85ae746bace
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Dec 26 18:48:43 2013 +0400

    added cv::mixChannels to T-API

commit c45492371a6a85d2ceabff4b73e2bd0acd84d1a1
Merge: 7191498 08d8faf
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 27 12:44:02 2013 +0400

    Merge pull request #2036 from GregoryMorse:patch-1

commit 719149877e2213a2e648695432c317764dc12a0e
Merge: ee36717 c48777a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 27 12:43:49 2013 +0400

    Merge pull request #2074 from asmorkalov:android_nonfree_cuda

commit ee36717db41e24c72859981bbd5efeaf238c09da
Merge: 41fd711 4880858
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 27 12:11:51 2013 +0400

    Merge pull request #2037 from GregoryMorse:patch-2

commit c48777a1c39e66dc38a809047ba8764e3be354b6
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Dec 27 11:18:10 2013 +0400

    CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.

commit a70a8e8680795c32e02137badde5e6985a97244f
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Thu Dec 26 16:46:08 2013 +0400

    CLAHE

commit 0ccc903647955d632b9a9091d8ad989a2cd9b038
Author: Peng Xiao <pengxiao@outlook.com>
Date:   Fri Dec 27 11:54:08 2013 +0800

    fixed a buffer overrun of ocl canny

    the `map` buffer does not have the same size with CUDA and index starts at [1, 1] instead of [0, 0].

commit 07c5e33023596803dbb1a9a5c050de3d1ed6af7a
Author: Peter Andreas Entschev <peter@entschev.com>
Date:   Fri Dec 20 23:04:58 2013 -0200

    OCL: included ORB featured detector/descriptor extractor.

commit 48c7378c8ff01aad14442d06971a68259b4f2e2f
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Thu Dec 26 23:29:04 2013 +0400

    improved performance of moments (on 720p or larger images)

commit 41fd711ab0c41a23a6e2bbc0a8e13e94177067a6
Merge: 4b885e2 4f6f6e8
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 23:07:24 2013 +0400

    Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix

commit 4b885e20677191ac6c285cf0220c8a5a9c544326
Merge: f7b5e65 6ef0253
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 22:41:52 2013 +0400

    Merge pull request #2068 from akarsakov:disable_ipp

commit e97dd57dc79bc1f3c31aa2f30753abc307cccc9e
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Thu Dec 26 22:00:29 2013 +0400

    hopefully fixed test failures and complains from the doc builder

commit 4f6f6e8cacfec0cfac430a63a41a4ed62ee70492
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Dec 26 21:20:32 2013 +0400

    static function qualifier replaced on inline to enable kernel compilation with OpenCL 1.1 embedded profile.

commit 4644a864a5349f4c6b37cb108ba02102312e55d6
Merge: fd6a744 b23edc3
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 20:37:33 2013 +0400

    Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject

commit 6ef0253fb743b9f8d33b5d3ee455614a2020fccf
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date:   Thu Dec 26 19:53:53 2013 +0400

    Disabled some IPP implementation since it breaks tests

commit f7b5e6544fb537e59939328db9c7ad502692a183
Merge: 648facc 734bf8b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 19:38:56 2013 +0400

    Merge pull request #2061 from apavlenko:2.4_fix_build_vs12

commit fd6a74496bf172af03761676f734dcfb0242a778
Merge: a981295 5b3520f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 19:38:01 2013 +0400

    Merge pull request #2066 from ilya-lavrenov:tapi_ocl

commit a981295524d867bd3c97b3f23714bd03a9360e68
Merge: c8a52da ca9810e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 19:20:12 2013 +0400

    Merge pull request #2028 from KonstantinMatskevich:ocl_tapi_morphology

commit b23edc34e9a60917f049ec494431e2850bc262bd
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Dec 26 16:17:06 2013 +0400

    added cv::calcBackProject for 2-dimensional histograms

commit 648facccd687bb1414a12f421ad651ec6b3cf419
Merge: 709e8e8 d6a8839
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Dec 26 17:47:09 2013 +0400

    Merge pull request #2064 from dpen2000:patch-2

commit c8a52daafd43e185ec3a0acdeb63943ab62b601a
Merge: 65b020f 217b228
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 17:27:05 2013 +0400

    Merge pull request #2054 from alalek:ocl_tapi_dev_selection

commit ca9810e8aa10583231722a14d6c8a703bd1bed42
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Thu Dec 26 17:16:55 2013 +0400

    hope last fix

commit 5b3520fa466334649c9e174c98c06e23caf204e0
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Dec 26 17:14:20 2013 +0400

    fixed warning [ -Wreorder ]

commit fc1f9ab236a93261293a05f525ce3903019e10eb
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Dec 26 17:13:26 2013 +0400

    removed unnecessary data copying

commit 709e8e8e079a707b6ddb5ff32ad58ba0024634ea
Merge: 60906d9 cea9a97
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Dec 26 16:59:56 2013 +0400

    Merge pull request #2057 from asmorkalov:android_cuda_sample

commit 734bf8babd1b365401bda9c0ab33ee8cbd780254
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 15:49:12 2013 +0400

    removing legacy stuff

commit 48808581190d3076b579c65498337a1fcfb97b20
Author: GregoryMorse <gregory.morse@live.com>
Date:   Mon Dec 23 00:28:50 2013 +0800

    Update CMakeLists.txt

    WinRT native C++ support allowing building of static libraries

    Update CMakeLists.txt

    Update OpenCVCRTLinkage.cmake

    Update OpenCVCRTLinkage.cmake

commit d64bea00b242ee0b5f5a87d1de476da0d603ba41
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Dec 23 17:37:41 2013 +0400

    ported cv::calcBackProject to T-API

commit cea9a974348a5fc3779b35014b82e538f3459ec7
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Wed Dec 25 17:50:15 2013 +0400

    CUDA support check added.

commit b3eee49451142b82bef43daba0f255e276086aa5
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Mon Dec 23 15:20:09 2013 +0400

    New sample for CUDA on Android added.

commit 60906d9175be2cd465e0fa7ff1e0737a459695b6
Merge: 8fe7973 0206f41
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Dec 26 14:39:51 2013 +0400

    Merge pull request #2060 from asmorkalov:ocv_ts_cuda

commit d6a88397b46baa6662bea6e599564840f869cb40
Author: dpen2000 <davidpendray@gmail.com>
Date:   Thu Dec 26 10:36:24 2013 +0000

    Fix python sample path

commit 8fe79738ced4d917db4b66aacb3f64d963174217
Merge: 86aabf7 e79c875
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Dec 26 14:21:21 2013 +0400

    Merge pull request #2056 from asmorkalov:java_core_cuda_wrappers

commit 86aabf704f453af51db92b6606b066edd8e05456
Merge: b94963d 358e59e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Dec 26 14:16:29 2013 +0400

    Merge pull request #2050 from asmorkalov:android_mk_fix2

commit 3d3b310ae1cc91b4e7cdc93f84fd9016c8e0a273
Author: ytxie <ytxie@mint>
Date:   Thu Dec 26 17:54:05 2013 +0800

    Fix the bug 3440.

commit f9aa148ba9f6b4bb1ad0e9f56014547b3a525bb7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 13:35:59 2013 +0400

    eliminating VS2013 build warnings

commit a760c454ddf36143f25ef63e25898137e37f3e9d
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Thu Dec 26 13:25:00 2013 +0400

    tuned the speed for OpenCL-based moments (still slower than the single-thread SSE2 CPU code :( )

commit 358e59e91b555f686ee3bd2b1dc68433727151c6
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Tue Dec 24 16:36:11 2013 +0400

    Fake dependency from CUDA in case of satic linkage with OpenCV removed.

commit b94963d381ec3ed15e0802be7f00b04507618fd1
Merge: 24be7b2 83fe2f3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Dec 26 12:22:45 2013 +0400

    Merge pull request #2052 from SpecLad:seporate

commit e79c875fe2c656a6a4401115a4f4d24c69dfc0f0
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Wed Dec 25 17:10:50 2013 +0400

    Java wrappers for functions from cv::gpu namespace in core module added.

commit 24be7b26cdf2f90be1ce12117f8ca99ffd2653e7
Merge: 1acc108 1e038e2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Dec 26 12:07:00 2013 +0400

    Merge pull request #2049 from asmorkalov:android_cuda_warning_fix

commit 0206f419c1b8d78d99ec1a2fcc3b94054d492e88
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Dec 26 11:36:00 2013 +0400

    ts dependency from CUDA runtime removed. All implicit CUDA calls replaced by calls from core module.

commit 52df2b346ba8e941231623af74460a2bcefd8a35
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Thu Dec 26 10:45:09 2013 +0400

    not synchronous kernel's run

commit 1e038e2837afe4d28965900023bf396ef4252bc4
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Tue Dec 24 12:23:50 2013 +0400

    CUDA warning fix/supporession for Android.

commit 4aa9f83100e93b2350242acd06c517db0259b49b
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Dec 26 10:16:29 2013 +0400

    Dynamic CUDA support library name fixed. Additional error messages added.

commit 7a186c72e133272231665fd079ba150041d6679f
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Mon Dec 23 12:27:39 2013 +0400

    some fixes

commit f55c85fed38bb117f83c8b50c084d0305b6b4e06
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Dec 18 09:37:57 2013 +0400

    morphology

commit 217b2282b86b020841641c220db8eb2a42029707
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Wed Dec 25 18:41:24 2013 +0400

    fixes

commit 83f749afd239dcac8fa75bdeaa6b9648a1d7edb2
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Thu Dec 26 02:57:08 2013 +0400

    moments work now and work more or less fast

commit 65b020f0d352bf04ca595774a7986449258685b9
Merge: 6e8386f 4c23059
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 00:14:23 2013 +0400

    Merge pull request #2046 from ilya-lavrenov:tapi_inrange

commit 6e8386f70548b872232f67169b314bd7bc07b630
Merge: 1aaeea9 d7c2234
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 00:13:28 2013 +0400

    Merge pull request #1984 from ilya-lavrenov:tapi_perf

commit 1aaeea99413e38d64d0df79716fa54682af0c326
Merge: 512ddcc 9d04a7a
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 26 00:05:13 2013 +0400

    Merge pull request #2053 from KonstantinMatskevich:ocl_bugfix_eqhist

commit 6035925f416bd5e1384ab5ac1f4969323438529c
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Wed Dec 25 21:09:23 2013 +0400

    experimental moments implementation (does not work yet)

commit 1acc1085d2000e2618464de10fa423dc2fedb65c
Merge: 1e27b07 92fc763
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Dec 25 19:36:49 2013 +0400

    Merge pull request #2017 from pemmanuelviel:flannMemoryLeak

commit 512ddcc80407d85b07239159925080c07032f86c
Merge: 9ec4c20 a70467d
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 25 19:00:25 2013 +0400

    Merge pull request #2043 from ilya-lavrenov:tapi_hack

commit 9ec4c2028018010ff6d045279b97ff30a0245c80
Merge: faddd5b bc73029
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 25 19:00:06 2013 +0400

    Merge pull request #2042 from vpisarev:ocl_facedetect8

commit 4c23059209edf4b115844c7034d2a2e8f7d4c340
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Dec 23 19:37:59 2013 +0400

    added cv::inRange to T-API

commit d7c22343aa23bec266bc8658629f3c886a91801d
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 13 19:35:30 2013 +0400

    added perf tests for T-API core functions

commit 9e05d18d4273181357ee487199a67bcb0f4c3d09
Author: vbystricky <user@user-pc.(none)>
Date:   Wed Dec 25 18:05:07 2013 +0400

    Fix compilation warnings

commit 35dc26e0b9e7e12b4d9abd3041496b5d872b7ccc
Author: vbystricky <user@user-pc.(none)>
Date:   Wed Dec 25 15:39:30 2013 +0400

    Add ocl implementation of the sepFilter2D into img_proc module.

commit faddd5b97ff078d1aa9dfa42a6d4018498dc22c4
Merge: 0966e5f 3c4b24d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Dec 25 16:18:00 2013 +0400

    Merge pull request #2045 from SpecLad:merge-2.4

commit e49065b1dcef46fdaf9f1ae79fddccfbb706a8b1
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Wed Dec 25 14:39:21 2013 +0400

    core/ocl: temporary move device selection from ocl module

commit 9d04a7aba9dbab0823b936958303edcc7b5e657c
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Wed Dec 25 15:02:56 2013 +0400

    bugfix in equalizeHist

commit 83fe2f3b16b00678743c01b3af02b606dd6f8fad
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Dec 25 14:04:44 2013 +0400

    Fixed the seporate/seporator typo everywhere.

commit 1e27b07e29545a9796c4e15ce1ca71f6d8a002e3
Merge: edce617 4293a54
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Dec 25 13:14:13 2013 +0400

    Merge pull request #2051 from AlexWillisson:patch-2

commit 4293a54447614cd2b535f9f9672bd1b4bafc4780
Author: Alex Willisson <atw@mit.edu>
Date:   Tue Dec 24 19:53:50 2013 -0500

    Fixed typo in comment

commit 928924d24838b6bd89d294343c96793f2dcc02fe
Merge: a032d94 0966e5f
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Mon Dec 23 19:47:06 2013 +0100

    Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl

commit a70467d7a28d642fb4862a5b989a5361a0e2e6fa
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Dec 23 15:49:45 2013 +0400

    removed unnecessary assert

commit bc730292bb799ac1d78d63467c89deb413536f39
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Dec 23 21:29:31 2013 +0400

    workaround for some strange bug on old Mac.

commit 0966e5ffa16f515f3156408c5c19e8c1ec075fa1
Merge: 6a2fb8e e3d2391
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Dec 23 19:19:00 2013 +0400

    Merge pull request #2033 from ilya-lavrenov:tapi_normalize

commit e3d23918fad00ef9e6fe2bbf3b7adf8f6074b822
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 20 20:10:43 2013 +0400

    added cv::normalize to T-API; implemented missed UMat::copyTo with mask

commit 6a2fb8e5d1b5bbb44e1e4b3f414c8c8e43187207
Merge: 06e981f febb200
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Dec 23 19:09:59 2013 +0400

    Merge pull request #2041 from ilya-lavrenov:tapi_mul_div

commit 3c4b24d531663f42654c180f5fa0045b44be3486
Merge: b29835a f9268d3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 23 18:50:17 2013 +0400

    Merge remote-tracking branch 'origin/2.4' into merge-2.4

    Conflicts:
    	CMakeLists.txt
    	modules/highgui/src/cap.cpp
    	modules/nonfree/src/surf.ocl.cpp
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	modules/ocl/src/color.cpp
    	modules/ocl/src/gftt.cpp
    	modules/ocl/src/imgproc.cpp
    	samples/ocl/facedetect.cpp

commit 8998186ce416fb02322c26445bb3d59bafafadc3
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Dec 23 18:41:54 2013 +0400

    removed extra whitespaces and hopefully fixed the test failures

commit edce617a58574abd4fee98e1d324aca029ab3e99
Merge: 83cdd43 51d3138
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 23 18:02:18 2013 +0400

    Merge pull request #2040 from asmorkalov:android_mk_fix

commit 51d3138dff09604f289d9f670d982b86d3a69a2b
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Mon Dec 23 14:42:00 2013 +0400

    OCV option ENABLE_DYNAMIC_CUDA mistake fix.

commit 83cdd43a4ca75d7a86992d2962c6677629d736e1
Merge: f22d9a2 4ec1930
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 23 15:53:11 2013 +0400

    Merge pull request #2039 from asmorkalov:ocv_version_inc3

commit d084d19779fec1668ab2aefe34d228d854782601
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Dec 23 15:28:50 2013 +0400

    added OpenCL optimization for LBP-based face detector

commit 06e981f1ce4291e8470f5df52fc76f351aa42fe2
Merge: b29835a 6083efc
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Dec 23 13:00:22 2013 +0400

    Merge pull request #2035 from ilya-lavrenov:tapi_CamShift

commit 58e7d9f32f21db592624fb4cf8c26d8ef8ab212c
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Mon Dec 23 12:33:49 2013 +0400

    OpenCV.mk fixed for accurate CUDA support.

commit f22d9a232dfa84c12533945d7eaa71eafce86bf0
Merge: f9268d3 bc72f4d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 23 12:45:49 2013 +0400

    Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda

commit 4ec193094905a903f5a80e2f5c51688304c1a1c9
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Mon Dec 23 11:31:41 2013 +0400

    OpenCV version++; OpenCV Manager version++.

commit bc72f4d2a2bb75af19edeb6bf5ed0128b891a2cd
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Dec 20 16:32:34 2013 +0400

    Code review fixes.

commit 08d8faf9daf2647d3701ac2807ded394d6308cb0
Author: GregoryMorse <gregory.morse@live.com>
Date:   Mon Dec 23 00:21:51 2013 +0800

    Update system.cpp

    Add native C++ support

commit febb200eee44af4bd24f21ca11a2ddf427cc8694
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 22 15:07:24 2013 +0400

    fixed cv::multuply, cv::divide

commit 6083efc111ae8016500d3a1ad12c98ab768b270c
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Dec 21 14:36:50 2013 +0400

    refactored cv::CamShift and cv::meanShift

commit f9268d34dca0913d789719e6dac96bbdf2de6fbc
Merge: 6e22be4 e8dd31a
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Dec 21 12:44:05 2013 +0400

    Merge pull request #2023 from krodyush:pullreq/2.4-opt-131126-cvt

commit b29835a8f8feca1a62609a0c900da379e42cddd0
Merge: a49211a 9c22d48
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 20 21:39:10 2013 +0400

    Merge pull request #2030 from LeszekSwirski:fix-imgproc-ipp

commit a49211a77e188654ba7111ea1d890da1ed5364a8
Merge: 1478219 c33a7cd
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 20 21:38:14 2013 +0400

    Merge pull request #2032 from ilya-lavrenov:tapi_mulSpectrums

commit c33a7cd7bff6d5321b499a53ff27742429c696f1
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 20 18:39:57 2013 +0400

    added cv::mulSpectrums to T-API

commit 15409105422e8622b3a996e89ec3cbf0e5ff5b4e
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Fri Dec 20 18:39:35 2013 +0400

    started adding OpenCL acceleration of LBP-based object detectors

commit 2bb3de5aa0d53147ac61e7c0b78cade15892ef85
Author: berak <px1704@web.de>
Date:   Fri Dec 20 14:58:21 2013 +0100

    core/utility.hpp missing in flann/timer.h

commit 14782194f482ca51b42f6b7964029abf3a79342f
Merge: b0ec7da febe528
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 20 17:57:09 2013 +0400

    Merge pull request #1995 from akarsakov:ocl_pyramids

commit b0ec7dafd8e3ef5c22e40a41dbffdc58bb443a07
Merge: b4bd5ba 68d8f64
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 20 17:54:01 2013 +0400

    Merge pull request #1950 from GregoryMorse:patch-2

commit 6e22be41009c5db0f717c3b9dd45eb0c5e10503b
Merge: ce07840 d6a7e8f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 20 17:06:27 2013 +0400

    Merge pull request #2003 from vbystricky:intelperc_camera_2.4

commit ce07840e9f39da268efcf38540f484b837b68399
Merge: 6b7d890 9941c67
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 20 17:04:17 2013 +0400

    Merge pull request #1966 from asmorkalov:ocv_neon_support

commit 6b7d890f34a59d6558866b00fc96fd514b487683
Merge: b633c73 fffac2f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 20 16:50:00 2013 +0400

    Merge pull request #2014 from krodyush:pullreq/2.4-opt-131211-surf

commit 9c22d4887c945a1e2fb70b3ef22cfd51eb745436
Author: Leszek Swirski <leszek@swirski.co.uk>
Date:   Fri Dec 20 12:38:31 2013 +0000

    imgproc: IPP compilation fix and minor cleanup

commit 9941c6710da481029f5dc7add24dfe319e014e02
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Tue Dec 10 11:22:29 2013 +0400

    NEON instruction set control unified for regular and cross-compiler builds.

commit a032d947b4d6701ed9cf967ffe022525a753d1b4
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Fri Dec 20 11:45:07 2013 +0100

    Fixed doc

commit 9b0a9f2a24daa9fac061766418f459e628cc7131
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Fri Dec 20 10:56:27 2013 +0100

    moved documentation of BriefDescriptorExtractor to correct place

commit 6e4715309b37449b82fd2294d118ba33e10cd2de
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Fri Dec 20 10:53:21 2013 +0100

    added documentation

commit e8dd31aacd08c9d1754871068aa5f708246c7c96
Author: krodyush <konstantin.rodyushkin@intel.com>
Date:   Fri Dec 20 13:51:51 2013 +0400

    change code according reviewer suggesions

commit d6a7e8f84fd5ac745af2589a573b011b82a69345
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Fri Dec 20 12:33:39 2013 +0400

    Remove TBB ifdef form code

commit b4bd5bab6da1ffd8fb1da564455bdf2c1f739579
Merge: cdffa05 242a3d1
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 20 12:30:46 2013 +0400

    Merge pull request #2021 from vpisarev:ocl_facedetect7

commit b633c73c46216b2993a7cf89fbecf38a444b2132
Merge: 26f5d2d 12c25b9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 20 11:57:29 2013 +0400

    Merge pull request #1994 from StevenPuttemans:bugfix_3431

commit 529bd41751e526604726ccc9bff68a448693a3be
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Dec 20 09:46:03 2013 +0400

    Build fixes for case where HAVE_CUDA==OFF.

commit 74dfa668e2f358c677bd48af2ee76f079bf22def
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Fri Dec 20 00:05:50 2013 +0100

    added tests

commit 27c1bd27624f0a9c248cd05d6779cc6859d86892
Author: krodyush <konstantin.rodyushkin@intel.com>
Date:   Thu Dec 19 22:56:46 2013 +0400

    Improve ocl cvt_color performance for the following conversions: RGB<->BGR, RGB->Gray, RGB<->XYZ, RGB<->YCrCb, RGB<->YUV, and mRGBA<->RGBA.
    The improvement was done basically by processing more than 1 pixel by each work-item and using vector's operations.
    new performance tests were added

commit cdffa05c27df552065a02d61e3e3d59d65ec581e
Merge: dde1d6b b3af0e3
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 19 19:28:57 2013 +0400

    Merge pull request #2019 from ilya-lavrenov:tapi_repeat

commit 069f3d8d9a1b5c500e56d4547cf42105542efb62
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Dec 19 18:36:02 2013 +0400

    Build fixes for GPU module.

commit 2509fa8080962256e31b178e67d1b404341eb537
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Dec 19 18:02:59 2013 +0400

    Warious fixes for case where HAVE_CUDA==OFF.

commit 5a5c82bb1d395aeb76bd76f14a1db22742c02599
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Dec 19 17:41:04 2013 +0400

    Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring.

commit febe528363bf158500c4ef355927934822d530d1
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date:   Mon Dec 16 12:55:14 2013 +0400

    Added ocl::pyrUp to T-API

commit 26f5d2d63979e06638409783d222e8d4f5e08f22
Merge: b674cd8 eb7ff99
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 19 17:08:52 2013 +0400

    Merge pull request #1765 from ilya-lavrenov:cv_remap

commit 242a3d1f192c986e3ffd6b23c8202e136159d67d
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Thu Dec 19 16:57:02 2013 +0400

    2 more fixes to calm down the doc builder

commit dde1d6b636bed44524e58a57077d20cc579cbba5
Merge: 2431c72 c8cbfe5
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 19 16:47:18 2013 +0400

    Merge pull request #2018 from ilya-lavrenov:tapi_dft

commit b674cd8571acddc1e801cba56b7f40a56fc200d8
Merge: 8c91a1a 917b883
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 19 16:46:58 2013 +0400

    Merge pull request #2007 from krodyush:pullreq/2.4-opt-131202-haar

commit 8c91a1af71473b04ea0074d29dda1032c7a4f8fb
Merge: 22a3cf0 de43160
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 19 16:46:40 2013 +0400

    Merge pull request #2005 from krodyush:pullreq/2.4-opt-131114-extractCovData

commit 037ffcdf99a821a5a8a3ea7a60b801244fbb93d9
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Dec 19 16:42:11 2013 +0400

    Dynamic CUDA support library reimplemented as OpenCV module.

commit f41f633d2d6ffa42fd9bd5e82a21156b07c3da6f
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Thu Dec 19 16:31:30 2013 +0400

    fixed various warnings from the “doc” and other builders

commit 22a3cf0fbabc00ccb3f51d446ca56d2792d50e88
Merge: 0cea828 f3ee1c3
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 19 16:14:42 2013 +0400

    Merge pull request #2008 from krodyush:pullreq/2.4-opt-131209-hog

commit a1784b7320063c381fc420ec4eeef1611769dd31
Merge: 2431c72 ec3f22c
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Thu Dec 19 14:48:42 2013 +0400

    converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case.

commit ec3f22cee2a4c126492776b05750a1532e541c19
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Thu Dec 19 14:29:28 2013 +0400

    renamed OpenCL kernel filename; made some final changes

commit b3af0e3154f04ce4fdf38100b32723b1e1498e40
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Dec 19 14:27:21 2013 +0400

    added cv::repeat to T-API

commit b7553d4e2eddc5645023a94a850fe092dd9f223e
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Thu Dec 19 14:09:44 2013 +0400

    some attempts to tune the performance

commit ac230cd2aee15dc16c96f58ca29760ec4ef6eae3
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date:   Mon Dec 9 17:14:20 2013 +0400

    Added ocl::pyrDown to T-API

commit 0cea828a10cd752564654f831af5f4af3a171a90
Merge: bc741ab ea0c9b7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 19 13:48:39 2013 +0400

    Merge pull request #2006 from krodyush:pullreq/2.4-opt-131120-gfft

commit c8cbfe53829b0bcfa5d3dac94067fe718a14b2d1
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Dec 17 17:36:26 2013 +0400

    added cv::dft T-API test

commit bc741ab25fdffc83e36530558fd12ddc863afd05
Merge: 459e7d4 1ae71fe
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 19 13:38:52 2013 +0400

    Merge pull request #2009 from krodyush:pullreq/2.4-opt-131211-sepFilterSinglePass_final

commit 64c94cb22c382aa3b9377d6d94648b91159a8744
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Dec 19 11:18:04 2013 +0400

    CUDA related func tables refactored to remove unneeded dependencies.

commit d449ba104a068c92a931a68d782245bbcb92af6c
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Thu Dec 19 10:29:19 2013 +0400

    Fix comment in the cmake file from SSDK to SDK

commit 6da7c50fb53edd291d709a06aad0b46c1311aac2
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Dec 19 10:27:38 2013 +0400

    Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.

commit 442082eb0ff51353953c605899d61f1f7fb089eb
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Dec 19 09:38:46 2013 +0400

    Fixes for Android support.

commit 545f02679af39da9edc377ec5d79659498f76ab9
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Thu Dec 19 01:54:57 2013 +0100

    Optimized version. Faster than CPU

commit 69d034ecdfcbbb906dad33a8d4841e7a6adfe7da
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Thu Dec 19 00:15:53 2013 +0100

    Naive impl. Slower than CPU

commit 92fc763925b0941092dc6287e08f9fd774e585ca
Author: Pierre-Emmanuel Viel <p.emmanuel.viel@gmail.com>
Date:   Wed Dec 18 15:01:47 2013 +0100

    Fix some memory leaks in HierarchicalClusteringIndex

commit 2431c72d1debf04728f49ab499765344f3adb4f0
Merge: 59cab94 96f8ff2
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 18 19:35:04 2013 +0400

    Merge pull request #2000 from apavlenko:license_copyright

commit 96f8ff2ab8d37f362f90e10d05e3c6039c51e92b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 18 19:33:25 2013 +0400

    adding LICENSE file and a sample of its reference in ocl.hpp

commit 459e7d4a80854cd0217c376633ca78dc7b915c15
Merge: 400fea8 a9687a3
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 18 19:13:22 2013 +0400

    Merge pull request #2015 from apavlenko:2.4_fix_ts_rng-fill

commit 400fea86267c36768b1d44afdf6ebd2326febcd1
Merge: ae9d24d 3a6d248
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Dec 18 17:36:18 2013 +0400

    Merge pull request #2011 from ilya-lavrenov:dft_dct

commit a9687a341e63f969c01ee0ce74139c1a9dab2178
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 18 17:27:39 2013 +0400

    adding more than 4 channels random Mats support

    if `Scalar:all` is used, Mats with 5+ channels cause errors

commit ae9d24d433b9a1949dfa324de301d69e6992328a
Merge: 5d5527d 8c60498
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 18 17:05:17 2013 +0400

    Merge pull request #2013 from apavlenko:2.4_fd_sample

commit 8c6049867394da89e0b5ed3dd5dc98187a87a2b6
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 18 17:02:39 2013 +0400

    adding timing for multi-threaded case

commit 1ae71fe205856d47c22c6e5b5f3aadebcee3504f
Author: krodyush <konstantin.rodyushkin@intel.com>
Date:   Wed Dec 18 14:27:51 2013 +0400

    intel device guard was added because of perf degradation on some non intel platform.

commit 59cab94fc7a43ad3a39414232fd34d23815b8547
Merge: 388d0ef 9cb31e8
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 18 13:53:17 2013 +0400

    Merge pull request #1997 from alalek:tapi_fix_memleaks

commit 388d0ef1826df67bc79ea302dd1220a51725d40e
Merge: bd91b39 ac030c1
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 18 13:46:14 2013 +0400

    Merge pull request #2004 from ilya-lavrenov:tapi_umat_copyto

commit be530bd0856c623688e2f2d5842ea171b2afacc1
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Wed Dec 18 12:02:15 2013 +0400

    DeviceInfo class method that were implemented in header moved to cpp file.

commit 80d0593dbd62f9a2349a15f488f2b17547521534
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Wed Dec 18 11:46:52 2013 +0400

    Delete end comma in enumerations

commit 66145ea06c68e427b19d3d0c2ae0103c96c333fe
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Wed Dec 18 10:55:09 2013 +0400

    Add CV_CAP_INTELPERC and CV_CAP_PROP_INTELPERC_ prefixes to const_ignore_list

commit dd71bef6f599b1a6130eb9bdfb9ba4a707ca65d4
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Wed Dec 18 09:59:24 2013 +0400

    Fix errors in example (samples/cpp/intelperc_capture.cpp)

commit e719bee2b80639d09acafac9551fc20e9f082d2c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 18 00:15:02 2013 +0400

    minor refactoring, no functional changes

commit 02fb3f0a774313a4008e9a660a05d44b81d26afd
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Dec 17 20:55:49 2013 +0400

    it finally works!!!

commit 63ae0eeba592e8855dd602ae9b1b406e48374645
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Tue Dec 17 18:39:52 2013 +0400

    Fix build errors

commit 34c630faf4b88f7dafd23a8c1675867bd7bb8d78
Author: krodyush <konstantin.rodyushkin@intel.com>
Date:   Tue Dec 17 17:46:09 2013 +0400

    update doc to be consisted with headers

commit 3a6d248bee93df66fc92c593d8a6ba6cc0214c95
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Dec 17 17:41:28 2013 +0400

    typo

commit ea0c9b7f5c6fec72b46cf82f92cf303c0f3a20d8
Author: krodyush <konstantin.rodyushkin@intel.com>
Date:   Tue Dec 17 17:12:57 2013 +0400

    GFFT fix for linux build

commit bd91b39593696ed570995e95804311645b0f56ae
Merge: 586a5cb 11b9d5b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 17 16:44:26 2013 +0400

    Merge pull request #1917 from alalek:ocl_d3d

commit 586a5cb6db446d22b248e0f796e8f5032494419c
Merge: 6a0fb2c 5cf4166
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 17 16:42:44 2013 +0400

    Merge pull request #1969 from KonstantinMatskevich:ocl_tapi_minmaxloc

commit 6a0fb2c7dab5141e96bc69b0b13883a1e94e3842
Merge: d3fa2bf d9d4678
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 17 16:42:16 2013 +0400

    Merge pull request #1992 from ElenaGvozdeva:ocl_medianFilter

commit d3fa2bfe8cb6d4d032c37a7040f6074fc3884b50
Merge: 6d77cbe 2f34bb9
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 17 16:41:58 2013 +0400

    Merge pull request #1998 from ilya-lavrenov:tapi_gemm

commit cc08e00876b91ad626b60d88bee5aa3441ed546b
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Tue Dec 17 16:13:55 2013 +0400

    Fix notes about cmake files. Fix build warning.

commit ac030c16f1bc36c53322c867509e4b7b2c56296a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Dec 17 14:14:04 2013 +0400

    fixed UMat::copyTo(UMat)

commit ef509ace43a942aee4678df9834e873e7bbcb328
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Dec 17 14:51:22 2013 +0400

    trying to debug the new cascade

commit 9d3e7e027aa24039bff387188373eac21254e2eb
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Dec 17 14:29:30 2013 +0400

    almost finished opencl-ization of cascade classifier

commit fffac2f0859dcd526c5fa2f8999b3477d5463a75
Author: krodyush <konstantin.rodyushkin@intel.com>
Date:   Tue Dec 17 14:12:33 2013 +0400

    optimize SURF by
    Inlining and customizing sampling functions to reduce memory traffic and compute
    Improve calcOrientation implementation.
    Using more efficient rounding routines.
    Removing unnecessary use of local memory

commit 6d77cbee7ee5c5683570299ce6183f67b4710d0b
Merge: e49b8de 268d814
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 17 14:11:50 2013 +0400

    Merge pull request #1934 from vbystricky:ocl_boxFilter

commit dfe7c98090402018318d86b9059cbe63a831df53
Author: krodyush <konstantin.rodyushkin@intel.com>
Date:   Tue Dec 17 14:09:06 2013 +0400

    optimize separable filter by
    Added "sep_filter_singlepass" kernel that performs separable filtering in one kernel call
    Added appropriate host part - sepFilter2D_SinglePass function and SingleStepSeparableFilterEngine_GPU class
    Changed function declarations to enable their usage

commit f3ee1c3d2fb11c10acabfd2b4993fca6dbe50f71
Author: krodyush <konstantin.rodyushkin@intel.com>
Date:   Tue Dec 17 14:06:14 2013 +0400

    Changes the datatype of the angle of the gradient for Intel platforms.

commit 917b883cf0d703c8e5ce3bb17df7755cf4a291f3
Author: krodyush <konstantin.rodyushkin@intel.com>
Date:   Tue Dec 17 14:04:10 2013 +0400

    remove extra calculations from haar to be consistent with native implementation

commit a63576e76d43a57524307a817079f5a87b7460b8
Author: krodyush <konstantin.rodyushkin@intel.com>
Date:   Tue Dec 17 14:02:57 2013 +0400

    HOST side optimization for GFFT

commit de431609db6444aa39ffde0e82966b4fbd3182e8
Author: krodyush <konstantin.rodyushkin@intel.com>
Date:   Tue Dec 17 14:01:01 2013 +0400

    optimize Dx and Dy calcualtion to make it as single opencl kernel

commit e49b8dee404bcb7f78ed962fadbd85530a86960d
Merge: 52a785e 6f3163f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 17 13:53:59 2013 +0400

    Merge pull request #1881 from pentschev:defaultNorm_master

commit 52a785e95a30d9336bfbac97a0a0d0089ffaa7de
Merge: 0cf7607 f2befa0
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 17 13:21:47 2013 +0400

    Merge pull request #1996 from SpecLad:merge-2.4

commit 0cf76073384f50f2835cb5363bb228eb5d6ab2b7
Merge: 11071dd e4b41d3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 17 13:19:59 2013 +0400

    Merge pull request #1993 from StevenPuttemans:feature_2862

commit 5d5527d03eb4d84911d688fa97c6fa71457e29da
Merge: e88253c f44de30
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 17 13:17:25 2013 +0400

    Merge pull request #1987 from pentschev:cv_completesymm_template_2.4

commit 5cf4166801fe97f9ff12d8041833b2aba52c912a
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Tue Dec 17 12:42:38 2013 +0400

    some fixes

commit 904dac7670b8f6f1ff6dac9df70cd9fc091b5557
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Thu Dec 5 16:34:23 2013 +0400

    minMaxLoc

commit 4088013251e9e30fe43b57d41a63bce08f967030
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Tue Dec 17 12:00:40 2013 +0400

    Add set/get depth generator properties by default. Add documentation

commit 6ae16ebec37d649d8eb712cdf4adca2e87bc599d
Author: Adrien BAK <adrien.bak@gmail.com>
Date:   Tue Dec 17 16:51:33 2013 +0900

    update doc accordingly

commit d9d4678599763d40fd7eee779ff36466b26143df
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Tue Dec 17 11:15:48 2013 +0400

    Fixed condition for channels

commit 125d67130bc99a9c04f5f6f8aecf8af7fda7f091
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Tue Dec 17 11:04:54 2013 +0400

    Fixed medianFilter

commit 88a883e68ee9ab379118a1c68aa14ebaa24d8afd
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Tue Dec 17 10:24:00 2013 +0400

    Build fix.

commit c5c3fd44436a0d2e8eb864f568ac6b303c9837da
Author: Adrien BAK <adrien.bak@gmail.com>
Date:   Tue Dec 17 14:53:44 2013 +0900

    modify signature of stereoCalibrate for consistency

commit 2f34bb9aa0c24c08302e168a15dfa0a6ec4933cc
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Dec 14 23:16:53 2013 +0400

    added cv::gemm to T-API

commit f2befa01f4b1b000e8232ccbfe32acbea16672a1
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 16 15:02:42 2013 +0400

    Fixed build for the TLS-related stuff.

commit 8fe4e98b8adb3e64a58c45d0ecec5e90905488d7
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Mon Dec 16 18:06:11 2013 +0400

    Fixed trailing whitespace

commit 9cb31e86ae538c01fa1e6452b49cad08993ed38a
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Mon Dec 16 16:46:36 2013 +0400

    umat: fix memory leaks

commit 9d8d70d6cad689b6b2bb8ed679678bf68f4174e0
Merge: 172a5d4 e88253c
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 16 15:02:12 2013 +0400

    Merge remote-tracking branch 'origin/2.4' into merge-2.4

    Conflicts:
    	doc/tutorials/definitions/tocDefinitions.rst
    	modules/core/include/opencv2/core/core.hpp
    	modules/core/src/system.cpp
    	modules/features2d/src/freak.cpp
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	modules/ocl/src/cl_context.cpp
    	modules/ocl/test/test_api.cpp

commit 8660e048bc12c348ccfc17d42e97ea7af3aa34b0
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Dec 13 17:28:29 2013 +0400

    Dynamic CUDA support library loading implemented for Linux.

    Logical mistake in macro fixed;
    DeviceInfo deligate reimplemented;
    Build and warning fixes.

commit d4087f19a2aa38c00b101b01d06c60dc70edf5d0
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Wed Dec 11 16:38:30 2013 +0400

    All CUDA related stuff were moved to separate dynamic library.

commit 12c25b93108c255cffc3d243406b75656d29095d
Author: StevenPuttemans <steven.puttemans@kuleuven.be>
Date:   Mon Dec 16 11:05:53 2013 +0100

    Fixed suggestion of bugfix 3431
    Seems correct to me and builds fine

commit e4b41d38f12effe118c7e30a1a94d56150cabd55
Author: StevenPuttemans <steven.puttemans@kuleuven.be>
Date:   Mon Dec 16 10:47:24 2013 +0100

    Fixed descripotorsCount to descriptorsCount
    See feature 2862

commit b2d8b491c06887fe715c1266f4483ae7a2b4c09a
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Mon Dec 9 10:34:32 2013 +0400

    Added ocl_medianFilter using Transparent API

commit 11071dd2412879e1ffa4e7ff0e54d223631caa52
Merge: 172a5d4 558c4a2
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Dec 16 13:04:21 2013 +0400

    Merge pull request #1988 from ilya-lavrenov:tapi_umat_convertTo

commit e88253ccad7ed8b52538e1be41ea25d649677171
Merge: 10849d1 b7c97f6
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 16 12:11:43 2013 +0400

    Merge pull request #1990 from AD-530:Issue3164

commit f44de302a00a8d29be61c9b4e5ef41f5c3279f31
Author: Peter Andreas Entschev <peter@entschev.com>
Date:   Sat Dec 14 22:48:01 2013 -0200

    cv::completeSymm fixed to work with any OpenCV data type and multiple channels.

commit b7c97f6e305226578a5fa2c3deb924591f09dd66
Author: Matthias Bady <aegirxx@gmail.com>
Date:   Sun Dec 15 22:41:07 2013 +0100

    fixed init of clCxt

commit 558c4a2b1dfc2ef39afd0fc98494e9c0a87c461f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 15 14:00:24 2013 +0400

    implemented UMat::convertTo

commit 172a5d42a90daeba861b6b73a7b7804f18112271
Merge: c9ed05c 5c0dabf
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 13 19:47:33 2013 +0400

    Merge pull request #1974 from ilya-lavrenov:tapi_equalizehist

commit 5c0dabf1ea5f6d969b9301bfdb5cc3880d75bdfb
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Dec 12 23:42:54 2013 +0400

    added cv::equalizeHist to T-API

commit c9ed05c3bd98799225589a8c0972f0deda62c625
Merge: 8e15a6f 1d6715e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 13 19:34:28 2013 +0400

    Merge pull request #1981 from ilya-lavrenov:tapi_sqrt

commit 8e15a6f98dbce59b68ceaac72626f7faf1ab4796
Merge: b43d6b6 e30875b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 13 19:29:49 2013 +0400

    Merge pull request #1983 from ilya-lavrenov:tapi_umat

commit 11b9d5bf4d68a9e00680f376662743236f3828c5
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Mon Dec 2 01:50:24 2013 +0400

    core: added DirectX interop implementation (OpenCL) with samples

commit e30875bcef0a7738463fcb717c6fc1c96ae14d8b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 13 17:59:53 2013 +0400

    fixed UMat sync problems

commit e8d2a9752b7f6671386c10cf3af0006951b23dfc
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Fri Dec 13 17:25:16 2013 +0400

    Add support Creative Senz3D camera by Intel Perceptual Computing SDK

commit 10849d1c7a781986ec1ebbfcf06355516238ed4e
Merge: 658282f 17ca7f9
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 13 16:09:08 2013 +0400

    Merge pull request #1980 from alalek:ocl_interop_initialization

commit cc69d4631a88614629b7cb3697e6958349d3514d
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Nov 28 17:42:40 2013 +0400

    cmake: detect Direct 3D 11

commit d8513d627d68b9fad757606923b627c56f5f2b04
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Thu Dec 12 21:58:42 2013 +0400

    continue adding OpenCL optimization to cascade classifier

commit 17ca7f95458fe1ae9c84e63d1c851e65949ce63d
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Dec 12 19:59:22 2013 +0400

    ocl: add support for initialization from user-provided OpenCL handles

commit 1d6715e58a8a8ce69db17ead4623e34677ec3f5e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Dec 12 18:01:30 2013 +0400

    added cv::sqrt to T-API (using built-in sqrt OpenCL function)

commit b43d6b68587bb222bb3e98ffd1b2b205cc9d93be
Merge: 5299b13 41bec1b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 12 17:37:09 2013 +0400

    Merge pull request #1954 from pentschev:ocl_features2d_fast_master

commit 5299b13434b2ff3e2679abed1c79367f84c497b6
Merge: b0a9220 5bc9f15
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 12 17:35:01 2013 +0400

    Merge pull request #1979 from pentschev:ocl_arithm_sqrt_master

commit b0a9220de809547d1a4a2ee6dadfecaffcf86b02
Merge: ac1c6da 3bbf51f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 12 17:27:33 2013 +0400

    Merge pull request #1889 from alalek:ocl_core_dynamic_runtime

commit 5bc9f15dda83d1974aff629c8070498e6a302490
Author: Peter Andreas Entschev <peter@entschev.com>
Date:   Wed Dec 11 22:58:05 2013 -0200

    OCL: included sqrt matrix operation.

commit ac1c6dac935886e79b5c7d35d2bc3a51f328f251
Merge: f3e2bfe b20714a
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 12 09:55:49 2013 +0400

    Merge pull request #1978 from ilya-lavrenov:ocl_min_max

commit 658282fcbef94f6d32d46ba53408cba2d49b53f9
Merge: ee270d1 740b1f2
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 12 09:55:33 2013 +0400

    Merge pull request #1976 from alalek:ocl_multiple_command_queues

commit 41bec1b11210fc835537171efceba064795236c8
Author: Peter Andreas Entschev <peter@entschev.com>
Date:   Sat Dec 7 22:12:13 2013 -0200

    OCL: including FAST feature detector.

commit b20714a8a84523efc3cca21b56d9e8f643c5f9f2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Dec 12 02:42:24 2013 +0400

    fixed kernel compilation of cv::min, cv::max for CV_64F

commit f3e2bfea7917ebcb70cd1c63dc379c4d1c6cb640
Merge: eeb16a5 5566d31
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 11 21:37:10 2013 +0400

    Merge pull request #1970 from ilya-lavrenov:tapi_checks

commit eeb16a5d01b336d8a7ce663c495c247952185401
Merge: 9b29b12 8fa8b36
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 11 21:25:54 2013 +0400

    Merge pull request #1971 from ilya-lavrenov:tapi_laplacian

commit ee270d1a183403a9f268988dbedf966090cf3199
Merge: ce503c6 00a1801
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 11 21:25:31 2013 +0400

    Merge pull request #1975 from magomimmo:clj-tut

commit 740b1f235e6832e15be2061df5411e318945d6b4
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Wed Dec 11 18:49:50 2013 +0400

    ocl: implemented per-thread OpenCL command queue

commit a118577a57a8807bb2d99676fd97f65e937e2c44
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Wed Dec 11 18:49:13 2013 +0400

    core: added TLS support

commit 9b29b127c53a6611fd3d30cbda36c21d33f1f91d
Merge: 129b715 1015c5c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 11 17:51:36 2013 +0400

    Merge pull request #1973 from ilya-lavrenov:ocl_haar_sample

commit 268d814d1812208170fce8e99b891db2ebf05e3e
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Wed Dec 11 16:57:47 2013 +0400

    Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.

commit ce503c64bf88d67b9a3bcadb9a64d210415ea5b9
Merge: 13c058e c289c8a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Dec 11 16:55:26 2013 +0400

    Merge pull request #1968 from pentschev:fix_indentation_freak_2.4

commit 3bbf51fbfb5ed028ca7e60ad3caf0733daed6292
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Wed Dec 11 16:46:08 2013 +0400

    ocl: disabled test for Split (there are problems with OutputArray and getMatRef)

commit 129b715e3d60f2dbcb86261595c31a3f9e348f93
Merge: b5cdc03 f76bf8b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 11 16:41:12 2013 +0400

    Merge pull request #1958 from vbystricky:ocl_filter2D

commit 00a180185e558a030f7a133ab4807e9b3afa8989
Author: Mimmmo Cosenza <mimmo.cosenza@gmail.com>
Date:   Wed Dec 11 13:35:20 2013 +0100

    remove Daniele

commit 1c639befe636e4be32fad5b49af4a19251fa89cb
Author: Mimmmo Cosenza <mimmo.cosenza@gmail.com>
Date:   Wed Dec 11 13:30:52 2013 +0100

    add tutorial content

commit b1899e54893d0558fc77af5bce83b3b636467987
Author: Mimmmo Cosenza <mimmo.cosenza@gmail.com>
Date:   Wed Dec 11 13:28:27 2013 +0100

    add clojure tutorial

commit 6f292d8036333cb5400766d5287dab733069f6bb
Author: Mimmmo Cosenza <mimmo.cosenza@gmail.com>
Date:   Wed Dec 11 13:28:04 2013 +0100

    add clojure logo

commit f07e9e7c5f667e540c2f228c6546a8e4ff92bf2a
Author: Mimmmo Cosenza <mimmo.cosenza@gmail.com>
Date:   Wed Dec 11 13:26:47 2013 +0100

    add clojure sample

commit 2784fd7b27a02d55c5dd660f20f849d430349847
Author: Mimmmo Cosenza <mimmo.cosenza@gmail.com>
Date:   Wed Dec 11 13:25:53 2013 +0100

    add Mimmo Cosenza to Authors

commit 91fc0c3bc3de0025ceca965f8a739de290ffe366
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Fri Dec 6 01:18:14 2013 +0400

    bioinspired: fix ocl test, skip them if OpenCL is not available

commit d0114b24e0c60b574a00a562cccb0479a2ee2da3
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Nov 21 13:05:32 2013 +0400

    core/ocl: replace dynamic runtime

commit 9f388a2be7ba712f5ad88e2476a439e887289b4f
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Fri Dec 6 18:45:50 2013 +0400

    core/ocl: autogenerated files for dynamic runtime

commit 5ecf7597428bbb8a7dfad98c309ef3f92d7d210f
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Fri Dec 6 18:41:23 2013 +0400

    core/ocl: update dynamic runtime

commit 381d7851b7aeea72e71b588a4e3237061963fc1f
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Nov 21 12:17:16 2013 +0400

    core/ocl: move opencl dynamic runtime from ocl module

commit 1015c5c24d3695dae8f26925ae1d1fd8402a9a01
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Dec 11 15:08:49 2013 +0400

    fixed facedetect sample

commit f76bf8b425dd5af8a94517a35868f7f3514e34f3
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Wed Dec 11 14:33:22 2013 +0400

    Fix error in test

commit e7227d3e4b4b0e816b17a57b7ade9e39030c18dc
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Wed Dec 11 14:26:33 2013 +0400

    Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.

commit b5cdc03b8143c9a1645e4b99026f073c1c490f81
Merge: d802b4d bdbd3eb
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 11 14:06:49 2013 +0400

    Merge pull request #1972 from alalek:ocl_queue_cleanup_hung

commit bdbd3eb2bfe8f1b1da708cb4a349f7e96aa04626
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Wed Dec 11 00:31:34 2013 +0400

    ocl: process termination hung workaround

commit 8fa8b36b42d633f0c659d4a03811241d5ef81c94
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Dec 10 20:14:37 2013 +0400

    added cv::Laplacian, cv::Sobel, cv::Scharr, cv::GaussianBlur to T-API

commit 302a5adcc20d96720248c23719f33d3da72886b3
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Dec 10 22:54:37 2013 +0400

    converted Haar cascades to the new format; now they are handled with C++ code.

commit 5566d314682a766c3b9152a76b58053e05a1abf3
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Dec 10 16:27:21 2013 +0400

    more strict checks outside ROI

commit d802b4d143c9b5610d3c24b7ff85670157e7522b
Merge: 90c28d2 c9e6ed7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 10 18:49:42 2013 +0400

    Merge pull request #1967 from ilya-lavrenov:tapi_blendLinear

commit c289c8a700b9cb8c18bc789440a617605ff8895f
Author: Peter Andreas Entschev <peter@entschev.com>
Date:   Tue Dec 10 08:57:46 2013 -0200

    Fixing some indentation issues on FREAK source file.

commit 90c28d254f06127e3bc5e8ad0cdfc3ee8590da16
Merge: 5c72c74 464a010
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 10 14:39:35 2013 +0400

    Merge pull request #1961 from SpecLad:merge-2.4

commit c9e6ed7a29969b2c1fe0d3e6b4eaf347a9926bf8
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 8 23:16:17 2013 +0400

    added cv::blendLinear

commit 464a010f53f833b427c271610e27d840b426522c
Merge: 8db53c1 8f10ca5
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 9 16:31:31 2013 +0400

    Merge remote-tracking branch 'origin/2.4' into merge-2.4

    Conflicts:
    	modules/core/include/opencv2/core/operations.hpp
    	modules/core/include/opencv2/core/version.hpp
    	modules/core/src/gpumat.cpp
    	modules/cudaimgproc/src/color.cpp
    	modules/features2d/src/orb.cpp
    	modules/imgproc/src/samplers.cpp
    	modules/ocl/include/opencv2/ocl/matrix_operations.hpp
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	samples/ocl/facedetect.cpp

commit 5c72c74b091e06ffe27ac40005227d93ca4ab076
Merge: 9d87f9c 93c6fe6
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 10 12:13:15 2013 +0400

    Merge pull request #1960 from ilya-lavrenov:tapi_bilateral

commit 13c058ecf863d153822165c2c73cc407c448be71
Merge: 8f10ca5 df0c433
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 9 17:25:33 2013 +0400

    Merge pull request #1959 from botverse:2.4

commit 9d87f9c9740dd1128d25ad72bb2684ad7720ef01
Merge: f3ba1a3 c16c9a2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 9 16:56:06 2013 +0400

    Merge pull request #1956 from ilya-lavrenov:tapi_split_merge

commit f3ba1a361ebfc6cc7d18f7026ba86dde8c29f4ea
Merge: 24465bb 0eb2be7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 9 16:21:15 2013 +0400

    Merge pull request #1930 from alalek:cmake_msvs_subfolders

commit 93c6fe66ce7ab72e1c80e70eccad54714d3010fc
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Dec 9 16:03:25 2013 +0400

    added cv::bilateralFilter to T-API

commit 6f3163f62d4234a862a18af274503cefa9e352a3
Author: Peter Andreas Entschev <peter@entschev.com>
Date:   Wed Nov 27 17:58:40 2013 -0200

    DescriptorExtractor: added defaultNorm() to return default norm type.

    Added the defaultNorm() method to the DescriptorExtractor class. This method returns the default norm type for each descriptor type. The tests and C/C++ samples were updated to get the norm type directly from the DescriptorExtractor inherited classes.

    This was reported in feature report #2182 (http://code.opencv.org/issues/2182). It will make it possible to get the norm type usually applied matching method for each descriptor, instead of passing it manually.

commit df0c43321d580405f1caf0f5b240d2058340484f
Author: Alfonso (the fonz) de la Osa <alfonso.delaosa@pure360.com>
Date:   Mon Dec 9 10:55:44 2013 +0000

    --no-display property fix in stereo_match.cpp sample

commit 24465bbd05f3ddb05aaf93d641d4a080d0e26417
Merge: 8db53c1 4c66b87
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 9 14:10:59 2013 +0400

    Merge pull request #1855 from Nerei:master

commit 8db53c17602fe1175d757f15633adf494f217b02
Merge: 0dfa188 22ad487
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 9 14:07:09 2013 +0400

    Merge pull request #1883 from philippefoubert:branch_matx_inv

commit 0dfa188ca5a2de8ca8f3e71e72115415bf0bd9e9
Merge: 041ad1f b6c33bf
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Dec 9 13:25:41 2013 +0400

    Merge pull request #1948 from ilya-lavrenov:tapi_norm

commit 8f10ca5180d3c62e97f6a2099b5beb225b7df26b
Merge: 060e58d 9f04222
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 9 13:14:15 2013 +0400

    Merge pull request #1946 from asmorkalov:android_manager_version_inc3

commit 041ad1f4cdf0f71e9b052ed09ab57cb830eb52f6
Merge: d368bf5 73aa43d
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Dec 9 12:44:25 2013 +0400

    Merge pull request #1944 from ilya-lavrenov:minor_commits

commit 8d8f5665f1a015e761811875df9937942e3effaf
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Mon Dec 9 11:31:55 2013 +0400

    Fix build errors on Linux system

commit 179a43ef63745d5d4d58734324bf54202ccb2158
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Mon Dec 9 11:10:48 2013 +0400

    Fix build errors on Linux system

commit 29ba7730ed6664ff9d52889eba376e97719df035
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Mon Dec 9 10:45:23 2013 +0400

    Add ocl version of filter2D to the module img_proc

commit 262f70f3abcc624a167af40fddc0bb08bde14d50
Author: Anatoly Baksheev <no@email>
Date:   Sun Dec 8 18:56:54 2013 +0400

    cv::format declaration in default headers

commit c16c9a2e8e239b2b50144046928549778038c1c3
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 8 14:45:25 2013 +0400

    added cv::split to T-API

commit b6c33bf86b9986911782dd92f7b43fabe20b80e6
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 6 19:04:50 2013 +0400

    added cv::norm to T-API

commit cd3f7fbf053ad3d4d18b925c7d90f0d5e0db3749
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 8 01:32:17 2013 +0400

    added cv::merge to T-API

commit 4c66b87698f77549614e0c9473c673c380f530a2
Author: Anatoly Baksheev <no@email>
Date:   Sat Dec 7 19:07:24 2013 +0400

    fixed -Wshadow and other warnings, added rvec test

commit f62ffa2aea67ba1fbfe6806a8e54e04dbf0294ed
Author: Anatoly Baksheev <no@email>
Date:   Sat Nov 30 18:02:57 2013 +0400

    compilation

commit f9ca6cfd22611b0024c2c75fd2891e6b54a5b101
Author: Anatoly Baksheev <no@email>
Date:   Thu Nov 28 12:10:28 2013 +0400

    fixed ocv_module_disable()

commit a54ef70c045493e24f862bbaccbcf1101142ac09
Author: Anatoly Baksheev <no@email>
Date:   Tue Nov 26 15:40:57 2013 +0400

    minor insignificant corrections

commit 546c084fe60b1c3c0abd13810ba0116733ee9ec9
Author: Anatoly Baksheev <no@email>
Date:   Tue Nov 26 13:29:50 2013 +0400

    fixed shadow error and added ocv_disable_module

commit 0e88733b1385930c73b75d48388ea75cd1bce593
Author: Anatoly Baksheev <no@email>
Date:   Sun Nov 24 23:26:03 2013 +0400

    updating Viz cmake (switched to WITH_VTK option)

commit 3830a0b5b239fb432dcea4c46092b2cbdbd7856a
Author: Anatoly Baksheev <no@email>
Date:   Sun Nov 24 20:59:54 2013 +0400

    fixed bug with deletion from std::map

commit a6ab9be5a6a9b28fe0fc715175adf0a3604d9982
Author: Anatoly Baksheev <no@email>
Date:   Sun Nov 24 20:10:14 2013 +0400

    removed VizAccessor from docs

commit fb62a66b6962d1d0d9df4f085d05d1952f402093
Author: Anatoly Baksheev <no@email>
Date:   Sun Nov 24 20:06:54 2013 +0400

    removed unused code

commit b88fdc73d65132c237acfab49c08e3884980eac8
Author: Anatoly Baksheev <no@email>
Date:   Sun Nov 24 20:06:32 2013 +0400

    VizAccessor is now private and renamed to VizStorage

commit d970d58308b3e70c498c01c99c5068f06d1240e1
Author: Anatoly Baksheev <no@email>
Date:   Sun Nov 24 18:15:37 2013 +0400

    added Viz::tutorial2 test

commit ace71cef3f635517a17e9e8f2091e8e3d3ff267a
Author: Anatoly Baksheev <no@email>
Date:   Thu Nov 21 21:20:20 2013 +0400

    Added Affine3<T>::rvec()

commit 9f1f5aed53b499998b0149f757d0711734b6c029
Author: Anatoly Baksheev <no@email>
Date:   Fri Nov 22 14:12:33 2013 +0400

    compilation

commit a9c7aa92d9fbe4a2cf4f63b1394eb67c978a69bb
Author: Anatoly Baksheev <no@email>
Date:   Tue Nov 19 12:39:19 2013 +0400

    removed CV_EXPORTS from cv::Afiine

commit 177f7eb339538b66f0e0c6c1dab63899471c26fc
Author: Anatoly Baksheev <no@email>
Date:   Tue Nov 19 12:14:24 2013 +0400

    fixed warning

commit 0895616576a722cf8d0b5762cc600aabcb2cb072
Author: Anatoly Baksheev <no@email>
Date:   Mon Nov 18 14:50:05 2013 +0400

    switched from unnecessarily 'dobule' to 'float' in some places (commonly for widget scale)

commit b560cc35d9cd1290b4e9fff66a1b478042fd9a79
Author: Anatoly Baksheev <no@email>
Date:   Mon Nov 18 14:38:12 2013 +0400

    removed Ptr typedef from Viz3d. It is deprecated since Viz3d itseez is a shared pointer

commit 0eb2be762a77d119e4bda7f90a7074c6032e5052
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Dec 5 03:23:52 2013 +0400

    cmake: allow source_group to preserve file-system tree (for MSVS)

commit 68d8f6410f63d141262edf24779dfcb700047478
Author: GregoryMorse <gregory.morse@live.com>
Date:   Sat Dec 7 15:40:30 2013 +0800

    Update system.cpp

    Cleaned up to use the preferred namespace code.  This can be further simplified by using the HString/HStringReference classes from wrl\wrappers\corewrappers.h

commit fdf1996e2ebf25cbc185250404aa9e96d5566302
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Sat Dec 7 01:51:35 2013 +0400

    added old=>new cascade conversion function

commit 73aa43d2cab0fabad828934d8e94d59e47722f86
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 6 15:52:34 2013 +0400

    fixed warnings

commit 9f04222a75b308b8d9e6865fef8d9efc9be414e0
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Dec 6 18:01:15 2013 +0400

    OpenCV Manager version++.

commit 060e58d0801e9ed87f13ce7e2c5ce439fba6f019
Merge: b593664 f2cf9dd
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 6 17:56:59 2013 +0400

    Merge pull request #1945 from apavlenko:2.4_version_update

commit d368bf5210faed53a4f83d907722212e2027ff7e
Merge: a0c296f 8a48802
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Dec 6 17:50:44 2013 +0400

    Merge pull request #1941 from vhdirk:gst1x_default

commit b5936648ca2da64fccc9eb4578edc4ceda868b9d
Merge: 7069b4b def17f2
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 16:59:02 2013 +0400

    Merge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4

commit a0c296fcdb3c6f8ec5231986c5e9b2eb0fdf36b8
Merge: f36858b f5a01f1
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 16:40:29 2013 +0400

    Merge pull request #1936 from ElenaGvozdeva:ocl_flip

commit f2cf9dd8bfb30e89b113805fb3d0be1d5667e5f3
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 16:21:22 2013 +0400

    updating version to 2.4.7.2

commit 7069b4b7619aed501375aa779929c4798eb9968e
Merge: 0e35531 2153453
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 16:06:03 2013 +0400

    Merge pull request #1927 from JBosch:issue3409

commit 0e3553130a47766967c2e263117ddf5284f94c60
Merge: c34fc18 45dd189
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 16:00:10 2013 +0400

    Merge pull request #1872 from KonstantinMatskevich:ocl_mt_test

commit c34fc180a7d08ae89bbdfc837cdb1ad653a236ff
Merge: 77d04a2 95ebdf4
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 15:56:14 2013 +0400

    Merge pull request #1762 from jet47:cuda-6.0-npp-fix

commit f5a01f15a59c06989801bd2e5a5aeab6f25bbdc2
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Fri Dec 6 15:53:00 2013 +0400

    Fixed test for ocl_flip

commit 77d04a262249fef5a5ef93e415aa432884d16795
Merge: 1d01c49 e59912f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 15:51:59 2013 +0400

    Merge pull request #1844 from StevenPuttemans:bugfix_3370

commit 1d01c49a06ede1eeea86b1a136439d52e9e3b06e
Merge: 72cfff4 3b4f65b
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 15:47:39 2013 +0400

    Merge pull request #1870 from es0m:es0m-2.4-imgproc-samplers

commit def17f2baa5d0109bc0039c72471b4a9b568b20e
Author: Peter Andreas Entschev <peter@entschev.com>
Date:   Fri Dec 6 09:31:18 2013 -0200

    Removing ocl::oclMat::ptr() method.

    The method ocl::oclMat::ptr() is being removed because it returns a pointer to a row of oclMat::data. The data attribute is a cl_mem structure and cannot be iterated outside an OpenCL kernel.

commit f36858b3a03f9132233af6a73953406860739c4c
Merge: f0049fa 926cab2
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 15:26:43 2013 +0400

    Merge pull request #1942 from ilya-lavrenov:warn_fix

commit f0049fa2ed31db38a21717b1b356ceb2da6f630e
Merge: b16f0a2 3eaa8f1
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 15:25:56 2013 +0400

    Merge pull request #1937 from ilya-lavrenov:tapi_integral

commit 926cab2baaa18295b4a55cd354fe0832b8c0fbae
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Dec 6 13:29:53 2013 +0400

    fixed warnings

commit 44126e350ab9171b60f460d865c0c3ceb1faf54e
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Fri Dec 6 15:11:26 2013 +0400

    Change while(true) to for(;;) for fix compiler warning.

commit 72cfff4c5957343ab21c11a7fc9c9fff8ca60406
Merge: b0b199e 3bc952e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 15:05:34 2013 +0400

    Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4

commit 45dd18955f9c1e03f2e2598302c8c3832552feae
Merge: 7a78559 894724e
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Dec 6 03:03:27 2013 -0800

    Merge pull request #2 from apavlenko/ocl_mt_test

    minor improvements

commit b0b199ee8a354214eb65121671b9a089aebf99e5
Merge: 9dea590 3dcddad
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 14:56:47 2013 +0400

    Merge pull request #1929 from alalek:ocl_haar_amd_beta

commit 894724eaf0641a2b511797dbc28cc5a97c486fe0
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Dec 6 14:49:36 2013 +0400

    minor improvements

commit 591b1a7e70e15f337f4ee0cd9503f5f29f9712bb
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Fri Dec 6 14:42:06 2013 +0400

    Another fix for disable "conditional expression is constant"

commit 3013b469fe72141840107d173485212a71c3e6d4
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Fri Dec 6 14:21:51 2013 +0400

    Add check for depths of destination and source image. Fix warning C4127.

commit 8a48802decd4cf355cc0646ad3cd12af40af0bc8
Author: Dirk Van Haerenborgh <dirk.vanhaerenborgh@hogent.be>
Date:   Fri Dec 6 10:20:29 2013 +0100

    Enable GStreamer 1.x support by default.

    GStreamer 1.x is universally available, and with 0.10 being deprecated,
    there should be no reason to default to 0.10 stil.

commit 3eaa8f149b18f422e606f7411a388bb1fd9e7e5e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Dec 5 19:43:50 2013 +0400

    added cv::intergal to T-API

commit 7a78559708776b28d33c2ff8a5d46a0699f748f2
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Dec 6 12:12:24 2013 +0400

    some fixes

commit 3bc952ed34b8f198da7c679f03a51c27f984fb76
Author: Peter Andreas Entschev <peter@entschev.com>
Date:   Thu Dec 5 19:27:10 2013 -0200

    ocl::BruteForceMatcher fix wrong use of oclMat::ptr().

    The oclMat::ptr() method was mistakenly used in ocl::BruteForceMatcher to pass a pointer to a oclMat object. The ptr() method returns a uchar pointer to the cl_mem data structure and this method will be removed.

commit b93002872750b8f8844fee69180aaad57d328e85
Author: Elena Gvozdeva <elena.gvozdeva@itseez.com>
Date:   Thu Dec 5 14:36:45 2013 +0400

    Added cv::flip using Transparent API

commit 9dea590ada4920c5bf5ce821fd9b6ba4b84b6fb5
Merge: 39754bd 6ce03b0
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 5 17:05:25 2013 +0400

    Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4

commit b16f0a25af7d48251b30a595490ee8d6895faeb5
Merge: bee4dff 828b0b1
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 5 17:02:37 2013 +0400

    Merge pull request #1925 from vpisarev:ocl_facedetect2

commit 3dcddad88aa13b729313939648c29f420a9f8054
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Dec 5 13:52:26 2013 +0400

    ocl: added workaround into Haar kernels

commit 39754bd6f97bde894faee2c3906ee9b7f4cda48d
Merge: 098d4e6 7b551af
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Dec 5 16:46:25 2013 +0400

    Merge pull request #1920 from alalek:ocl_disable_workaround

commit af6134b4b6d08d2ee2e1910d69f7948325a15d34
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Thu Dec 5 14:25:15 2013 +0400

    Fix issue in boxFilter with destination depth not equal to source depth.

commit bee4dff89dffb2459a9d8db638639830ade78097
Merge: 458ac25 778edff
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Dec 5 12:38:12 2013 +0400

    Merge pull request #1447 from Siddharthk:master

commit 968a898a1b74a2020646b48a1390bfe10ac22e43
Author: Vladimir Bystricky <vladimir.bystritsky@itseez.com>
Date:   Thu Dec 5 11:47:17 2013 +0400

    Add ocl version of boxFilter to the module img_proc

commit 0a1ff0d42de3b9b40d5c153a6795e04f9a9da469
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Mon Dec 2 11:15:46 2013 +0400

    multithreading facedetector

commit e38ba1999b9de2931739cd0e0bc5838f8c2039fb
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Nov 22 14:47:58 2013 +0400

    facedetect

commit 6ce03b04842292ce507a49ed435d50b2e20c5f2c
Author: Zhigang Gong <zhigang.gong@intel.com>
Date:   Tue Dec 3 10:49:51 2013 +0800

    Fixed some implicitly type conversions between vector and scalar data type.

    There are some mixed implicitly/explicitly type conversion between
    scalar and vector. Although the spec allows those conversion, I prefer
    to make them consistent and use explicitly all the cases.

    Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>

commit 2153453fd1f925ef029bc62e1c8f6116736d93e2
Author: Josep Bosch <jep250@gmail.com>
Date:   Wed Dec 4 22:32:20 2013 +0100

    Fixed little issue with mouse callback refering to issue 3409. Was using round instead of floor.

commit 828b0b151b16f00f9b8962c0b23cb5bb1d5f7ecb
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Wed Dec 4 22:22:36 2013 +0400

    another attempt to fix compile errors

commit eb7ff99f8012c9d4c5c7f911d00d922982ac8a8f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Nov 8 01:08:36 2013 +0400

    fixed cv::remap and cv::convertMaps for map types CV_16SC2 && CV_16UC1

commit fe11ca886a62f5e44a5a93cb54e7c15b074239d7
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Wed Dec 4 21:56:35 2013 +0400

    trying to eliminate compile problems

commit 458ac2592babc0c407a5028a3cdc439bbf1d9119
Merge: 0736ede e2b99a3
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 4 21:41:44 2013 +0400

    Merge pull request #1908 from ilya-lavrenov:tapi_imgproc

commit 098d4e61743ce786d1a3188c1b6acfb8a6f50142
Merge: d8a4d3a 632b21e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 4 19:56:31 2013 +0400

    Merge pull request #1924 from ilya-lavrenov:svm

commit ff8738520147707d7fad1a19c926530453f942b5
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Wed Dec 4 19:00:39 2013 +0400

    refactored CascadeClassifier to hide implementation details (take 2)

commit 632b21e090a18e3ff8c06ce660f18431e7947719
Author: Baichuan Su <baichuan@multicorewareinc.com>
Date:   Tue Nov 12 13:13:25 2013 +0800

    Modify default setting, using ocl method when have ocl module

commit 2cf16db683add5c9a4775bf17c76b6e55abcd8ee
Author: Baichuan Su <baichuan@multicorewareinc.com>
Date:   Mon Nov 11 11:46:07 2013 +0800

    Add Macro to decide using ocl method or not.

commit 00300baa53a6f57c8f5c2c52c7e32d6077802417
Author: Baichuan Su <baichuan@multicorewareinc.com>
Date:   Sat Nov 9 08:42:39 2013 +0800

    Add OpenCL SVM paths for bagofwords_classification and points_classifier samples.

commit 778edff9e1bf2606504f8bc804f34f26470b48b7
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Wed Dec 4 19:12:43 2013 +0530

    Added comment in demo file

commit c48ad880f39ec5f36e7aa2c6bec8ff3fea375cc0
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Fri Nov 22 23:37:41 2013 +0530

    Errors resolved

commit 944f7bac42ac88dec6d92313720950fede6b373c
Author: Anna Kogan <anna.kogan@itseez.com>
Date:   Thu Nov 21 15:45:53 2013 +0400

    After-merge corrections

commit 573e8184151e261c687db6fda5581fbabfdda907
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Wed Nov 6 20:29:01 2013 +0530

    New changes done and removed opencv_extra folder

    Removed opencv_extra folder inside opencv folder

    New changes done

    Removed test images

commit 33e6c074855c8d84e28fff8e3158a33bf17be800
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Mon Oct 21 19:54:32 2013 +0530

    Removed build errors and removed test images

    Removed conflict

    Error fix 1

    Error fix 2

    Error fix 3

    Error fix 3

    Error fix 4

    Error fix 5

    Error fix 6

    Error fix 7

    Error fix 8

    Error fix 9

    Error fix 10

    Error fix 11

    Error fix 12

    Errors fixed

    Removed opencv_extra folder inside opencv folder

commit 2f65a0d4bab9c38854042a7e64814c59240f2f29
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Thu Oct 17 21:14:31 2013 +0530

    Changes done in npr module

commit 35d9ca6483bfb5f7f87d3e502f105655a4f31a7b
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Wed Oct 9 21:49:57 2013 +0530

    Changes done in cloning module

commit daa9694cab2299d0168505d7f781497f9978059f
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Mon Oct 7 19:30:13 2013 +0530

    Changes done in decolorization module

commit 94eab9babe652e753bcb15bdeec65d6b6061eee8
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Tue Oct 1 21:13:41 2013 +0530

    Revert Back

commit 6c7272bde1a8ecc2cd00203116576bb3f2fa5152
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Tue Oct 1 20:22:10 2013 +0530

    Update to remove Android error

commit 3b239561c66d029467e616b9f24da0a7131ff300
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Tue Oct 1 18:35:53 2013 +0530

    Changed STL in contrast_preserve file

commit f85a615f3fbe2f8a20c5150eead1868837aa8dda
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Sat Sep 14 19:12:25 2013 +0530

    whitespaces removed and other minor changes to fix build error

    Update 1

    update 2

    Update 3

    Update 4

    Update 5

    update 6

    Update 7

    Update 8

    Update 9

    Update 10

    Update 11

    Update 12

    Update 13

    Update 14

    Update 15

    Update 16

    Update 17

    Update 18

    Update 19

    Update 20

    Update 21

    Update 22

    Removed Headers

    Update 23

    Update 24

    Update 25

    Update 26

    Update 27

    Update 28

commit 05c7c9325adcbfdd834891a79ec0d4e0a980273d
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Sat Sep 14 18:59:55 2013 +0530

    cloning_gui.cpp updated

commit 75b76554bf9478b27e88a8ec5ef1ff239ff0bfba
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Sat Sep 14 17:06:26 2013 +0530

    errors in samples/cpp removed

commit 01e1ccfa88d4df8667270a5f400ecf655aa08bec
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Sat Sep 14 16:47:44 2013 +0530

    cloning_demo error removed

commit f8b00e52698d2caefbb6c8dc9417c720d9b1e794
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Fri Sep 13 18:28:03 2013 +0530

    renamed

commit 7ab43585aa127225810bb497c639f529ed1d3cad
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Fri Sep 13 18:27:02 2013 +0530

    remove cloning_example.cpp

commit 50c19423f9c4af5d3c81f75f4a3dd0a4b4abc3f3
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Fri Sep 13 18:25:23 2013 +0530

    cloning demo added

commit 56ab1c18e651bfb466c644437e37a6c8b4f41809
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Tue Sep 3 21:12:05 2013 +0530

    new filters added and all the 3 modules updated

    All 3 modules Updated

commit ae9b4003ae932f98050086ef69a29884a031d8d1
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Tue Aug 27 13:38:38 2013 +0530

    edge preserve filters added and windows warning removed

    update1

commit 1ed0e44090e0519c183c3867ef1f8ae7607dc2ca
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Mon Aug 19 13:16:04 2013 +0530

    added keyboard control

commit e170115ad0d97f76879443184796ca8a23ac7522
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Mon Aug 5 12:12:28 2013 +0530

    new interface added. decolor and cloning module added.

    Both modules added

commit 5b0ee9e08580efceda96ce4595ea7488450f909e
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Fri Jul 26 11:33:27 2013 +0530

    decolor module updated

commit 0802c06571e89b7ae66a7e008d5eb1f4115c7dd6
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Fri Jul 12 09:18:37 2013 +0530

    seamless cloning added

    update1

    update1

    update4

commit a1b3ba02a702371d473d20545bce6d5a07afd9c6
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Mon Jul 1 14:19:03 2013 +0530

    add color_boost + doc

commit 88aa4a9902dbbf47ee79506996101634cc07881a
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Mon Jun 17 15:27:52 2013 +0530

    decolor module updated

    update3

    update4

    update4

    update5

    added test data

commit 95db69f6b95d5faedf4e4f2116daa1202df28c6e
Author: siddharth <siddharthkherada27@gmail.com>
Date:   Sat Jun 15 16:19:31 2013 +0530

    added new files

commit 0736ede7e543f098dd76d12417f30c53cbeaef05
Merge: f9190cc d58cd98
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Dec 4 16:30:55 2013 +0400

    Merge pull request #1914 from SpecLad:merge-2.4

commit d8a4d3a2eb548efe74dd9b6573e934c5c5df7adb
Merge: 3e1586a 11c7053
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Dec 4 15:46:56 2013 +0400

    Merge pull request #1921 from SpecLad:defined-msc-ver

commit 3e1586a1c67f443b1e433b76062225f62ba5b2b8
Merge: fa2cd93 2b31055
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Dec 4 13:55:45 2013 +0400

    Merge pull request #1919 from SpecLad:platfrom

commit fa2cd93ecfcfb181d9a90df948097e8b0fd43d43
Merge: 8752414 adb2040
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Dec 4 13:55:28 2013 +0400

    Merge pull request #1915 from jet47:gpu-color-test-fix

commit e2b99a32b29dd2dbfd24d2ae294527743a9fe19c
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Dec 3 00:13:05 2013 +0400

    added cv::threshold to T-API

commit 474fc887a68765337ec4b6f34e67edc7911b48d2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Dec 2 23:45:16 2013 +0400

    added cv::copyMakeBorder to T-API

commit 5b5f5878ceaf888dbd04bb9fdf1788badd1bea42
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Dec 2 19:44:09 2013 +0400

    added tests to imgproc

commit 7b551af424b9daf576d52190fcbca64c88108e31
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Wed Dec 4 13:00:37 2013 +0400

    ocl: try to disable clFinish workaround

commit 11c7053b0f81ad31474b236205ca9fab177f75fc
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Dec 4 12:39:20 2013 +0400

    Fixed a -Wundef warning in cl_platform.h.

    _MSC_VER -> defined _MSC_VER. Fixes building with MinGW.
    Similar to fbc91c5ee.

commit f9190cc66201afe501844ff29a7034e3e5642418
Merge: e585f14 7d91504
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 4 11:35:10 2013 +0400

    Merge pull request #1909 from alalek:ocl_tapi_perf

commit e585f145f641d4f138dffc609edb0508fc4749c1
Merge: 001aa70 803672f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 4 11:34:51 2013 +0400

    Merge pull request #1903 from ilya-lavrenov:tapi_warp

commit 001aa70556d8101a30eb5f1d0239f2f60c632738
Merge: 90c2306 4947490
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Dec 4 11:34:34 2013 +0400

    Merge pull request #1902 from ilya-lavrenov:tapi_arithm

commit 49474903cb6eebf37a68f7f6f43e3c67db33bafd
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Dec 3 00:41:07 2013 +0400

    refactoring

commit 49e729f89db1dabccc6d8128e7e866db86e44a4b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 1 15:37:56 2013 +0400

    ability to use cv::PSNR with transparent cv::norm

commit 88bceb5060f0e71fc5c44a85884db2ead14c6603
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 1 14:45:48 2013 +0400

    added cv::meanStdDev to T-API

commit b8edc2cc4d4c37784736022b954d0dcdab3bac3f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 1 14:23:07 2013 +0400

    added cv::sum to T-API

commit 28575c19699c03814e8bab5634fec51308f979f2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 1 03:02:13 2013 +0400

    added cv::countNonZero to T-API

commit fed7e618798935d54d3dcb0839ca9b1bc43740fd
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 1 01:57:13 2013 +0400

    added cv::repeat to T-API (fix for copyTo -> UMat is needed)

commit e17107e864663ed6f11a5915daef91694827ab4a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 1 00:59:55 2013 +0400

    added cv::compare to T-API

commit a180cebb2dbf920205ecf9881994bda0f01d8768
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 1 00:17:23 2013 +0400

    added cv::polarToCart to T-API

commit ba850f0b64305acb5b9e34c0e725304e2ca49efa
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Nov 30 20:05:54 2013 +0400

    added cv::cartToPolar to T-API

commit 435028ccee31b3792d166ab1a608e0bd92e29008
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Nov 30 18:42:09 2013 +0400

    added cv::transpose to T-API

commit 6ab297718d705502855ea530afe2eda08a6e0bd2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Nov 30 17:40:03 2013 +0400

    added setIdentity to T-API

commit 3e586f42a0dea12f34378884d68a090cec42b59e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Nov 30 17:20:45 2013 +0400

    added cv::pow to T-API

commit 997ec60839df42213384975decf2ab1bfd5dda1a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Nov 30 16:36:31 2013 +0400

    added OCL-TAPI arithm tests

commit 803672feeac20afb2747119cd6cda8c13a66b28e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 1 18:56:28 2013 +0400

    added cv::remap to T-API

commit dcce9d7088f1cb9472cc75e4d3e2b62de89d33ec
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Dec 1 18:09:52 2013 +0400

    added cv::warpAffine to T-API

commit 55af7857b903db6f07b9a61db6f391c6b3e15c36
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Nov 29 19:16:34 2013 +0400

    added cv::warpPerspective to T-API

commit 8752414718199b3d4147dac4f6e485e565ed40da
Merge: 3509018 1966e7c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 3 19:20:04 2013 +0400

    Merge pull request #1911 from apavlenko:2.4_fix_vc12

commit 7d9150460a7f4870b66a8b074bd861f7777333cb
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Mon Dec 2 21:37:32 2013 +0400

    core/ocl: added perf test infra + "Add" perf test

commit fe01bc21c0f6346004c8d5392f94ec64b5cdfe09
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Mon Dec 2 21:36:08 2013 +0400

    perf: test-based metrics collection strategy

commit 90c230678ec3c9719ff080f2e01b0388298f4442
Merge: 35ea600 eaf620d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 3 18:02:43 2013 +0400

    Merge pull request #1912 from KonstantinMatskevich:ocl_tapi_math

commit 3509018bd691005f8c650ae9bb1677b55af50604
Merge: df13633 c962a9d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 3 17:58:04 2013 +0400

    Merge pull request #1916 from alalek:ocl_moments_fix_perf

commit 1966e7cea9d6dd38db39f29f53b4ca96d56ce2d1
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 3 17:46:09 2013 +0400

    fixing compilation on Linux

commit d58cd9851fdb592a395488fc5721d11c7436a99c
Merge: 17f53bc 3ff1620
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 3 15:50:44 2013 +0400

    Merge remote-tracking branch 'origin/2.4' into merge-2.4

    Conflicts:
    	CMakeLists.txt
    	cmake/OpenCVDetectCUDA.cmake
    	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
    	modules/core/src/cmdparser.cpp
    	modules/gpu/CMakeLists.txt
    	modules/gpu/doc/introduction.rst
    	modules/gpu/perf/perf_video.cpp
    	modules/highgui/doc/reading_and_writing_images_and_video.rst
    	modules/ocl/src/cl_context.cpp
    	modules/video/include/opencv2/video/background_segm.hpp
    	samples/cpp/image_sequence.cpp
    	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
    	samples/python/chessboard.py
    	samples/python/cvutils.py
    	samples/python/demhist.py
    	samples/python/dft.py
    	samples/python/distrans.py
    	samples/python/edge.py
    	samples/python/ffilldemo.py
    	samples/python/fitellipse.py
    	samples/python/houghlines.py
    	samples/python/inpaint.py
    	samples/python/logpolar.py
    	samples/python/morphology.py
    	samples/python/numpy_array.py
    	samples/python/watershed.py

commit 2b3105591446cabbf13a1bc7ac26b1f6ca397af9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 3 17:33:28 2013 +0400

    Fixed the "platfrom" typo everywhere.

commit b5dbe9e04bc69e966168a33a5f96f44b7e064502
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 3 16:08:57 2013 +0400

    Added patch from master for fixing VS2013 in 3rd party lib OpenEXR

commit c962a9d61cffbbc88a61d59449f557d3a2202258
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Tue Dec 3 16:02:41 2013 +0400

    ocl:perf: fix moments test for plain impl

commit adb2040980e61a4bf76675c163c0ada20809a7e2
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Tue Dec 3 15:55:47 2013 +0400

    added additional check in cv::gpu::demosaicing that source is not empty

commit 14ee306b9ec7c4dcd09014b8480d85a955c7706f
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Tue Dec 3 15:55:10 2013 +0400

    fix gpu test for Demosaicing:

    check that input images was loaded correctly

commit eaf620ddde8dbdc84c728a8f84cb22a863f07eb6
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Tue Dec 3 14:57:13 2013 +0400

    small fix

commit 14dccdf23da27abde55be83e57f580e63ec2cac5
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Tue Dec 3 14:07:00 2013 +0400

    T-API cv::log, cv::exp, cv::magnitude, cv::phase

commit 35ea600c54f7970f932e3e1311af92800e137181
Merge: d2b46d4 c1cfb4d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 3 13:57:34 2013 +0400

    Merge pull request #1891 from alalek:cv_error_noreturn

commit df136339ff593df27af98a2a71b54eed74f4bb16
Merge: 3ff1620 9ce9fc3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 3 13:38:10 2013 +0400

    Merge pull request #1907 from severin-lemaignan:emscripten-2.4

commit bd9d3dd561764f4e6993cd0b7b0b1aba7b27b099
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 3 13:16:44 2013 +0400

    fixing build of 2.4 branch with VC12 (aka 2013)
    (master branch was fixed before, no need to merge this to master!)
    - disable openexr (numerous undefined std::min & std::max)
    - workaround for two compilator bugs

commit d2b46d421fb232e3236bc6430163e45f6ce3bd86
Merge: 17f53bc cb4267c
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 3 13:08:44 2013 +0400

    Merge pull request #1910 from alalek:ts_perf_warmuptype

commit cb4267cb38434abb7115fe68a2ab1aa3946c0ac2
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Tue Dec 3 01:08:12 2013 +0400

    ts/perf: int -> enum WarmUpType

commit 9ce9fc3361decee8ac2381fc0dfcff551927ed7e
Author: Séverin Lemaignan <severin.lemaignan@epfl.ch>
Date:   Tue Nov 26 05:53:44 2013 +0100

    Ensure compilation to Javascript with Emscripten

commit 17f53bc30129196d1f52097e9bfa450e10f471fc
Merge: 6e9a770 efe564e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 3 12:14:09 2013 +0400

    Merge pull request #1904 from severin-lemaignan:emscripten

commit 6e9a7706ce10071c01497daee666e000f707bac9
Merge: 0a624ee 206b56e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Dec 3 11:56:49 2013 +0400

    Merge pull request #1890 from alalek:ts_fix_seh_exceptions_handling

commit 3ff16200867d1c659efd17bb8bfee633366f7b05
Merge: 8db6d9f 34a390f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 3 11:32:30 2013 +0400

    Merge pull request #1899 from berak:b_3171_24

commit 8db6d9f9b2d118b7710e15511dbcc1c93ef2bbf6
Merge: 368bac7 eab7603
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 3 11:20:48 2013 +0400

    Merge pull request #1906 from asmorkalov:android_ocl_warn_fix

commit 0a624ee67d110c47d7dcf0b57254ca87821b1cc5
Merge: aed69cc cd97d78
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Dec 3 11:20:25 2013 +0400

    Merge pull request #1901 from vpisarev:ocl_svm3

commit 206b56ed396ce95fce792fba2e4ba1c712f66c36
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Tue Dec 3 03:40:56 2013 +0400

    ts: catch & append general exceptions into log

commit cd97d789b65243b36215233b580fd1c0e92bb7cf
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Dec 2 22:15:07 2013 +0400

    dummy commit to rerun pre-commit tests

commit 368bac7af65cfcb26d42bbefc8fca4293bc7e69b
Merge: 19ceab1 9a0d062
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Dec 2 20:38:48 2013 +0400

    Merge pull request #1744 from liuxing6666:2.4_fix_harris_test

commit 19ceab13f25ce681f72edf63cf25bd8db51f2638
Merge: 790f53f d57a700
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Mon Dec 2 20:07:46 2013 +0400

    Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix

commit aed69cc4580dfa2444601deef89d68d258654416
Merge: b27d7d2 ec6f2e1
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 2 18:55:47 2013 +0400

    Merge pull request #1882 from philippefoubert:branch_ocl_instrumentation

commit 790f53f12a9097c987bf3f29e6db98c1d0c21497
Merge: f7f194e fc1d38c
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 2 18:53:26 2013 +0400

    Merge pull request #1887 from jet47:android-cuda-6.0

commit 161c3b71e6ec6eccf18882d5111fffde1fc680b0
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Dec 2 18:27:08 2013 +0400

    hopefully, now opencv_test_imgproc should pass

commit f7f194e5dd2e574a4ce67d084665edcc8ac986c8
Merge: 838961a cebf109
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 2 17:53:33 2013 +0400

    Merge pull request #1797 from moodoki:bugfix_3344

commit eab7603096beef3b9f25b5ec9a6c453c5938e97e
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Mon Dec 2 17:48:27 2013 +0400

    Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.

commit 838961a2894d87df22ecc5c83c81fedd655fbcac
Merge: fb56875 773616e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 2 17:11:55 2013 +0400

    Merge pull request #1897 from berak:b_3393_24

commit efe564e3b359a6045826beafaab106dbf738299c
Author: Séverin Lemaignan <severin.lemaignan@epfl.ch>
Date:   Tue Nov 26 05:53:44 2013 +0100

    Ensure compilation to Javascript with Emscripten

commit fb568755a1134bc98cfd2e71a22a65556fb8ffbc
Merge: 0bbd768 059bf1d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 2 14:14:41 2013 +0400

    Merge pull request #1898 from berak:b_3349_24

commit 5fea17ff0d42605904a061b4520f084a1446b7e3
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Dec 2 13:46:54 2013 +0400

    still trying to fix failure in opencv_test_imgproc

commit b27d7d2a612583f315971750d3f40808e3b17087
Merge: daefe69 4eba74e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 2 12:28:18 2013 +0400

    Merge pull request #1886 from ilya-lavrenov:tapi_lut

commit 0bbd768d9dd1d30e8f44521498f71441e3eb0193
Merge: f20af81 6b09345
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 2 12:27:50 2013 +0400

    Merge pull request #1884 from asmorkalov:winrt_img_proc_sample

commit f20af817d4380882f0f028265bfe27e3c4a32839
Merge: 429ab8e d39e733
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Dec 2 12:17:29 2013 +0400

    Merge pull request #1894 from asmorkalov:ocv_debug_build

commit 7626a8e8def28f5f5f25503c93d1190a90830c63
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Dec 2 12:13:50 2013 +0400

    try to eliminate failure in opencv_imgproc_test

commit 82b852c13c226e83e99590779f6df548edc8afd1
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Dec 2 00:12:20 2013 +0400

    yet another attempt to make Core_UMat.getUMat test work

commit 9be727b1eae841e9ded1d819fb76b739a6502f81
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Sun Dec 1 23:14:45 2013 +0400

    another attempt to fix Core_UMat.getUMat test

commit f263fe145af81282a6a90f33a4c99455c2397c24
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Sun Dec 1 22:14:15 2013 +0400

    trying to guess and fix strange failure in core test

commit d7f4a223cf1304901217df67173170adb1fdcc28
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Sun Dec 1 20:58:30 2013 +0400

    fixed several compile errors/warnings; reacted on the PR comments

commit ec6f2e1c4dd36c2022f266d58fba1e8f7c1aaa29
Author: Philippe FOUBERT <philippe.foubert@free.fr>
Date:   Sun Dec 1 16:41:17 2013 +0100

    Using cv::String instead of std::string.

commit 6da5d2133180e3a819e64dcec37692db2309d757
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Sun Dec 1 03:12:19 2013 +0400

    fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance

commit 34a390fbc2b83638397066dbd89013da82f36003
Author: berak <px1704@web.de>
Date:   Sat Nov 30 13:35:23 2013 +0100

    CV_WRAP for BackgroundSubtractorMOG2

commit 059bf1d9e501a0a78c2ae412d855ed9a61cd732e
Author: berak <px1704@web.de>
Date:   Sat Nov 30 13:09:42 2013 +0100

    corrected initialization of output_folder in facereco examples

commit 773616ee04e38b66fdf9383a691e367c0b97f37e
Author: berak <px1704@web.de>
Date:   Sat Nov 30 12:00:22 2013 +0100

    swapped x,y in elbp_

commit c1cfb4d422eaeba911ea421f4297e44aed43d73d
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Fri Nov 29 02:40:10 2013 +0400

    core: added cv::error with CV_NORETURN attr

commit 429ab8ebee178580e2564a35205a9ab61952d088
Merge: f8801cf 1b0297d
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Nov 29 23:08:20 2013 +0400

    Merge pull request #1845 from StevenPuttemans:bugfix_3306

commit daefe6983f9288e58edcddbb0798aba9c0107aae
Merge: d83094b 09795e3
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Nov 29 19:21:38 2013 +0400

    Merge pull request #1878 from ilya-lavrenov:ocl_resize_area_master

commit 09795e3265f7f8af264a1a7f3452ffcfe8cfa2d9
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 18:30:07 2013 +0400

    added cv::resize INTER_AREA to T-API

commit d39e73365c668bf8189035ecceb098104e7bbf39
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Nov 29 15:34:50 2013 +0400

    Some debug options are removed because they are installed by Cmake automatically.

    Also forcing -ggdb3 on android leads to debuging issues.

commit f8801cfdb8bb6dd96215a4f1fcb34b93be802c1f
Merge: 41154b3 a13db7c
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Nov 29 15:10:12 2013 +0400

    Merge pull request #1892 from asmorkalov:android_native_camera_close_fix

commit fc1d38ced8f46b82b1fc5f540fc092f22f91f183
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Fri Nov 29 14:53:33 2013 +0400

    fixed compilation of gpu-basics-similarity tutorial:

    initialize TIMES variable with some default value (10)

commit d83094b4124bd68c72f55780ba62c5a7a9407094
Merge: 9ca8096 41d046a
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Nov 29 12:59:08 2013 +0400

    Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor

commit a13db7c8fa2d1fb5fe21de1731287d9897ebb81d
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Nov 29 10:38:26 2013 +0400

    Android native camera destruction fixed for Android 4.4.

commit 6b09345232f8abd3535d03152e6a4b38954a8ed8
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Mon Sep 30 08:22:18 2013 +0400

    Filter selection and several filters implemented for WinRT sample.

commit 9ca80961fd61254cccdae98a837e77ae059fd2ac
Merge: 41ae5d5 2fed668
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 28 16:42:53 2013 +0400

    Merge pull request #1874 from SpecLad:merge-2.4

commit 41154b30def4613d4c1cb3d36962fb2c8eb43534
Merge: 70c1b70 7537521
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 28 14:11:39 2013 +0400

    Merge pull request #1885 from jet47:gpu-bgfg-test-fix

commit 5ac8444c227df9016672f9fa0144398b9c5f3c5a
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Thu Nov 28 13:35:23 2013 +0400

    fixed CUDA_TOOLKIT_TARGET_DIR for android:

    use targets/armv7-linux-androideabi is exists

commit 4eba74ee19ccb570bf7fd1eaaa016c4dcd113ca9
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Nov 28 00:57:36 2013 +0400

    added cv::LUT to T-API

commit 70c1b700d9fb0c94f75b00dcdf1f6736476ecd3d
Merge: 19b88a1 37a7546
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 28 12:24:44 2013 +0400

    Merge pull request #1879 from LeszekSwirski:traincascade-2.4

commit 19b88a17bf5c02a31ecf23f95443b47fb6faf68c
Merge: d5ead20 38904c9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 28 12:11:24 2013 +0400

    Merge pull request #1873 from abak:hough_24

commit 81acc5e73e1b0cf5de884ea8a8482f638b9ef48c
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Wed Oct 30 10:21:55 2013 +0400

    added `-Xptxas;-dlcm=ca` and `-target-os-variant=Android` to nvcc flags

commit 26cb0ce1d55bbd2cf9ed4647ac8089594b80be86
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Wed Oct 30 10:21:30 2013 +0400

    fixed compilation warnings in .cu files

commit 20641b4a0b7200a5b6b7f6ab9a0c87c3f582a4f9
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Wed Oct 30 10:21:13 2013 +0400

    fixed CC arch/pts for android (used sm_32)

commit 51663f5612215cf2e0135e07e2a351f9d798a84d
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Wed Oct 30 10:20:45 2013 +0400

    enable CUDA support for android

commit 95ebdf4069a6333c14e4a610acc37e11cc90a0da
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Thu Nov 7 12:16:06 2013 +0400

    fixed compilation with CUDA 6.0:

    GpuMat::setTo function, removed NPP call for CV_8S

commit 2cfd635e9e4d2c4aafbb9c3e4e593f19e9ddce7d
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Aug 29 03:42:30 2013 -0700

    Image processing sample for WinRT added.

commit 7537521f532e6f80c56474dd2c1df364c444418d
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Wed Nov 27 17:36:58 2013 +0400

    disabled MOG2 performance test (sanity check fails on CUDA 6.0)

commit 7c43daccbaad9fa533ec3b4aa3b725991a95c551
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Wed Nov 27 17:32:00 2013 +0400

    fixed perf tests for bgfg segmentation

commit 38904c9a11979846647b62b611a99a5906188125
Author: Adrien BAK <adrien.bak@gmail.com>
Date:   Thu Nov 28 12:09:17 2013 +0900

    fix exception being thrown when no arguments are passed

commit 094d7c4926e53fd2da0c1eb55b17208a3f21e067
Author: Adrien BAK <adrien.bak@gmail.com>
Date:   Thu Nov 28 11:42:44 2013 +0900

    build fix

commit 22ad487328f75c1c422e33bd3d089c99bdb9ab19
Author: Philippe FOUBERT <philippe.foubert@free.fr>
Date:   Thu Nov 28 00:45:58 2013 +0100

    Comment correction

commit 735f704b3e85f82df060e0ea00c9c66669287815
Author: Philippe FOUBERT <philippe.foubert@free.fr>
Date:   Thu Nov 28 00:42:19 2013 +0100

    Add on optional parameter to the matx invert function to know if this operation is successfull without having to analyse the matrix (it may fail in case of bad preconditioning or inappropriate decomposition method)

commit c056e7fc61326558a247f63da551aacfda5fc8a2
Author: Philippe FOUBERT <philippe.foubert@free.fr>
Date:   Thu Nov 28 00:26:37 2013 +0100

    Correction to be able to compile using the directive PRINT_KERNEL_RUN_TIME

commit 41d046a2db3d722b5f8095754513ab609b2f5ed5
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 23:42:49 2013 +0400

    restored ocl_cvtcolor.cl

commit d2e1318341a4361378bae92e9898bcec852febe8
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 23:42:10 2013 +0400

    RGBA <-> mRGBA

commit f771a0ba8116014cddfcbea4ac3a0359d4b9b48e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 23:37:58 2013 +0400

    RGB[A] <-> HLS

commit 0b900b54e54e8cbd19a65cfe69d20838f142e6b3
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 23:30:29 2013 +0400

    RGB[A] <-> HSV

commit 727a5e6df471111fb0627504371b5f9591800b5e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 22:19:44 2013 +0400

    BGR5x5 <-> Gray

commit fb9c59dd8d68cd310c6d81952c55626b7f87a07f
Author: Mathieu Barnachon <mathieu.barnachon@ncam-tech.com>
Date:   Wed Nov 27 18:14:37 2013 +0100

    Fix default argument.

commit 8a236468973be7817231c2da73f61e0d27da0eaa
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 20:00:35 2013 +0400

    RGB[A] <- RGB5x5

commit 81b9c9c104724fde1667074bbcf56350aaea8657
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 19:52:42 2013 +0400

    RGB[A] -> RGB5x5

commit af367c4f8588e1a68488595c5e1be05e9dd63be0
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 19:44:37 2013 +0400

    RGB[A] <-> BGR[A]

commit ab9b883c69bf94428bce17aaf2a49a055fc244c9
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 19:37:27 2013 +0400

    RGB[A] <-> XYZ

commit 65ee06eb2b6fd73e6770debb97253fa828a73db0
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 19:25:26 2013 +0400

    RGB[A] <-> XYZ

commit 506c19616d1888bdd4e771dc349e3e7f6268ed0f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 27 19:24:27 2013 +0400

    YCrCb -> RGB[A]

commit 37a754621a8d0924a73b30e13acb99e6a950610d
Author: Anatoly Baksheev <no@email>
Date:   Sat Nov 16 19:56:08 2013 +0400

    Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'

    Conflicts:
    	apps/traincascade/boost.cpp

commit bef34093aa6720c0db4cbd67142177b7f56f55cc
Author: Andrey Kamaev <andrey.kamaev@itseez.com>
Date:   Sun Feb 24 20:14:01 2013 +0400

    Remove all using directives for STL namespace and members

    Made all STL usages explicit to be able automatically find all usages of
    particular class or function.

    (cherry picked from commit 2a6fb2867e2fc639e0675eed8abb1688de4539ec)
    (only cherry picked "apps/trancascade")

commit 41ae5d5f66eec1843f17d3ef87d6e508f449ef4d
Merge: 28242f0 6679aed
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Nov 27 18:08:11 2013 +0400

    Merge pull request #1867 from ilya-lavrenov:ocl_resize_master

commit 28242f09d07554e39dad240a56f5e13c3fb7d658
Merge: 96a228f 90d62ca
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 27 17:58:53 2013 +0400

    Merge pull request #1869 from ilya-lavrenov:ocl_cvtColor_master

commit d5ead208b70e3ec1cffe49c4d2e4c997d0becec6
Merge: 935f973 a4239f9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 27 17:37:36 2013 +0400

    Merge pull request #1858 from StevenPuttemans:updates_traincascade

commit 935f973575068a7ac56701f4a322b419c8bac6d7
Merge: 10aec14 7539156
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 27 17:35:52 2013 +0400

    Merge pull request #1877 from tim36272:patch-2

commit 90d62cacc9fa21b828bd736fe1c3e703b90b0b1f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Nov 25 19:15:36 2013 +0400

    fixed cv::cvtColor

commit 7539156109a68195597157fa47844a5d7b4674a2
Author: tim36272 <timothy.l.sweet@gmail.com>
Date:   Wed Nov 27 04:09:40 2013 -0800

    Fixed minor documentation typo

    In section "How do we get an Affine Transformation" subsection 2 there was a ' where there should have been a ` which caused the math to be rendered incorrectly.

commit a4239f972b0e4f904af2e7eaa3d9692731628666
Author: StevenPuttemans <steven.puttemans@kuleuven.be>
Date:   Thu Nov 21 14:07:53 2013 +0100

    Added extras to traincascade functionality

commit b413bcbba4df4c619ce2bceab7bc1709f4f4eac7
Author: Mathieu Barnachon <mathieu.barnachon@ncam-tech.com>
Date:   Wed Nov 27 11:36:34 2013 +0100

    Fix shadow parameter.

commit 99c8b8c016950c33f184b8f1753de23f075cf457
Author: Mathieu Barnachon <mathieu.barnachon@ncam-tech.com>
Date:   Wed Nov 27 11:06:52 2013 +0100

    Fix parameter name to fit documentation.

commit 10aec14a4d8bab2c5393496bd475b29fee4c045a
Merge: 1253c21 6f892b1
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 27 13:22:31 2013 +0400

    Merge pull request #1849 from StevenPuttemans:feature_3375_documentation

commit 2fed6683904ea1092a20d917981a08fb890790bf
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 27 12:59:19 2013 +0400

    Fixed build errors.

commit 6679aed61eb88e49713256df0f387b05a188fe9a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Nov 22 18:56:03 2013 +0400

    fixed ocl::resize (INTER_LINEAR) and added an accuracy test

commit 4f74e2509ba8bc0baccfbc1e3eefebcd013fd0a8
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Tue Nov 26 22:50:26 2013 +0100

    Fix the documentation names.

commit 96a228fd7e8488ec3d45930ae0ee9787a3decd6b
Merge: 736097a 9d23a0c
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Nov 26 23:27:48 2013 +0400

    Merge pull request #1866 from ilya-lavrenov:ocl_fix2

commit 736097a46254fd52b23d32753221eda61684b374
Merge: aaf97c4 1458557
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Nov 26 23:24:50 2013 +0400

    Merge pull request #1868 from KonstantinMatskevich:umat_bugfix

commit 1253c2101b22b9e89400553fd220858cda8d6ea5
Merge: d45ce08 8fe4ab2
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Nov 26 23:17:28 2013 +0400

    Merge pull request #1875 from asmorkalov:android_bin_compat_fix

commit 8fe4ab280b2426b8d913ec9c8236b33698632abf
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Tue Nov 26 17:39:40 2013 +0400

    Build error fix for binary-complience-checker tool.

commit 920fd48228edb6adf7d79f1357db32a145d1ee42
Merge: 9c2272d aaf97c4
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 26 15:32:44 2013 +0400

    Merge remote-tracking branch 'origin/master' into merge-2.4

    Conflicts:
    	modules/ocl/src/arithm.cpp

commit 9c2272d5204dad63777c7ba053e709b5073c4172
Merge: 684ff70 16a11cf
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 26 15:05:26 2013 +0400

    Merge remote-tracking branch 'origin/2.4' into merge-2.4

    Conflicts:
    	.gitignore
    	CMakeLists.txt
    	doc/CMakeLists.txt
    	modules/calib3d/src/stereosgbm.cpp
    	modules/core/include/opencv2/core/mat.hpp
    	modules/highgui/src/cap_openni.cpp
    	modules/ml/include/opencv2/ml/ml.hpp
    	modules/objdetect/src/hog.cpp
    	modules/ocl/perf/perf_color.cpp
    	modules/ocl/src/arithm.cpp
    	modules/ocl/src/filtering.cpp
    	modules/ocl/src/imgproc.cpp
    	modules/ocl/src/optical_flow_farneback.cpp
    	platforms/scripts/camera_build.conf
    	platforms/scripts/cmake_android_all_cameras.py
    	samples/cpp/Qt_sample/main.cpp
    	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp

commit aaf97c454848178857833075d996e6d56fa7d926
Merge: e7339ac 88b2fe9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 26 13:53:47 2013 +0400

    Merge pull request #1863 from nevion:master

commit e7339ac11a369ad23a56e741dbdcb000d19b695d
Merge: e20f701 e4793e3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 26 13:00:55 2013 +0400

    Merge pull request #1818 from GregoryMorse:patch-2

commit e20f7014cfd6ceddfa8ff623c8b20b6fb7b63be5
Merge: 05e22ee 4cfbee7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 26 11:43:34 2013 +0400

    Merge pull request #1835 from SpecLad:windows-xadd

commit 05e22ee8c998f7d38a534e68a39875cd52d8a8d3
Merge: 684ff70 dd81785
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 26 11:40:37 2013 +0400

    Merge pull request #1859 from SpecLad:string-plus-equals

commit dda3b534ada60f44a451c136a434b7b3cd1d40ae
Author: Adrien BAK <adrien.bak@gmail.com>
Date:   Wed Nov 13 16:21:09 2013 +0900

    fix indent

commit 1c025be06869e1a23c6739ea82d3b56dfe070400
Author: Adrien BAK <adrien.bak@gmail.com>
Date:   Wed Nov 13 16:13:47 2013 +0900

    fix typos

commit 514f1fae9548e35c4005b4f2d2b4fad7a550bc28
Author: Adrien BAK <adrien.bak@gmail.com>
Date:   Mon Nov 11 14:55:12 2013 +0900

    improved error handling

commit 8a2de2eccae4dde31a70ef4b0e86e6282157fa52
Author: Adrien BAK <adrien.bak@gmail.com>
Date:   Mon Nov 11 14:47:54 2013 +0900

    modified HoughCircleDemo to introduce variable params via trackbars

    Conflicts:
    	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp

commit d45ce086c1a06e3e01bb8a6c36c9baa1241079af
Merge: 16a11cf d650efc
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Tue Nov 26 09:58:21 2013 +0400

    Merge pull request #1856 from alalek:ocl_fix_mt

commit 3b4f65b18693b6afebc90bbc46e7f88c28d5f048
Author: Eric Sommerlade <eric@robots.ox.ac.uk>
Date:   Tue Nov 26 00:12:30 2013 +0000

    fixed comparison to stop integer wrap around

commit e4793e3d5e86d46c8c3247f1ef99553d2b8c1569
Author: GregoryMorse <gregory.morse@live.com>
Date:   Mon Nov 18 20:25:50 2013 +0800

    Update system.cpp

    Fixed to use native C++ instead of C++/CX although it does require significantly more code, it goes along with the spirit of keeping the project in native C++

    Update system.cpp

    Cleaned up whitespace, removed redundant code and added edge cases for string cleanup

    Update system.cpp

    Fixed compiler warning over comma operator clause

    Update system.cpp

    NULL initialization

    Update system.cpp

    Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer

    Update system.cpp

    Support C++/CX and native C++ through conditional compilation.  Fixed style - long lines, comma operators, long conditional.  Optimized string usage to use reference.

    Update system.cpp

    Fixed conditional compilation around include and library

    Update system.cpp

    Fixed trailing space

    Update system.cpp

    Cleaned up whitespace, removed redundant code and added edge cases for string cleanup

    Update system.cpp

    Fixed compiler warning over comma operator clause

    Update system.cpp

    NULL initialization

    Update system.cpp

    Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer

    Update system.cpp

    Support C++/CX and native C++ through conditional compilation.  Fixed style - long lines, comma operators, long conditional.  Optimized string usage to use reference.

    Update system.cpp

    Fixed conditional compilation around include and library

    Update system.cpp

    Fixed trailing space

commit 16a3067afcf274f6930cd8e5e4530d10964fc395
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Nov 25 18:14:24 2013 +0400

    cp test_colot.cpp to imgproc ocl tests

commit 145855767c466130aacb45601955a333d744aa3d
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Mon Nov 25 17:16:22 2013 +0400

    bugfix in deallocate

commit 9d23a0cb819e12cc706ec4623ffea071d651b3ab
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Nov 21 23:25:17 2013 +0400

    fixed ocl_arithm_op; fix for 3-channel images is needed

commit 6f892b10ff9e4ba91356889ebeca17e0a25b941d
Author: StevenPuttemans <steven.puttemans@kuleuven.be>
Date:   Thu Nov 21 16:45:48 2013 +0100

    Applied feature #3375 and fix of pull 1842 to avoid merging problems later

commit 16a11cfb2790133a64c1de45e7b6b007f043a4a4
Merge: 75fba08 2427c03
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 25 12:38:56 2013 +0400

    Merge pull request #1842 from StevenPuttemans:bugfix_3315

commit 1b0297d92b4fbf6bf89d2f563f2f4c1486afe8d5
Author: StevenPuttemans <steven.puttemans@kuleuven.be>
Date:   Thu Nov 21 15:03:49 2013 +0100

    Added fixes mentioned in bugreport 3306
    - Added author provided fixes
    - Added code example
    - Added documentation fixes

commit 75fba08042929d4bb6833cf32f52515c7f20b144
Merge: 4c5593b 239704f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 25 12:19:58 2013 +0400

    Merge pull request #1822 from SpecLad:msvc12

commit 4c5593b63307636a9f1e9ac02c6df003c93d4cf9
Merge: 06f6f74 514e972
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 25 12:19:20 2013 +0400

    Merge pull request #1837 from asmorkalov:android_opencl

commit 06f6f74e611a04421a74af7771e6bd0b230c42fe
Merge: 59aa516 a19cc6c
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 25 12:17:07 2013 +0400

    Merge pull request #1839 from pmiecielica:memory_leaks

commit 684ff70308924119d5a453a455f6bd142ddf027b
Merge: 52e810e 10639d6
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 25 12:15:52 2013 +0400

    Merge pull request #1864 from berak:mouse_and_match

commit 52e810ed33a86e5bcbddc60c63c01aa9db651f05
Merge: 3ab4730 c8abb61
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 25 12:04:16 2013 +0400

    Merge pull request #1850 from ilya-lavrenov:pthread_mutex

commit 59aa516ca58b95e5f27505457fb678c82cca50a3
Merge: 0537747 ddc9be9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 25 12:00:25 2013 +0400

    Merge pull request #1860 from alalek:ocl_fix_undef_warn

commit c90fe65f22508271e0723860739afdeec1ed5e73
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Sun Nov 24 17:16:45 2013 +0100

    Fix compilation issue related to previous commit.

commit e8b86c86631c50de5457c7e61a918e9a525c58f6
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Sun Nov 24 17:14:23 2013 +0100

    Fix name of one parameter to fit the documentation.

commit 089b8e2f4ad89934ed54636584f664a9737a6077
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Sun Nov 24 17:10:06 2013 +0100

    Suppress a space!

commit 10639d63f5fa93f52b32a712b95bb294f5e2add0
Author: berak <px1704@web.de>
Date:   Sun Nov 24 15:58:13 2013 +0100

    mouse_and_match.py missing import cv2

commit 9dc713eaba7c3bb290a24153def2699e9d8a71af
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Sun Nov 24 15:45:05 2013 +0100

    Fix name of parameter to have proper documentation.

commit bf84d476fc0587f3021b5b5ca638b5160d10d44b
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Sun Nov 24 15:38:48 2013 +0100

    Fix useless space...

commit e015691b41984dfae796a3ff320825e847f73745
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Sun Nov 24 15:32:52 2013 +0100

    Fix warnings as errors.

commit 0c4da123e9ec924cd70f5ec6751040a38f1c24b3
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Sun Nov 24 14:33:41 2013 +0100

    Remove duplicate functions.

commit 67525627db776010b1d8d5b0c8cd9b643b087ce9
Merge: 4649852 3ab4730
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Sun Nov 24 14:21:44 2013 +0100

    Merge remote-tracking branch 'upstream/master' into bow_desc

    Conflicts:
    	modules/features2d/src/bagofwords.cpp

commit 63c23cce651e5d79d1fbc3635cc951ff34cc7726
Merge: e195575 3ab4730
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Sun Nov 24 13:24:39 2013 +0100

    Merge remote-tracking branch 'upstream/master' into svm_hog

commit e1955759afaffb87bbb0d7a9abd03b7356be9414
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Sun Nov 24 13:22:10 2013 +0100

    Fix some warning.
    Adding missing credit for a function.

commit 88b2fe9dbb786ebd3dec3889e8194c0b52bb8e72
Author: Jason Newton <jason@utopiacompression.com>
Date:   Sun Nov 24 01:20:07 2013 -0800

    correct upper bound for maximum number of labels for 8-way connectivity

commit 3ab47300ce4f91920959b3619199e98d65fe7cd6
Merge: b157cc1 fd4a7e7
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Nov 23 18:54:52 2013 +0400

    Merge pull request #1862 from alalek:ocl_disable_tests

commit fd4a7e7d1f569de4989be71b235f7bb6b420935d
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Sat Nov 23 18:13:32 2013 +0400

    ocl: disable tests

commit b157cc17e99fb3e4e20ba326d88036b502a5f8be
Merge: b82c55d 881e837
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Nov 23 16:44:58 2013 +0400

    Merge pull request #1857 from alalek:ocl_ta_tests_infra

commit b82c55de12dcc50734b3c9a850dc65ae5a918145
Merge: c1f59c4 1af95ea
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Sat Nov 23 16:44:37 2013 +0400

    Merge pull request #1861 from ilya-lavrenov:ocl_args_fix

commit 1af95ea12c1b43898aaa1563bede2437c102f8c2
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Nov 22 18:56:03 2013 +0400

    fixed error in setting kernel arguments

commit 881e837520960798b2f8c2f1944f10ca9b5aef25
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Fri Nov 22 16:51:01 2013 +0400

    ocl/core: added prototype for tests

commit 0537747f7917a4b13b7a9cbd0e25cf66196277cc
Merge: 901dc3b 7a8bd31
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Nov 22 18:26:16 2013 +0400

    Merge pull request #1853 from StevenPuttemans:bugfix_3346

commit ddc9be9170c7d0c3e3ccc43c69f5663bfd2d05c0
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Fri Nov 22 18:24:50 2013 +0400

    ocl: don't disable Undef warnings

commit fbc91c5ee93198c3cbc3174a4ddc75960bcd2b2f
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Thu Nov 21 12:35:37 2013 +0400

    ocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32)

commit 901dc3b878b464e9950b267ff3c45913941f18ff
Merge: 8a4f357 bd314bf
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Nov 22 18:15:48 2013 +0400

    Merge pull request #1854 from asmorkalov:android_engine_tegra4i5

commit dd817857b41eda7644c199fbd8589ff95c741c71
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Nov 22 16:55:30 2013 +0400

    Replaced most of the instances of "s = s +" with "s +=".

    This resynchronizes master code with 2.4. I say "most", because I might
    have missed some due to different spacing; I'll deal with those
    instances later if I find them.

commit fc49d33c8d17dd6c5e3de6f23024d1d4fa98e920
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 21 18:26:38 2013 +0400

    Gave cv::String appropriate += operators.

    Note that since String is a reference to an immutable string,
    this doesn't actually change the string; it just replaces *this
    with a reference to the concatenated string.

commit c8abb6124fa6f45cedcf242261de02e003f70783
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Nov 22 13:00:37 2013 +0400

    recursive mutex for linux

commit e59912f803c73d62ce08c3b10885a43392a17626
Author: StevenPuttemans <steven.puttemans@kuleuven.be>
Date:   Thu Nov 21 14:07:53 2013 +0100

    Applied fix mentioned in bugreport 3370. Seems to solve the issue.

commit a19cc6cb64234ea22fc587480a47b903a53c993c
Author: Piotr Miecielica <pmiecielica@samsung.com>
Date:   Fri Nov 22 13:33:33 2013 +0100

    Added pointer initialization

commit 514e97223c50c49be944542b92a6007e83f730ed
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Thu Sep 19 11:49:49 2013 +0400

    Some hacks to build and run OpenCL on Qualcomm S800.

    Some of functions were enabled on Qualcomm S800 by changing grid size;
    OpenCL kernel grid size unification for different platfroms;
    Test pass rate improvements by inclreasing threshold;
    Some tests were disabled for Android;
    run.py was adopted for devices with brackets in in name.

commit d650efc069b1dad37497712d0c4d0a3defc18149
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Fri Nov 22 14:38:12 2013 +0400

    ocl: multi-threading: opencl buffer memory guard

commit 96a4a7b339f7ba2d3a634fc8ca8e9f5fd80e0d41
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Fri Nov 22 14:31:54 2013 +0400

    ocl: multi-threading: fix bug in intialization

commit bd314bf9557741de15fd2b727311b737678402a2
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Nov 22 13:59:36 2013 +0400

    VFPv4 detection implemented. Some Tegra5 related updates.

commit c1f59c4c76c5adbb7fc2c40ff13020e7ff58c651
Merge: c33cb94 8834d5e
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Fri Nov 22 13:57:22 2013 +0400

    Merge pull request #1852 from ilya-lavrenov:ocl_retina

commit 2427c03625fb8affbb9291380da7a8862cea9ee8
Author: StevenPuttemans <steven.puttemans@kuleuven.be>
Date:   Thu Nov 21 13:32:21 2013 +0100

    Wrong example at the visual studio tutorial. Fixed link, fixed sample
    content and renamed to a more sensible name. Also fixed a wrong link in the
    actual display_image tutorial.

commit 7a8bd3165728c2994fd75d647c69139347a54d2a
Author: StevenPuttemans <steven.puttemans@kuleuven.be>
Date:   Fri Nov 22 09:57:47 2013 +0100

    Fixed bug in report #3346

commit 8834d5e57b1128757a8dd83e7d413fd71b81f82f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Nov 22 12:35:29 2013 +0400

    changed eps in Retina_OCL test

commit fd759223fa544d63892a8cb4bbb7142c416e353e
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Fri Nov 22 11:12:51 2013 +0400

    Package selection for Tegra 4i fixed. Initial Tegra5 support added.

commit 67a2c4ecd5c190dbc92459adf35fc4cfad4bbccf
Author: Daniel Neel <dneelyep@gmail.com>
Date:   Thu Nov 21 22:36:31 2013 -0500

    Re-phrased some odd wording.

commit 923698d7003ce34ff76219d63af258a5577819ac
Author: Piotr Miecielica <pmiecielica@samsung.com>
Date:   Tue Nov 19 17:35:27 2013 +0100

    Fixes of some memory leaks

commit c33cb94d668c4ffadcc00f7fccfbcce420fa4554
Merge: ca8c129 561a7f5
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Nov 21 21:29:26 2013 +0400

    Merge pull request #1847 from ilya-lavrenov:ocl_imgproc_fix

commit ca8c129c571704dfee418512be43505101934653
Merge: 9bf2516 650f92f
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Nov 21 21:29:09 2013 +0400

    Merge pull request #1848 from ilya-lavrenov:warn

commit 650f92f9cc7e373c7871099496b6d86a8590baab
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Nov 21 18:27:07 2013 +0400

    eliminated warning C4267

commit 561a7f5782f55420fc9a77425a4a81d02d714b4b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Nov 21 18:23:57 2013 +0400

    fixed kernel compilation in imgproc module

commit 8a4f35704ae0eff4f3303d55fa24fd9d995e8b7a
Merge: 2509b79 d764af5
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Nov 21 17:32:53 2013 +0400

    Merge pull request #1840 from ilya-lavrenov:ocl_cvtColor

commit 9bf2516eb1bdeeb063ab4b9750bcfe46bcaaa01d
Merge: 8d1a8df 65b7e20
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Thu Nov 21 17:32:36 2013 +0400

    Merge pull request #1841 from ilya-lavrenov:ocl_kernel_compilation

commit 2509b7954e954185012711f064d93115574a2835
Merge: 6b23cb5 9631cb6
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 21 17:11:29 2013 +0400

    Merge pull request #1838 from alekcac:ios64_fix

commit 65b7e2018c07ae5c3b6af81c3b629da968db22f4
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Nov 21 14:21:43 2013 +0400

    fixed kernel compilation

commit d764af531846fbad34d66902a13af410e74f9e85
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Nov 21 12:53:21 2013 +0400

    added extra parameters to ocl::cvtColor performance test

commit 6b23cb5b024e45b2a0b333a96b87cb142b8c3b27
Merge: b8f5fcf c1541c9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 21 12:31:36 2013 +0400

    Merge pull request #1795 from alalek:perf_report_progress

commit b8f5fcf3f9970a5987b7e99b8725962aff7f7b17
Merge: 623a02c 78e16a9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 21 12:03:01 2013 +0400

    Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea

commit 623a02c69ff64eaeab26bed4db8617eb47489cd8
Merge: 70a4de2 cf00349
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 21 11:55:20 2013 +0400

    Merge pull request #1834 from SpecLad:svm-copy-ctor

commit c1541c9e790098b618053254a69aba6919dccbf0
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Wed Nov 20 19:57:20 2013 +0400

    perf report: summary.py: added --progress mode

commit 8d1a8df1a9595b0060fb21102b93155b590183d4
Merge: 3703c70 ae8b2cb
Author: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date:   Wed Nov 20 19:14:39 2013 +0400

    Merge pull request #1824 from vpisarev:ocl_experiments5

commit 70a4de20d74e23220269d011e2c5ca1c5198936c
Merge: f628343 60b59ee
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 20 18:19:07 2013 +0400

    Merge pull request #1836 from ilya-lavrenov:ocl_norm_workaround

commit 9631cb6de91fcc736c76e11fff6c5b6d5ff8a3ee
Author: Alexander Shishkov <alexander.shishkov@itseez.com>
Date:   Wed Nov 20 18:08:05 2013 +0400

    fix for supporting 64-bit architecture

commit f6283432ffc0def0ae71ec6e31114ca6ab06ce72
Merge: 8ac3ddf b8283ed
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 20 17:59:35 2013 +0400

    Merge pull request #1833 from SpecLad:fix-qt-sample

commit 3703c7040a5ab514ef94b32a6cb32a604b664837
Merge: 95006af aacf188
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 20 16:08:52 2013 +0400

    Merge pull request #1828 from SpecLad:merge-2.4

commit 8ac3ddf421a90a03c0b542cb4a2f1c807eb89732
Merge: b197ec9 4037a4f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 20 15:57:14 2013 +0400

    Merge pull request #1829 from SpecLad:config-components-libs

commit 60b59eeb73ebe1c719181db1aa4aaa43e1df2c1a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 20 15:40:56 2013 +0400

    workaround for AMD bug: UNREACHABLE EXECUTED

commit cf00349b5bfddea8b65efcfde88f9e94ff7bc682
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 20 14:59:42 2013 +0400

    Gave CvSVM a private copy constructor & assignment operator.

    The implicitly generated ones don't work properly, and I don't want to
    write proper ones. :-)

    "Fixes" <http://code.opencv.org/issues/3358>.

commit b8283edfca5bb496e86cda8d19629e6945df043f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 20 14:57:21 2013 +0400

    Fix the Qt sample, broken after #1722.

commit 4cfbee70bd9b25dba9f8d80a4b8242b95f2436ba
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 20 13:47:35 2013 +0400

    Simplified the Windows implementation of CV_XADD.

    _InterlockedExchangeAdd is a Visual Studio intrinsic that's available
    for all architectures and in all VS versions that we care about. It's also
    faster than the underscore-less function, since it's an intrinsic.
    We also don't need to declare it ourselves.

    It is, however, a Visual Studio-specific intrinsic, so I changed the
    preprocessing condition accordingly.

    Fixes <http://code.opencv.org/issues/3365>.

commit b197ec94136473afc6a01d3691774f0ba7b87221
Merge: e69d2c1 c88fa27
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 20 13:36:37 2013 +0400

    Merge pull request #1761 from bhuroc:qtkit-video-file-2.4

commit 95006af17076e4787e38eb56e5d716d892779daf
Merge: 63b3db5 615d6c2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 20 11:52:53 2013 +0400

    Merge pull request #1816 from SpecLad:no-more-epoch

commit 63b3db53d7b67ba4489b9c289d07de015d36f3c3
Merge: bb4bf7a ef27ac3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 20 11:52:30 2013 +0400

    Merge pull request #1830 from SpecLad:config-includes

commit ae8b2cbd6839c20a884131f2123f6ada539b75ea
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Nov 19 20:51:31 2013 -0500

    fixed bug with cl_long size on Win32 (thanks to Aaron Kunze)

commit 677c7f27cb15c71105bd1336ba65353d63c7505c
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Tue Nov 19 19:20:24 2013 -0500

    fixed failure in Tonemap test

commit 78e16a906be177b0311c97834429cf40defc4b27
Author: Philippe FOUBERT <philippe.foubert@free.fr>
Date:   Tue Nov 19 21:51:47 2013 +0100

    Back to the previous coding way (using the macro with the goto).

commit ef27ac37823f399234c80e5c9af9a5bcb3e51fee
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 19:00:56 2013 +0400

    In the example in OpenCVConfig.cmake.in, explicitly add the include paths.

    After #1801, the include directories are no longer added automatically,
    so we should show the user how to do that.

commit 7f935717cbf9b153a342954b62c007ac925166e7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 18:58:33 2013 +0400

    In OpenCVConfig.cmake.in, lowercased the commands in the example.

    This is the preferred style nowadays, and more consistent with the
    rest of the code.

commit 4037a4f227552409f8b9bae99f8e69d0ee59e44e
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 18:36:58 2013 +0400

    Fixed OpenCV_LIBS when find_package has been used with explicit components.

    Fixes <http://answers.opencv.org/question/23997/opencv-247-cmake-includes-all-modules-even-if-i/>.

commit e69d2c1bb1c81e085eed0687ca539bba7fd8e9b8
Merge: 5c77784 198cd1a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 16:25:46 2013 +0400

    Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA

commit aacf188e837324b5e35dac9d2accaa332a83d346
Merge: b8c46f4 7703b63
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 16:21:09 2013 +0400

    Merge remote-tracking branch 'origin/2.4' into merge-2.4

    Conflicts:
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	modules/ocl/src/arithm.cpp
    	modules/ocl/src/build_warps.cpp
    	modules/ocl/src/color.cpp
    	modules/ocl/src/haar.cpp
    	modules/ocl/src/imgproc.cpp
    	modules/ocl/src/split_merge.cpp
    	modules/ocl/test/test_color.cpp
    	samples/cpp/3calibration.cpp
    	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
    	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
    	samples/cpp/Qt_sample/main.cpp
    	samples/cpp/camshiftdemo.cpp
    	samples/cpp/descriptor_extractor_matcher.cpp
    	samples/cpp/distrans.cpp
    	samples/cpp/generic_descriptor_match.cpp
    	samples/cpp/grabcut.cpp
    	samples/cpp/morphology2.cpp
    	samples/cpp/segment_objects.cpp
    	samples/cpp/stereo_calib.cpp
    	samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
    	samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
    	samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
    	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
    	samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
    	samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
    	samples/cpp/video_dmtx.cpp

commit 5c77784ac94d77cf7b89be5b5a0c0e04a4f2f05a
Merge: 0a90a36 e08b075
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 14:53:16 2013 +0400

    Merge pull request #1827 from asmorkalov:android_ndk_r9b

commit 0a90a36a1fdda434c2fccdeeee69e4dd0a499fa7
Merge: c47190e 3314bc9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 14:21:48 2013 +0400

    Merge pull request #1793 from SpecLad:external-docs-1

commit c47190ef90d61598c0efc95595a0c40938df1b19
Merge: 4746a71 f02ce90
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 14:21:25 2013 +0400

    Merge pull request #1787 from hs3180:2.4

commit 198cd1a40db82c59fca6b41c263efd89a5aeb5ca
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Nov 18 18:46:59 2013 +0400

    added area fast mode to ocl::resize

commit 4746a710bb6cbca552b3596d2ad870d6987a6cac
Merge: 3e55d70 26d3a1a
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 12:47:47 2013 +0400

    Merge pull request #1820 from asmorkalov:android_native_camera_44

commit 3e55d705ccca84c93c06de020ec058ba6e87bf09
Merge: 56f7916 c0456df
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 12:34:09 2013 +0400

    Merge pull request #1823 from ilya-lavrenov:ocl_abs_sum

commit 56f791679bf753bab64a107f286a1dcb129d1d3c
Merge: 68d1110 66221a3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 12:31:53 2013 +0400

    Merge pull request #1825 from jet47:fix-opengl-mem-leak

commit 68d1110cde675afdbfe08b45001aea8e4fe640b8
Merge: 85f92fa 7973594
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 19 12:29:55 2013 +0400

    Merge pull request #1821 from SpecLad:watch-your-slashes

commit e08b075db015b2537210c71f42d18780e627bc83
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Tue Nov 19 11:46:29 2013 +0400

    Android NDK r9b support added.

commit 66221a32b985ff236287db860dc412d3c78427a3
Author: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date:   Tue Nov 19 10:12:22 2013 +0400

    fixed memory leak in ogl::Texture2D

commit d0b3c7a518dffd0e5ecf588290823a1932eab127
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Nov 18 23:14:44 2013 -0500

    added some diagnostic into Tonemap test

commit 8c44995ea64b133aa8df25dbd07258a274db2ddf
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Nov 18 22:15:04 2013 -0500

    another attempt to fix compile errors

commit 241002384c579621d5a0987f472a1a074b8ab1ed
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Nov 18 14:26:19 2013 -0500

    fixed some more compile errors

commit e2bbe7597b229bb891693a5b307b288ff756454e
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Nov 18 13:48:04 2013 -0500

    fixed few compile errors and doc build errors

commit 8762ee3f6f719843cef3fda7b3e4ccde31c0733e
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Nov 18 12:02:10 2013 -0500

    removed unnecessary opencl kernels

commit d914f20a4c980317e61e34049c4d3836372279a2
Author: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date:   Mon Nov 18 11:48:00 2013 -0500

    updated patch to bring in the first functions with "transparent API"

commit c0456df6110d012290ea4cc250a93fe0acbeb68f
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Nov 18 18:50:40 2013 +0400

    workaround for ocl::absSum (eliminated error: unreachable executed)

commit 85f92fabbd8eabfc27ab598d84277e24cf607dbe
Merge: cdf4e4e e3f450c
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 18 19:44:32 2013 +0400

    Merge pull request #1815 from asmorkalov:android_native_camera_build_automation

commit 239704f9869f1d2d8e0e8c67a3bdbd72afc552cf
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 18 19:39:39 2013 +0400

    Added Visual Studio 2013 detection.

commit 7973594a01228107dcb9d2d1f10eb64498b91aac
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 18 19:17:23 2013 +0400

    Removed all slashes after ${OpenCV_INSTALL_BINARIES_PREFIX}.

    If it's followed by a slash and OpenCV_INSTALL_BINARIES_PREFIX is empty,
    then the resulting path becomes absolute.

    Fixes <http://code.opencv.org/issues/3350>.

commit f70d63e4c9ad3be61afe451c7d33beac90393d88
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Nov 18 16:33:54 2013 +0400

    added INTER_AREA interpolation to ocl::resize

commit 26d3a1a0361618601665836ccf43e8c7cc3ce9c9
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Mon Nov 18 18:19:38 2013 +0400

    Prebuilt libnative_camera_xxx updated.

commit bb4bf7a1f917d2eb0e7db802b4006d44aa8b895a
Merge: b8c46f4 9e3a297
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 18 18:09:43 2013 +0400

    Merge pull request #1811 from Nerei:fixed_some_build_errors

commit 04d293d2c401be87882a18d51302f593762f8a82
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Sun Nov 17 11:42:13 2013 +0400

    Initial NativeCamera support for Android 4.4 KitKat.

commit cdf4e4e0b505b9eea9c46d82eaff7a40ebb107d5
Merge: 8b99a1e 13bb236
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 18 17:49:40 2013 +0400

    Merge pull request #1810 from Nerei:2.4

commit e3f450cffb7ae0f33a8bc768e1cb2b61cf58ff4a
Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date:   Mon Nov 18 09:30:12 2013 +0400

    NativeCamera build with AndroidStub backported from OpenCV master.

commit 8b99a1e85011f3649e2b65628274ec2f95070153
Merge: 7703b63 83cefcb
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 18 17:26:38 2013 +0400

    Merge pull request #1806 from akarsakov:ffmpeg_without_iconv

commit 7703b63cae1a88f8358612f118663386caa3356e
Merge: 4fd1960 2b106db
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 18 15:48:27 2013 +0400

    Merge pull request #1722 from StevenPuttemans:feature_1631_second

commit 4fd1960425f90ecce8a20d957af13cad764e1e81
Merge: 3f927ab 327d9f2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 18 15:16:36 2013 +0400

    Merge pull request #1807 from KonstantinMatskevich:intel_bug

commit 3f927abb4d2f81403a54e2ea1c508abd0a27bc81
Merge: f5ded41 cc237b7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 18 14:55:24 2013 +0400

    Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn

commit 83cefcb92ad4f99f2ea240210438bb4d3e2579b8
Author: Alexander Karsakov <alexander.karsakov@itseez.com>
Date:   Mon Nov 18 13:56:02 2013 +0400

    FFmpeg 2.0.2 32-bit builded with mingw (4.6.1) with following additional options: --enable-w32threads --disable-iconv --cpu=i686 (workaroud for http://trac.ffmpeg.org/ticket/2363)

commit 327d9f274ba1c67bf958af715aec21c94b0ff84b
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Mon Nov 18 12:55:15 2013 +0400

    fixed Split for device version equals 78712

commit 0e1717c14c3f0928fa162c01b728cf6a830c7d11
Author: Konstantin Matskevich <konstantin.matskevich@itseez.com>
Date:   Fri Nov 15 17:26:18 2013 +0400

    fixing bugs for Intel platform CPU device

commit f5ded410161252ee22a063b783e659c720efdf63
Merge: f95ff0a 0a698bf
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 18 12:20:58 2013 +0400

    Merge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz

commit 2b106db02fcaf3b8cad46148210f788e6fae9202
Author: StevenPuttemans <steven.puttemans@kuleuven.be>
Date:   Wed Oct 30 13:34:27 2013 +0100

    Applied all fixes related to translating C to C++ code
    Also fixed some typos and code alignment
    Also adapted tutorial CPP samples
    Fixed some identation problems

commit 9e3a29701eee6055f0bcb36fae05a58b203bb919
Author: Anatoly Baksheev <no@email>
Date:   Sun Nov 17 15:18:39 2013 +0400

    Viz code beautification

commit efcc341219872ae830a8c044f9e5dbd6c1afddb6
Author: Anatoly Baksheev <no@email>
Date:   Sun Nov 17 15:18:15 2013 +0400

    added viz tutorial 3 test

commit e154bce2599e3af5248ed36392de39c3f5c6f665
Author: Anatoly Baksheev <no@email>
Date:   Sun Nov 17 14:03:38 2013 +0400

    fixed compilation for vs2008

commit d8600d3d13eefedf01863c836de81e39ccb42384
Author: Anatoly Baksheev <no@email>
Date:   Sat Nov 16 21:27:03 2013 +0400

    fixed all Viz warnings
    moved some headers to precomp.hpp

commit 5c6248005a1573515ec3df399cb23f8105750463
Author: Anatoly Baksheev <no@email>
Date:   Sat Nov 16 21:04:21 2013 +0400

    fixed warnings

commit dfef42f94e1c56730c0dd47b275539ee639d1606
Author: Anatoly Baksheev <no@email>
Date:   Sat Nov 16 20:56:42 2013 +0400

    Fixed Viz compilation: removed CV_EXPORTS from cv::viz::Color. The macro forced instantiation of all Matx<double, 4, 1> constructors and triggered StaticAssert there.

commit 0dad07047320a667bc7ba7f9529ff9d7066a35f7
Author: Anatoly Baksheev <no@email>
Date:   Sat Nov 16 19:56:08 2013 +0400

    Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'

commit d275e29ea4b68606ccc5e79e1d4ae3fd6123709a
Author: Anatoly Baksheev <no@email>
Date:   Tue Oct 15 17:34:20 2013 +0400

    compilation & warnings

commit 13bb236ad5e386c2571e40673dd4440eb1bc9968
Author: Anatoly Baksheev <no@email>
Date:   Sat Nov 16 21:06:13 2013 +0400

    fixed some warnings

commit 8f6f9c3e58cfd64ab8d34cdf83cdcb636b4f7608
Author: Anatoly Baksheev <no@email>
Date:   Sat Nov 16 20:14:01 2013 +0400

    compilation for VS2008

commit 0a698bf145befee0995274c7152eeb316fac6413
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Fri Nov 15 18:49:11 2013 +0400

    ocl: fix cvtColor XYZ: variables on stack

commit cc237b7aba0e70498ad3ebb7f4c579875e2cf20a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Nov 15 13:48:14 2013 +0400

    generalized ocl::resize for all data types (INTER_NEAREST mode)

commit 615d6c22d1c09f36a8951da8d170bc3ce44afb5d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Nov 15 19:41:53 2013 +0400

    Switched OpenCV to a 3-component version number.

    Epoch is gone; now the version component names in C++ and CMake
    are consistent (except REVISION corresponds to PATCH).

commit f95ff0a3528e2316fd516e9f97bc3ee7072c5397
Merge: 4e2ec7b 428fb72
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Nov 15 16:52:55 2013 +0400

    Merge pull request #1802 from SpecLad:cmake-templates

commit 4e2ec7b97dd10e3bf3392f303b88c46d25dff3f3
Merge: 2e79dde fe76b21
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Nov 15 15:55:29 2013 +0400

    Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor

commit 2e79dde35737654cb68a094bac0970a734decde6
Merge: 01f8645 3b7acf2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Fri Nov 15 11:51:59 2013 +0400

    Merge pull request #1799 from SpecLad:avformat-53-6

commit cebf109d3950be362c590e7602d02240be08054b
Author: moodoki <moo@papermoon>
Date:   Fri Nov 15 00:27:07 2013 +0800

    Replaced code in .rst file with literalinclude as suggested

commit 428fb726251c1ab06e7056ceca2e55b7146c4ef9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 14 19:14:38 2013 +0400

    Made the generated file templates' naming more consistent.

    The general convention is <output file name> + ".in".

commit 3b7acf26573b333fb15962a8c771f8544f46d554
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 14 17:25:46 2013 +0400

    Fix building with FFmpeg 0.8.

    avformat_find_stream_info was introduced in Libav avformat 53.3,
    but it was only merged to FFmpeg in avformat 53.6.

    In Libav avformat 53.3-53.5 av_find_stream_info is not removed
    (only deprecated), so this shouldn't break building with that.

commit 01f8645bc843fd04fdf390a2360dd4caea3a9187
Merge: be88b20 8e944cf
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 14 16:43:50 2013 +0400

    Merge pull request #1794 from vrabaud:2.4

commit be88b20154ac7f2fe6109345743432be8303d158
Merge: 84da6ca 1b7c5b2
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 14 14:46:42 2013 +0400

    Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor

commit 84da6ca26593e7edeeb2b9ff94a9dd07bc586ead
Merge: 19b3064 c38e4f9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 14 14:46:06 2013 +0400

    Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps

commit 19b3064706ea883f0764de9e80730dccd781a03e
Merge: 15f4292 6770c04
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Thu Nov 14 14:45:50 2013 +0400

    Merge pull request #1790 from ilya-lavrenov:ocl_ref

commit 8e944cfe70679f2c605899d354606d09bec8ccb0
Author: Vincent Rabaud <vrabaud@aldebaran-robotics.com>
Date:   Thu Nov 14 11:45:42 2013 +0100

    cleaner fix

commit fe76b2116a76b6bc1dab0fac4dec35366d45da1e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Nov 14 12:02:32 2013 +0400

    added RGBA <-> mRGBA

commit b8de81749c3071b98174e24b0a5df950f1140cc9
Author: moodoki <moo@papermoon>
Date:   Thu Nov 14 00:22:20 2013 +0800

    Slight modification to example code for FLANN matcher with comment on #3344

commit 1b7c5b201d2d9718068da9676bd2e066dbc0584d
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 13 19:35:24 2013 +0400

    added HLS -> RGB[A][FULL] conversion

commit 98915e06bc7d1bb93f29e0c99f03264606fba6a0
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 13 19:08:37 2013 +0400

    added HSV -> RGB[A][FULL] conversion

commit 3bdd9626f3ad0e8ee9719e19e125292b22ad3594
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 13 17:41:40 2013 +0400

    added RGB[A] -> HLS[FULL] conversion

commit 15f4292a1f30b8b75f9a374ac14bd731bdbe35bf
Merge: 411629a fb326a5
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 13 17:21:52 2013 +0400

    Merge pull request #1788 from alalek:perf_test_skip

commit ee7c74ceeb2b28fdde0229b9f51d33071110a85d
Author: Vincent Rabaud <vrabaud@aldebaran-robotics.com>
Date:   Wed Nov 13 14:20:09 2013 +0100

    return when OpenCV is found

commit af7c6144384f4b26a94575eac7ac97f70d32aa50
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 13 17:09:05 2013 +0400

    added RGB[A] -> HSV[FULL] conversion

commit 411629a57dedacc62b8d8e66f60b85fd76a73373
Merge: 54ea5bb b8e3d3f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 13 17:00:20 2013 +0400

    Merge pull request #1786 from SpecLad:cap-images-file-pattern

commit 54ea5bbac77a9dbd10f314ee1ee2b10e3b6c44fa
Merge: 28e0d3d 1850599
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 13 15:53:42 2013 +0400

    Merge pull request #1779 from perping:integral_2.4

commit 28e0d3d771d9db9d03ea55f8d0504558e17139b2
Merge: 376993b 405227d
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 13 15:52:42 2013 +0400

    Merge pull request #1784 from SpecLad:ffmpeg-no-png

commit 9007a02302809aefe5da9bd7f1bd2fd5a4640cf6
Author: Vincent Rabaud <vrabaud@aldebaran-robotics.com>
Date:   Wed Nov 13 12:25:44 2013 +0100

    fixes http://code.opencv.org/issues/3367

commit fb326a58fc0b9c1b8bb64e115ab85b2354616729
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Tue Nov 12 18:59:43 2013 +0400

    ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

commit f1873bbca19400110f6a0fa4333453165ebdc963
Author: Alexander Alekhin <alexander.alekhin@itseez.com>
Date:   Tue Nov 12 18:15:50 2013 +0400

    perf tests: allow to skip performance tests

commit 6770c040739da10137cea34b60950e94eab985dc
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Nov 12 16:50:42 2013 +0400

    refactored some functions from ocl arithm

commit c38e4f9639cfeb834c8e94012ab6f968e2c0e07b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Nov 13 13:04:02 2013 +0400

    added eps to ocl::buildWarpPerspectiveMaps perf test

commit 376993be4c887a0f2be053905ecf7f1b27a1253d
Merge: df6bce3 96121a6
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 13 12:20:08 2013 +0400

    Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn

commit df6bce372ba7c2ba0918d8fc059af3785f9c8992
Merge: a81efdb 0bf7350
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Wed Nov 13 12:16:01 2013 +0400

    Merge pull request #1789 from ilya-lavrenov:ocl_minMaxLoc

commit 185059959bf43251638f7e8cdb14c5bd7753d450
Author: perping <erping@multicorewareinc.com>
Date:   Wed Nov 13 10:19:09 2013 +0800

    fix haar

commit 1e2fb6de3065547d7107cb6eec628c9f7f0802da
Author: perping <erping@multicorewareinc.com>
Date:   Wed Nov 13 10:09:39 2013 +0800

    fix match_template and haar

commit 3314bc94b61c458f9b868cb8156f9d1467a78f33
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 12 19:38:59 2013 +0400

    Reworked documentation building to work with extra modules.

    The main problem with extra modules is that they're located outside
    of the OpenCV root, while Sphinx requires that all documents are
    within the documentation root. To circumvent this, we create a
    "fake root" and copy all documentation (as well as all files that
    it depends on) there. It's a bit messy, but what can you do.

    As a bonus, this eliminates the need to generate modules/refman.rst
    inside the source tree.

commit 0bf73506159a74903633580a6b4ff50ca6d8cd63
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Tue Nov 12 19:14:40 2013 +0400

    fixed compilation of ocl::minMaxLoc for Intel device

commit f02ce90559898ed8e92d38180ada8c8a218b1e48
Author: huangs <thuhuangs09@gmail.com>
Date:   Tue Nov 12 22:37:23 2013 +0800

    minX1 should be max(-maxD,0) not max(maxD,0), avoid black band at left

commit b8e3d3f79163b7758d23ae51263d64371a69b638
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 12 16:15:41 2013 +0400

    In the image sequence capture, only search for the ordinal in the file name.

    Searching in directory names can yield confusing results; e.g. if
    the input is "jpeg2000/image1.jp2", it will infer the pattern
    "jpeg%04d/image1.jp2", which is likely not what the user intended.

    If the user really desires for the variable part to be in the
    directory name, it can always use an explicit pattern.

commit 96121a66c583000bc9a91fe97fe00cb4292fe251
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Nov 11 20:08:40 2013 +0400

    kernel warnings on AMD

commit a81efdbb251ed56f4bdb9346c9f0f74c2931645c
Merge: 8347054 eda6360
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 12 14:26:50 2013 +0400

    Merge pull request #1775 from ilya-lavrenov:ocl_cvtColor

commit d6e0ef2710071f93953837ec44a21d81218ee88a
Author: perping <erping@multicorewareinc.com>
Date:   Tue Nov 12 18:13:44 2013 +0800

    fix linux warning.

commit dee584ee152e25df476878be801b15b4236d3204
Author: perping <erping@multicorewareinc.com>
Date:   Tue Nov 12 17:54:03 2013 +0800

    fix haar

commit 834705490e884ce20bcb38d80453fe67938dc249
Merge: ef4eadd daedc6f
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 12 12:53:33 2013 +0400

    Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat

commit ef4eadd5d35e11dc9a13bb27b3b428d053660ff1
Merge: 46e423d 760b718
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 12 12:40:13 2013 +0400

    Merge pull request #1766 from ilya-lavrenov:ocl_remap_linear

commit 46e423d217ecf3a13e7203910972037b3dc42fff
Merge: 6773914 3727168
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 12 12:26:37 2013 +0400

    Merge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps

commit 6773914144416c55fece9fa648ff8bb2d8fe906f
Merge: e4dee5b eff53e9
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Tue Nov 12 11:52:49 2013 +0400

    Merge pull request #1783 from SpecLad:cap-no-pattern

commit 8af626d295a18c84f4b35680222885435e8a4506
Author: perping <erping@multicorewareinc.com>
Date:   Tue Nov 12 13:56:47 2013 +0800

    fix some bug about haar and match_template.

commit eda6360fa329c12edbdec55ef0bbfffd63f6c590
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Nov 11 16:30:23 2013 +0400

    added RGB5x5 <-> Gray

commit 93120775cd8af9381a8ab10660b575113b81e630
Author: Philippe FOUBERT <philippe.foubert@free.fr>
Date:   Mon Nov 11 20:40:18 2013 +0100

    Using four spaces for indentation.

commit a4ceb7b6ee9aa7c9507195de34ed3a67ff014ace
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Mon Nov 11 19:29:39 2013 +0100

    Fix compilation issues.

commit 405227d531f638a646e93f30b04888cdb96991c7
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 11 18:30:04 2013 +0400

    Replaced the image used in the Highgui_Video.ffmpeg_image test.

    Our prebuilt FFmpeg Windows binaries don't have PNG support enabled
    (because that requires zlib), so that makes a PNG image a bad choice
    for this test.

    When FFmpeg doesn't support PNG, VideoCapture falls back to the
    "image sequence" implementation, which doesn't work for single images.

commit daedc6f45428cc96100aa4c9de48105f136a2437
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Nov 11 17:53:21 2013 +0400

    removed 2000x2000, 4000x4000 from test sizes of ocl::adaptiveBilateralFilter

commit eff53e95f9a4a504417026493b83c75a5e1bdfd3
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 11 18:02:56 2013 +0400

    Fixed the "image sequence" capture not failing when a pattern isn't found.

    at can't be a null pointer, so the condition was always false, and
    a nonsensical pattern like "image.png%00d" was being inferred.

commit 3727168b50cc1693366f9cd517f70f5b46dc593e
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Nov 8 18:43:15 2013 +0400

    added a performance test for ocl::buildWarpPerspectiveMaps; moved warps to a separate file

commit e4dee5b3724227e97af6870d69d79852fbfa0acf
Merge: 0ac6124 5beb887
Author: Roman Donchenko <roman.donchenko@itseez.com>
Date:   Mon Nov 11 17:00:31 2013 +0400

    Merge pull request #1780 from ilya-lavrenov:ocl_m_pi

commit 1f421fce01efbfc2472d0b191cfccdd98da2f708
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Nov 11 13:04:55 2013 +0400

    added RGB5x5 <-> RGB conversion

commit 05d93757597c68fc986cbab165707c2ef9f7e3d1
Author: Philippe FOUBERT <philippe.foubert@free.fr>
Date:   Mon Nov 11 10:26:28 2013 +0100

    Trailing whitespace removal.

commit 73b34e3f858c74c2da435a9b587455fdd830d161
Author: perping <erping@multicorewareinc.com>
Date:   Mon Nov 11 15:06:58 2013 +0800

    fix warning.

commit 50579d2524cf7235f113b7e414121427d0cc339d
Author: perping <erping@multicorewareinc.com>
Date:   Mon Nov 11 14:31:02 2013 +0800

    Make Integral sum support cv_32f, sqsum support cv_64f.

commit 5beb88724709d4ac81abe37323187c752024b36c
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Mon Nov 11 00:53:26 2013 +0400

    replaced custom PI by OpenCL M_PI constant

commit 3cc9502c90836c3fcda86edfb29dbf301477ae6b
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Nov 10 20:56:18 2013 +0400

    added RGB[A] <-> BGR[A] conversion to ocl::cvtColor

commit 8b0fc04d935f101a9f573af41179c0cccfab86a7
Author: Philippe FOUBERT <philippe.foubert@free.fr>
Date:   Sun Nov 10 17:46:59 2013 +0100

    Fix the build of OpenCV with XIMEA on Windows 64 bits:
      - crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions)
      - the "CMAKE_CL_64" variable is not initialized when using mingw

    PR#1039 modified to be able to merge on branch 2.4

commit 581a3e444d4f9be398a0517dbe57ad913556a1d3
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Nov 10 14:30:37 2013 +0400

    added XYZ to RGB conversion to ocl::cvtColor

commit 5e02b20482fff0954344f80d3603733c75a7ff72
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sun Nov 10 13:38:09 2013 +0400

    added RGB -> XYZ conversion to ocl::cvtColor

commit 33ae64201c024ed3af1cc9eb38e64e58842c3d87
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Nov 9 19:14:38 2013 +0400

    color.cpp refactoring: created generic interface for toRGB and fromRGB callers

commit a57030a0cda4a144c1b800ce5e7efb6c127aa571
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Sat Nov 9 17:03:30 2013 +0400

    added YCrCb to RGB, BGR, RGBA, BGRA modes to ocl::cvtColor

commit eba6754b061efdcf9941fb2aed88cffa556e1f76
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Nov 8 19:07:06 2013 +0400

    fixed ocl::cvtColor for CV_YUV2BGRA and CV_YUV2RGBA

commit 8b57893e406c5df6dbbb29a2c805005b47db9428
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Nov 8 18:42:13 2013 +0400

    added an accuracy test for ocl::buildWarpPerspectiveMaps

commit 4248f8221146a929b1ac98f24d58c699e8dafa03
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Fri Nov 8 18:40:53 2013 +0400

    added ROI support to ocl::buildWarp*Maps functions

commit 9a0d06247a452654f48ccc5e2e77c39998172122
Author: Baichuan Su <baichuan@multicorewareinc.com>
Date:   Thu Nov 7 15:04:17 2013 -0800

    Fix the whitespace warning.

commit 760b718981cc87530c04d708547ec97bc4ccecc8
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Thu Nov 7 19:50:06 2013 +0400

    added CV_16SC2 && CV_16UC1 map types support to ocl::remap (INTER_LINEAR mode)

commit 99a00d3dd968af97feebb3f3a9c8d8fd6821bb36
Author: Baichuan Su <baichuan@multicorewareinc.com>
Date:   Thu Nov 7 09:56:59 2013 -0800

    Fix merge conflicts

commit befcbf56fedf8011620657509a8966be33702a79
Author: Baichuan Su <baichuan@multicorewareinc.com>
Date:   Thu Nov 7 08:46:11 2013 -0800

    A minor fix.

commit f0de1a08b8fcac4a50d36e6dab8561b665eba987
Author: Baichuan Su <baichuan@multicorewareinc.com>
Date:   Tue Nov 5 16:25:56 2013 -0800

    Fix ocl::calcHarris not support CV_32FC1 bug.

commit c88fa27b1d1d71ad8b4b8c0a5630e1577f6c968d
Author: Bo Hu <bh@hoverinc.com>
Date:   Tue Oct 29 10:35:41 2013 -0700

    Removed trailing whitespace in cap_qtkit.mm.

commit 114579c33bd6a11f4870d78bd6dc8922ec93a5fe
Author: Bo Hu <bh@hoverinc.com>
Date:   Thu Oct 24 12:35:33 2013 -0700

    Added proper testing of the end of quicktime video files.

    CvCaptureFile::grabFrame() always returns 1 regardless, which causes
    dead loop when relying on the return value of VideoCapture::read().

commit d57a7008f1437076ed57629bb95c42e88d24995a
Author: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date:   Wed Oct 9 17:42:03 2013 +0400

    fixed cmd parser when arg is like -+

commit 0934344a3d5ed5d7e4c66fb1307fdaa0ec0d7bed
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Thu Sep 12 18:38:49 2013 +0200

    Update sample and code with external computation of HOG detector.

commit 2fe340bf8a8620852b5f2dd083e8bedc4fbff53e
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Thu Sep 5 17:33:08 2013 +1200

    adding sample to train HOG and compare it with default people detector.

commit 464985205c3a011dec5a789adb38f7a50ebf9df9
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Thu Sep 5 16:05:54 2013 +1200

    Update PR after mdim review.

commit 4fbd5707f7dc2985481d941c768ca2eb14556127
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Thu Aug 22 17:34:31 2013 +1200

    Fix warning on precision lost due to double to float conversion.

commit 7f3273c77f72d3cb22500d2434709eb2b540dbdf
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Thu Aug 22 15:00:32 2013 +1200

    Adding an export for HOGDetector compatibility.
    An SVM train with HOG could export a single vector for HOGDetector.

commit 43c98188953f1a31b333346495883c7c112a1fce
Author: Mathieu Barnachon <mathieu.barnachon@gmail.com>
Date:   Sun Aug 18 11:32:04 2013 +1200

    Adding class for BOW image matcher (Feature #3005).
    Same prototype as BOWImgDescriptorExtractor, but do only the matching.
    If the feature is accepted, the BOWImgDescriptorExtractor and BOWImgDescriptorMatcher should probably refactor with inheritance.
    Add a class to compute the keypoints, descriptors and matching from an image should be added to.