Roman Donchenko
|
7992402ecf
|
Merge pull request #1149 from jet47:generalized-hough-refactoring
|
12 years ago |
Roman Donchenko
|
bcba3fc6b8
|
Merge pull request #1263 from abidrahmank:pyCLAHE_24
|
12 years ago |
Roman Donchenko
|
e3d508902e
|
Merge pull request #1262 from StevenPuttemans:fix_surf_tutorial
|
12 years ago |
Roman Donchenko
|
ceacd75ab1
|
Merge pull request #1245 from rdm12:doc_tutorial_camera_calibration
|
12 years ago |
Roman Donchenko
|
18358521f2
|
Merge pull request #1162 from jet47:cudev-integration
|
12 years ago |
peng xiao
|
124ede611b
|
Update with apavlenko's suggestions.
|
12 years ago |
abidrahmank
|
1b93ecfae8
|
docs changes
|
12 years ago |
abidrahmank
|
92d04d439e
|
docs changes
|
12 years ago |
abidrahmank
|
96c1df14f4
|
CLAHE Python bindings
|
12 years ago |
Roman Donchenko
|
43c7a8ae93
|
Merge pull request #1259 from pengx17:2.4_fix_cvtcolor
|
12 years ago |
Roman Donchenko
|
fae7b20815
|
Merge pull request #1255 from SpecLad:no-cr
|
12 years ago |
StevenPuttemans
|
89012e8f6b
|
Missing including of nonfree module to support the use of SURF
detector/descriptor.
|
12 years ago |
Roman Donchenko
|
99624628a9
|
Merge pull request #1260 from SpecLad:no-cr-master
|
12 years ago |
Andrey Pavlenko
|
f3b1933a92
|
LinkedList -> ArrayList
|
12 years ago |
Roman Donchenko
|
339dd983ee
|
Adjusted the camera calibration sample to master API.
|
12 years ago |
Roman Donchenko
|
4fb81052a8
|
Merge pull request #1256 from kamjagin:2.4
|
12 years ago |
Roman Donchenko
|
77df8e574f
|
Fixed CR line endings in non_linear_svms.rst.
|
12 years ago |
Andrey Pavlenko
|
4902db1c42
|
also fixing JNI library name in JUnit tests
|
12 years ago |
peng xiao
|
2fb2ac8836
|
Apply bugfix #3121 for OCL.
|
12 years ago |
Roman Donchenko
|
6b5ac42a9b
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
|
12 years ago |
Miroslav Kobetski
|
93f05fed35
|
Fixed elif/elseif error that made highgui-windows fail on mac+cocoa.
|
12 years ago |
Andrey Pavlenko
|
d4e098f401
|
enabling of VideoCapture(String) [fixing issue #3207]
- enable auto-wrap of VideoCapture;
- minor refactoring of generated code templates.
|
12 years ago |
Roman Donchenko
|
9d283dea63
|
Merge pull request #1250 from denzp:opencl_detection_unix
|
12 years ago |
peng xiao
|
7fe8403074
|
Let ocl::filter2D support kernel size >= 3.
|
12 years ago |
Denis Zaryaev
|
f4010cef29
|
properly set OpenCL lib search path
|
12 years ago |
Roman Donchenko
|
d302222d82
|
Don't put \r into OPENCV_REFMAN_TOC.
There's no need, since configure_file writes its output using native
line endings, anyway.
|
12 years ago |
Roman Donchenko
|
390b67e5a0
|
Merge pull request #1251 from StevenPuttemans:bugfix_3209
|
12 years ago |
Roman Donchenko
|
dc06d47f1c
|
Merge pull request #1241 from SpecLad:redundant-precomps
|
12 years ago |
Roman Donchenko
|
d8c6e89a54
|
Merge pull request #1238 from SpecLad:cmake-min-ver
|
12 years ago |
Roman Donchenko
|
afc6f79038
|
Inlined the getMD5 macro, which no longer saves us anything.
|
12 years ago |
Roman Donchenko
|
57c1e8f333
|
Merge pull request #1242 from asmorkalov:android_native_cam
|
12 years ago |
Roman Donchenko
|
504ebda7c4
|
Merge pull request #1235 from WonderRico:bugfix_dshow
|
12 years ago |
StevenPuttemans
|
fd056235d3
|
Added bugfix 3209 : anchor point (-1,1) changed to (-1,-1)
|
12 years ago |
WonderRico
|
d067749c21
|
fix _index / index
|
12 years ago |
Roman Donchenko
|
19d8f4f8dd
|
Merge pull request #1247 from StevenPuttemans:bugfix_3205
|
12 years ago |
Roman Donchenko
|
98cd04c191
|
Merge pull request #1163 from kdrobnyh:Morphology
|
12 years ago |
StevenPuttemans
|
1a42dd905c
|
Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2
|
12 years ago |
Roman Donchenko
|
314f3d84e1
|
Merge pull request #1246 from StevenPuttemans:bugfix_3206
|
12 years ago |
StevenPuttemans
|
d11746e56d
|
Added fix mentioned in bug #3206
VideoWriter memory leak solved.
|
12 years ago |
Denis Zaryaev
|
129f315f7c
|
bugfix for OpenCL detection with Intel OpenCL SDK 1.2 on linux (Bug #3140)
|
12 years ago |
WonderRico
|
a048387376
|
fix formating
|
12 years ago |
Roman Donchenko
|
8d39350b4d
|
Merge pull request #1239 from Daniil-Osokin:fix_build_of_camera_calibration_android_sample
|
12 years ago |
Alexander Smorkalov
|
fff91eef0b
|
Native camera libraries updated.
Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
|
12 years ago |
Roman Donchenko
|
167abf0dae
|
Merge pull request #1244 from vkocheganov:bugfix_3179
|
12 years ago |
Dmitry Retinskiy
|
2765f3f7ad
|
Minor language corrections in the tutorial document
|
12 years ago |
kocheganovvm
|
e4b201be25
|
Fix unsequenced modifications (Bug #3179).
|
12 years ago |
Roman Donchenko
|
4dc63273f0
|
Renamed ocl tests' precomp files according to convention.
Also, added the missing include guard to perf_precomp.hpp.
This should fix the build.
|
12 years ago |
Roman Donchenko
|
6d7f29a03a
|
Made it so that a dummy .cpp is actually created when compiling with VC++.
|
12 years ago |
Roman Donchenko
|
d9f71b762f
|
Deleted almost all of the precomp.cpp files.
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
|
12 years ago |
kdrobnyh
|
7da5fa01d4
|
Removed extra {} in erosion and dilation functions
|
12 years ago |