hbristow
78dc2c5423
Upadated include tree to match the rest of opencv. Added install configuration for custom mex compiler
2013-08-28 17:06:19 +10:00
hbristow
52dc51a62c
Added custom OpenCV mex compiler
2013-08-28 12:01:34 +10:00
peng xiao
287c8a3330
Let ocl::context only be initialized once in retina_ocl test.
2013-08-28 09:17:05 +08:00
Fedor Morozov
9f9873017c
HDR test changes
2013-08-28 02:17:49 +04:00
ilya-lavrenov
3c86aa4ae1
appended ocl::finish to test_cycle defines
2013-08-28 00:39:58 +04:00
Baris Evrim Demiroz
9a560a5a8d
Added a new tutorial "Using OpenCV Java with Eclipse". Removed information related to Eclipse from "Desktop Java" tutorial.
2013-08-27 22:42:03 +03:00
Roman Donchenko
2d6f35d6ed
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
Roman Donchenko
d32b62a177
Merge pull request #1341 from roynos:master
2013-08-27 17:47:56 +04:00
Roman Donchenko
dd25f416a6
War on Whitespace, master edition: tabs.
2013-08-27 17:13:53 +04:00
Roman Donchenko
cd5b8af609
Restored one executable bit that was lost during the war on whitespace.
2013-08-27 14:39:43 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
4d06c4c7b6
Merge commit '43aec5ad^' into merge-2.4
...
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
2013-08-27 13:23:26 +04:00
Roman Donchenko
657699a1da
Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5
2013-08-27 12:43:36 +04:00
Roman Donchenko
45a0b39a73
Merge pull request #1339 from mdim:ml_cpp_wrappers_fix
2013-08-27 12:37:33 +04:00
Roman Donchenko
0e32d7ccb3
Merge pull request #1346 from jet47:gpu-tvl1-optimization
2013-08-27 12:36:45 +04:00
Jason Newton
affab4f156
correct range computations, it is difficult to do the more efficient single pass 3N/2 implementations correctly in this particular setting without costing more than they save
2013-08-27 00:34:22 -07:00
Vladislav Vinogradov
bff0fad6c3
gpu TVL1 Optical Flow optimization:
...
do not calculate sum of error in every round of iteration;
instead the error will be summed every 2nd times or more,
if the previous sum of error is too far away from threshold.
2013-08-27 11:21:41 +04:00
Anatoly Baksheev
8b20ceb024
Merge pull request #19 from ozantonkal/acess_by_name_infrastructure
...
Acess by name infrastructure
2013-08-26 23:46:47 -07:00
peng xiao
040b3b8265
Remove trailing whitespace.
2013-08-27 13:02:34 +08:00
peng xiao
c74c517ce3
Fix build error.
2013-08-27 11:56:11 +08:00
peng xiao
168d1dc18c
Make some tweaks to make sum operations less frequently
2013-08-27 11:42:54 +08:00
Roman Donchenko
525b6eca2e
Merge pull request #1311 from leszekhanusz:png_palette_alpha
2013-08-26 16:59:45 +04:00
Roman Donchenko
b43890a7e1
Merge pull request #1326 from ilya-lavrenov:perf_ocl
2013-08-26 16:54:59 +04:00
Roman Donchenko
0daac6fd9d
Merge pull request #1327 from alalek:ocl_master_tests_fix
2013-08-26 16:44:37 +04:00
Roman Donchenko
f44ed7f37c
Merge pull request #1340 from SpecLad:python-updates
2013-08-26 16:41:13 +04:00
Roman Donchenko
d44adcd6e8
Merge pull request #1336 from jet47:gpu-resize
2013-08-26 16:40:50 +04:00
Fedor Morozov
833f8d16fa
Robertson and tutorial
2013-08-26 15:23:37 +04:00
ilya-lavrenov
d02ccc9590
the code was refactored and old test system code was removed
2013-08-26 12:36:31 +04:00
ilya-lavrenov
4c28a6f0f6
most of the performance tests was rewritten in google-test manner
2013-08-26 11:43:44 +04:00
Roy Reapor
d38fca2c06
Ignore Windows' Thumbs.db
2013-08-25 19:55:00 -07:00
ozantonkal
d83be1dccc
fixes based on the feedback: window name prefix is automatically added when it is not there, singleton class returns reference instead of pointer, destructor is private, release function implemented
2013-08-23 18:49:21 +02:00
Roman Donchenko
055a581977
Moved Sphinx detection outside of the PYTHONINTERP_FOUND block.
...
Who knows, maybe the user's Sphinx installation uses a Python we couldn't find.
2013-08-23 18:48:08 +04:00
Roman Donchenko
67ae438dae
Refactored NumPy detection.
...
Most importantly, added support for multiple include directores,
but also did some general cleanup.
2013-08-23 18:46:54 +04:00
Roman Donchenko
dbb684b85f
Bumped minimal Python version to 2.6.
...
Rationale: we already depend on it (e.g. some scripts use print_function).
2013-08-23 18:46:54 +04:00
Roman Donchenko
1a81da012d
Removed old Python detection cruft.
...
None of this should be relevant as of CMake 2.8.7.
2013-08-23 18:46:51 +04:00
Maria Dimashova
989be02562
fixed cpp wrappers of ML tree-based models
2013-08-23 18:13:10 +04:00
Vladislav Vinogradov
21c4753fed
used global memory access for up-scaling
2013-08-23 18:08:06 +04:00
Roman Donchenko
7cefb6f50b
Merge pull request #1335 from alekcac:ios-build-fix
2013-08-23 16:54:48 +04:00
Roman Donchenko
3182e68b8a
Merge pull request #1334 from MarkBelmont:bugfix_1
2013-08-23 16:49:51 +04:00
Alexander Shishkov
88712d97c6
fix CMake changes
2013-08-23 16:09:41 +04:00
Roman Donchenko
c11502cf56
Merge pull request #1333 from kirill-kornyakov:bugfix-for-3231
2013-08-23 15:56:11 +04:00
Roman Donchenko
9bb1a7d34d
Merge pull request #1234 from SpecLad:ios-plist
2013-08-23 15:43:08 +04:00
Roman Donchenko
580677f43d
Merge pull request #1304 from berak:doc_tut_cascade
2013-08-23 15:18:06 +04:00
zio dodo
ea544f08cc
Added a small modifications in the code formatting of background subtraction tutorial
2013-08-23 13:04:10 +02:00
Roman Donchenko
365def6090
Merge pull request #1323 from SpecLad:find-git
2013-08-23 14:48:22 +04:00
Roman Donchenko
cae4480834
Merge pull request #1332 from pengx17:2.4_fix_parallel
2013-08-23 14:47:49 +04:00
Vladislav Vinogradov
d1f6a23abf
improved texture usage:
...
* use explicit extrapolation only for sub-matrixes
* use built-in interpolation for INTER_NEAREST mode
2013-08-23 13:57:12 +04:00
Vladislav Vinogradov
241cc417f9
added custom implementation for nearest and linear interpolation
2013-08-23 13:57:12 +04:00
