acc2ca484c
Merge pull request #1425 from pengx17:master_retina_ocl_fix
2013-09-10 18:29:25 +04:00
242e4254f3
Merge pull request #1427 from SpecLad:merge-2.4
2013-09-10 18:28:20 +04:00
7238479813
Merge pull request #1415 from znah:sfm_py
2013-09-10 11:37:05 +04:00
54c6830937
Merge pull request #1422 from SpecLad:nat-act-upd
2013-09-10 11:32:09 +04:00
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
8767c47463
Fix whitespaces.
2013-09-10 15:13:53 +08:00
a92721b569
Fix retina ocl on NV.
...
Previously we incorrectly assumed data was aligned in 16 bytes, which should be 32.
2013-09-10 14:33:23 +08:00
4ee5599d4b
Merge pull request #1381 from 23pointsNorth:master
2013-09-09 19:53:56 +04:00
3609bb41a7
Updated the native activity sample to master's API.
2013-09-09 18:17:02 +04:00
59dd5aea00
Reenabled adding native app glue for Android samples.
2013-09-09 18:16:20 +04:00
d5aaab745f
Merge pull request #1282 from nailbiter:optimDS
2013-09-09 18:10:13 +04:00
531471b0aa
Merge pull request #1412 from jet47:gpu-match-template-nocuda
2013-09-09 16:49:33 +04:00
84435ba741
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
2013-09-09 16:46:33 +04:00
574f011a33
Merge pull request #1410 from SpecLad:module-samples
2013-09-09 15:03:41 +04:00
2208248dda
Merge pull request #1416 from asmorkalov:doc_hough_circle
2013-09-09 15:03:08 +04:00
79d51c3398
expose findEssentialMat, decomposeEssentialMat and recoverPose to Python
2013-09-09 14:02:05 +04:00
40212e1eb9
Link to Hough Circle Transform sample fixed in tutorial.
2013-09-09 13:53:49 +04:00
cb0fc230f1
Merge pull request #1387 from vpisarev:ipp_imgwarp
2013-09-09 12:54:32 +04:00
45512a93e0
Merge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp
2013-09-09 12:39:12 +04:00
77a2529eb7
Merge pull request #1408 from jet47:new-ptr-fixes
2013-09-09 12:27:27 +04:00
74578f56a9
Merge pull request #1403 from lluisgomez:scene_text_detection_NM_fix
2013-09-09 12:05:57 +04:00
a03c6decaf
Merge pull request #1409 from SpecLad:imgproc-test-memerr
2013-09-09 12:03:58 +04:00
6ad72bfcb4
removed detail:: prefix int video_reader
...
it conflicts with cv::detail
2013-09-09 10:57:51 +04:00
a0771630b0
restored original behaviour or release functions for (Buffer and Texture)
2013-09-09 10:57:45 +04:00
c439702f0c
added missing gpu::matchTemplate implementation for non-CUDA build
2013-09-09 10:51:44 +04:00
2fb0d23104
Removed unnecessary process for conversion to 4-channel format.
2013-09-07 10:40:30 +08:00
cd33ca0009
changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.
2013-09-06 19:10:53 +02:00
ff1eb0d582
Merge pull request #1407 from ilya-lavrenov:ocl_test_mog
2013-09-06 16:58:21 +04:00
8525fb0776
Merge pull request #1406 from SpecLad:gpu-resize-warn
2013-09-06 16:55:44 +04:00
4f109d1292
Fixed a memory access error in CV_Remap_Test::generate_test_data.
...
begin_x[1] is not the second component of the element, but the element
after the one pointed to begin_x. When begin_x points to the last
element, that line overwrites data past the end of the allocation, which,
during my tests, happened to contain the reference count for the matrix.
Hilarity ensues.
2013-09-06 16:02:41 +04:00
6ef1d456dd
fixed rebase conflicts
2013-09-06 14:00:11 +02:00
2de8487e58
Fixed a few tests that use uninitialized inputs.
2013-09-06 15:53:42 +04:00
b7eff94137
fixed compilation issues with new Ptr
2013-09-06 15:52:07 +04:00
f88d8b9545
Merge pull request #1405 from SpecLad:retina-ocl-warn
2013-09-06 15:10:06 +04:00
512111af9c
removed blank line at EOF
2013-09-06 12:32:10 +02:00
1cc6502db3
removed unnecessary commented block
2013-09-06 12:32:10 +02:00
04913f5af7
removed trailing whitespaces
2013-09-06 12:32:10 +02:00
b9a5e919e2
better parameter settings for the ERFilter sample
2013-09-06 12:31:49 +02:00
15511bff40
better classifiers performance by training them with a new dataset of "manually" selected regions
2013-09-06 12:31:49 +02:00
f4d01175b8
fixed a bug in the calculation of the number of inflexion points feature
2013-09-06 12:31:49 +02:00
765921cc25
fixed a typo error in the default min_Probability param of CreateERFilterNM2
2013-09-06 12:30:22 +02:00
dba336c0e3
fixed a bug in the non-max-suppression filter procedure
2013-09-06 12:27:19 +02:00
27947474ec
fixed data path
2013-09-06 13:25:56 +04:00
7d62fdc62c
GPU resize: removed a few parameter names to avoid unused parameter warnings.
2013-09-06 12:46:58 +04:00
439e90f4f4
retina_ocl.cpp: removed two unused arrays.
2013-09-06 12:34:37 +04:00
af594c8e44
retina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning.
2013-09-06 12:33:54 +04:00
bfd84dc5d5
Merge pull request #1402 from SpecLad:ocl-samples
2013-09-06 12:20:03 +04:00
0f4089f3c3
Merge pull request #1404 from ilya-lavrenov:stdcall
2013-09-06 12:09:59 +04:00
bad927325f
Merge pull request #1281 from SpecLad:the-smartest-pointer
2013-09-06 11:53:34 +04:00
172242a94e
Revised performance test according to the feedback of the community.
2013-09-06 13:39:41 +08:00
Roman Donchenko