Alex Leontiev
|
b92c88ddd1
|
Removed trailing spaces
Continuation of work done in previous commit.
|
11 years ago |
Alex Leontiev
|
b1f029ccc5
|
Removed trailing spaces
This caused warnings.
|
11 years ago |
Alex Leontiev
|
554e002747
|
Prepare Downhill Simplex for pull request
This is an implementation of so-called downhill simplex method
(https://en.wikipedia.org/wiki/Nelder%E2%80%93Mead_method)
Please, let me know if you have any comments, whoever you'd be.
|
11 years ago |
Roman Donchenko
|
fc37df05ec
|
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix
|
11 years ago |
Roman Donchenko
|
86f4cd253a
|
Merge pull request #1309 from pengx17:master_retina_ocl
|
11 years ago |
Alexander Smorkalov
|
5af2cc6223
|
AutoBuffer with initial zero size fixed.
|
11 years ago |
Roman Donchenko
|
11dcd4f4f3
|
Merge pull request #1356 from SpecLad:homography-uninit
|
11 years ago |
Roman Donchenko
|
e59c74e1c7
|
Merge pull request #1348 from SpecLad:merge-2.4
|
11 years ago |
Roman Donchenko
|
5e4ebf3403
|
Fixed incomplete matrix initialization in HomographyRefineCallback.
|
11 years ago |
Roman Donchenko
|
7afc2677e6
|
Removed a duplicate line.
|
11 years ago |
peng xiao
|
9f0a88c1d6
|
Remove trailing whitespace.
|
11 years ago |
Roman Donchenko
|
10cb9a0c4a
|
Merge pull request #1342 from nevion:master
|
11 years ago |
Roman Donchenko
|
1840fd5f00
|
Merge pull request #1248 from vkocheganov:chi_square_alt
|
11 years ago |
peng xiao
|
287c8a3330
|
Let ocl::context only be initialized once in retina_ocl test.
|
11 years ago |
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
|
11 years ago |
Roman Donchenko
|
d32b62a177
|
Merge pull request #1341 from roynos:master
|
11 years ago |
Roman Donchenko
|
dd25f416a6
|
War on Whitespace, master edition: tabs.
|
11 years ago |
Roman Donchenko
|
9ed475cf52
|
War on Whitespace, master edition: file endings.
|
11 years ago |
Roman Donchenko
|
9b92545ce6
|
War on Whitespace, master edition: trailing spaces.
|
11 years ago |
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
|
11 years ago |
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
|
11 years ago |
Roman Donchenko
|
657699a1da
|
Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5
|
11 years ago |
Roman Donchenko
|
45a0b39a73
|
Merge pull request #1339 from mdim:ml_cpp_wrappers_fix
|
11 years ago |
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
|
11 years ago |
Roman Donchenko
|
525b6eca2e
|
Merge pull request #1311 from leszekhanusz:png_palette_alpha
|
11 years ago |
Roman Donchenko
|
b43890a7e1
|
Merge pull request #1326 from ilya-lavrenov:perf_ocl
|
11 years ago |
Roman Donchenko
|
0daac6fd9d
|
Merge pull request #1327 from alalek:ocl_master_tests_fix
|
11 years ago |
Roman Donchenko
|
f44ed7f37c
|
Merge pull request #1340 from SpecLad:python-updates
|
11 years ago |
Roman Donchenko
|
d44adcd6e8
|
Merge pull request #1336 from jet47:gpu-resize
|
11 years ago |
ilya-lavrenov
|
d02ccc9590
|
the code was refactored and old test system code was removed
|
11 years ago |
ilya-lavrenov
|
4c28a6f0f6
|
most of the performance tests was rewritten in google-test manner
|
11 years ago |
Roy Reapor
|
d38fca2c06
|
Ignore Windows' Thumbs.db
|
11 years ago |
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.
|
11 years ago |
Roman Donchenko
|
67ae438dae
|
Refactored NumPy detection.
Most importantly, added support for multiple include directores,
but also did some general cleanup.
|
11 years ago |
Roman Donchenko
|
dbb684b85f
|
Bumped minimal Python version to 2.6.
Rationale: we already depend on it (e.g. some scripts use print_function).
|
11 years ago |
Roman Donchenko
|
1a81da012d
|
Removed old Python detection cruft.
None of this should be relevant as of CMake 2.8.7.
|
11 years ago |
Maria Dimashova
|
989be02562
|
fixed cpp wrappers of ML tree-based models
|
11 years ago |
Vladislav Vinogradov
|
21c4753fed
|
used global memory access for up-scaling
|
11 years ago |
Roman Donchenko
|
7cefb6f50b
|
Merge pull request #1335 from alekcac:ios-build-fix
|
11 years ago |
Roman Donchenko
|
3182e68b8a
|
Merge pull request #1334 from MarkBelmont:bugfix_1
|
11 years ago |
Alexander Shishkov
|
88712d97c6
|
fix CMake changes
|
11 years ago |
Roman Donchenko
|
c11502cf56
|
Merge pull request #1333 from kirill-kornyakov:bugfix-for-3231
|
11 years ago |
Roman Donchenko
|
9bb1a7d34d
|
Merge pull request #1234 from SpecLad:ios-plist
|
11 years ago |
Roman Donchenko
|
580677f43d
|
Merge pull request #1304 from berak:doc_tut_cascade
|
11 years ago |
Roman Donchenko
|
365def6090
|
Merge pull request #1323 from SpecLad:find-git
|
11 years ago |
Roman Donchenko
|
cae4480834
|
Merge pull request #1332 from pengx17:2.4_fix_parallel
|
11 years ago |
Vladislav Vinogradov
|
d1f6a23abf
|
improved texture usage:
* use explicit extrapolation only for sub-matrixes
* use built-in interpolation for INTER_NEAREST mode
|
11 years ago |
Vladislav Vinogradov
|
241cc417f9
|
added custom implementation for nearest and linear interpolation
|
11 years ago |
Vladislav Vinogradov
|
3b05acf936
|
reorganize code for further modifiction
|
11 years ago |
Alexander Shishkov
|
396f6bb55f
|
fixed problems with building iOS version
|
11 years ago |