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
Roman Donchenko
0e32d7ccb3
Merge pull request #1346 from jet47:gpu-tvl1-optimization
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
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.
11 years ago
peng xiao
040b3b8265
Remove trailing whitespace.
11 years ago
peng xiao
c74c517ce3
Fix build error.
11 years ago
peng xiao
168d1dc18c
Make some tweaks to make `sum` operations less frequently
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
Alexander Shishkov
16814c7fb1
Update build_framework.py
11 years ago
MarkBelmont
cf34b3d65b
Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span."
11 years ago
Kirill Kornyakov
030fa5673e
bugfix-for-3231
11 years ago
Vladislav Vinogradov
f826bd8bce
removed NPP implementation
11 years ago
Roman Donchenko
5a32f0b6ca
Merge pull request #1322 from SpecLad:terse
11 years ago
Roman Donchenko
e1397f6c1f
Merge pull request #1324 from SpecLad:try-compile
11 years ago
Roman Donchenko
66aa3255b9
Merge pull request #1328 from SpecLad:zlib-update
11 years ago
Changlin Hsieh
723ba29660
Update cmake files by using CUDA_CUDA_LIBRARIES
11 years ago
Roman Donchenko
ceb522ad2f
Merge pull request #1329 from SpecLad:msvc-werror
11 years ago
peng xiao
2519a21935
Fix a potential bug of ParallelLoopBodyWrapper::operator(Range)
...
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.
11 years ago
Alexander Alekhin
7685b983db
OCL: tests: repair moments implementation in master branch, enable tests
11 years ago
berak
50288f1314
rebased commits
11 years ago
berak
926d6876d3
using VideoCapture instead of CvCapture* in cascade tutorial
...
corrected constants, changed objdetection.cpp as well
updated objDetection2.cpp as well
fixed headers in objdetection2.cpp
removed useles RNG
fixed buildbot warnings (wow, i like that bot!)
victim of the war on whitespace
fixing buildbot warnings
fixing last buildbot warning, heya .
trying to rebase/squash commits
11 years ago