Merge remote-tracking branch 'origin/2.4' into merge-2.4
[profile/ivi/opencv.git] / modules / ocl / src / match_template.cpp
2013-06-25 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-06-19 Roman DonchenkoMerge remote-tracking branch 'origin/2.4'
2013-06-13 Roman DonchenkoMerge pull request #696 from znah:detect_method
2013-06-10 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-06-05 Roman DonchenkoMerge remote-tracking branch 'origin/2.4'
2013-05-27 Roman DonchenkoMerge remote-tracking branch 'origin/2.4' into merge-2.4
2013-05-22 Roman DonchenkoMerge commit 'b51a1a7d' (PR #895 from 2.4)
2013-05-22 Andrey PavlenkoMerge pull request #797 from vhdirk:installheaders
2013-05-21 Roman DonchenkoMerge remote-tracking branch 'origin/2.4'
2013-04-29 alexandre benoitresolved conflicts, updated retina class interface...
2013-04-17 Andrey KamaevMerge branch '2.4'
2013-04-16 Andrey KamaevMerge pull request #809 from taka-no-me:drop_python1
2013-04-15 Andrey KamaevMerge pull request #812 from bitwangyaoyao:master_uhp
2013-04-13 Andrey KamaevMerge pull request #813 from bitwangyaoyao:master_fix
2013-04-13 Andrey KamaevMerge pull request #810 from pengx17:master_fix_ocl_tmflag
2013-04-12 Andrey KamaevMerge branch '2.4'
2013-04-12 Andrey KamaevMerge pull request #803 from taka-no-me:split_c_cpp3
2013-04-12 Andrey KamaevRemove C API from OpenCL module
2013-04-12 Vadim PisarevskyMerge pull request #798 from pengx17:master_ocl_mleak
2013-04-12 peng xiaoFix a compilation error when HAVE_CLAMDFFT is on.
2013-04-11 Andrey KamaevMerge pull request #795 from taka-no-me:move_imgproc_ut...
2013-04-10 Andrey KamaevMove border type constants and Moments class to core...
2013-04-09 Andrey KamaevMerge pull request #785 from taka-no-me:split_c_cpp2
2013-04-09 Andrey KamaevMerge pull request #783 from pengx17:master_matchTempla...
2013-04-08 peng xiaoFix some compilation errors and warnings.
2013-04-08 peng xiaoocl: Add dft based convolve implementation.
2013-04-05 Andrey KamaevMerge branch '2.4'
2013-04-03 Andrey KamaevMerge pull request #716 from asmorkalov:winrt
2013-04-01 Andrey KamaevMerge pull request #713 from bitwangyaoyao:2.4_perf
2013-04-01 Andrey KamaevMerge pull request #720 from taka-no-me:drop_sort
2013-03-29 Andrey KamaevMerge branch '2.4'
2013-03-29 Andrey KamaevMerge pull request #694 from mistydemeo:fix_java_detection
2013-03-29 Andrey KamaevMerge pull request #707 from pengx17:2.4_surf
2013-03-29 Andrey KamaevMerge pull request #704 from taka-no-me:folders
2013-03-27 Andrey KamaevMerge pull request #712 from apavlenko:fix-2912
2013-03-26 Andrey KamaevMerge pull request #705 from bitwangyaoyao:2.4_oclFix
2013-03-26 Andrey KamaevMerge pull request #692 from vpisarev:refactor_calib3d_...
2013-03-26 yaomore fix of mismatch
2013-03-25 Andrey KamaevMerge pull request #684 from vhdirk:gstreamer-1.x
2013-03-25 Andrey KamaevMerge pull request #700 from cuda-geek/fix_build_with_cuda
2013-03-25 Andrey KamaevMerge pull request #699 from jacob-baines/patch-1
2013-03-25 Andrey KamaevMerge pull request #695 from taka-no-me/cv_str
2013-03-22 Andrey KamaevDrop cv:: prefix from cv::String used inside the cv...
2013-03-22 Andrey KamaevAll modules (except ocl and gpu) compiles and pass...
2013-03-21 Andrey KamaevMerge branch '2.4'
2013-03-11 Andrey KamaevMerge branch '2.4'
2013-03-05 Andrey KamaevMerge pull request #491 from Daniil-Osokin:cvtRGB2YUV420p
2013-03-04 Andrey KamaevMerge release 2.4.4
2013-02-28 Andrey KamaevMerge pull request #525 from odeniz:2.4
2013-02-28 Andrey KamaevMerge branch '2.4'
2013-02-27 Andrey KamaevMerge pull request #462 from kobigurk:master
2013-02-27 Andrey KamaevMerge pull request #511 from aritzlc:master
2013-02-27 Andrey KamaevMerge pull request #566 from FabricioS:master
2013-02-26 cuda-geekMerge pull request #543 from taka-no-me:explicit_stl
2013-02-26 Andrey KamaevMerge pull request #490 from mschoeler:master
2013-02-25 Andrey KamaevMerge pull request #524 from LeonidBeynenson:add_float_...
2013-02-25 Andrey KamaevRemove all using directives for STL namespace and members
2013-02-25 Andrey KamaevMerge pull request #540 from hgaspar:244
2013-02-24 Andrey KamaevMerge pull request #534 from emchristiansen:c++11
2013-02-24 Andrey KamaevMerge branch 2.4
2013-02-24 Andrey KamaevMerge pull request #538 from NCBee:patch-2
2013-02-24 Andrey KamaevMerge pull request #537 from bitwangyaoyao:2.4_fixWarpA...
2013-02-24 Andrey KamaevMerge pull request #535 from bitwangyaoyao:2.4_clean
2013-02-23 yaoremove the empty implementation when HAVE_OPENCL not...
2013-02-15 Andrey KamaevMerge pull request #301 from emchristiansen:javasample2.4
2013-01-29 cuda-geekMerge pull request #328 from jet47:new-gpu-fixes
2013-01-28 Andrey KamaevMerge branch 'fix_jpg2000' into 2.4
2013-01-25 Andrey KamaevMerge branch '2.4'
2013-01-25 Andrey KamaevMerge pull request #337 from taka-no-me:ocl_appsdk
2013-01-25 Andrey KamaevFix OpenCL build warnings
2012-10-22 Andrey KamaevMerge branch '2.4'
2012-10-22 Andrey KamaevMerge pull request #55 from vpisarev/ocl_fixes
2012-10-22 Andrey KamaevMerge pull request #48 from kazuki-ma/2430_ostream_24
2012-10-22 Vadim PisarevskyMerge pull request #71 from NikoKJ/ocl4_2.4.3
2012-10-22 Nikoremove redundant OPENCL_DIR flag
2012-10-16 Andrey KamaevMerge branch 'release2.4.3' into 2.4
2012-10-12 Andrey KamaevMerge pull request #29 from thorikawa/feature-523
2012-10-12 Andrey KamaevMerge pull request #40 from emchristiansen/manualBRISKFREAK
2012-10-11 Andrey KamaevMerge pull request #34 from roynos/master
2012-10-11 nikoformat files to ANSI C style with coolformat
2012-09-20 yaoremove warnings of some functions in ocl module
2012-09-05 Yury ZemlyanskiyMerge remote-tracking branch 'itseez/opencv'
2012-09-04 Andrey KamaevMerge branch 'android-toolchain'
2012-09-04 Alexander SmorkalovMerge branch 'master' of git://code.opencv.org/opencv
2012-09-03 Andrey KamaevMerge pull request #28: add openexr to 3rdparty libs
2012-09-03 yaoupdate some of the functions in ocl module to the lates...
2012-08-14 Daniil OsokinMerge branch 'branch1'
2012-08-11 bitwangyaoyaofix ocl/match_template compiling error on Linux
2012-08-09 Philipp WagnerMerge branch 'master' of git://code.opencv.org/opencv
2012-08-07 Alexander MordvintesvMerge branch 'master' of code.opencv.org:opencv
2012-08-07 Vadim PisarevskyMerge remote-tracking branch 'origin/master'
2012-08-06 yaoMerge branch 'master' of git://code.opencv.org/opencv
2012-08-06 yaoAdd blend, columnsum, pyrUp/down, matchTemplate for...