Roman Donchenko
4fb81052a8
Merge pull request #1256 from kamjagin:2.4
11 years ago
Roman Donchenko
77df8e574f
Fixed CR line endings in non_linear_svms.rst.
11 years ago
Andrey Pavlenko
4902db1c42
also fixing JNI library name in JUnit tests
11 years ago
peng xiao
2fb2ac8836
Apply bugfix #3121 for OCL.
11 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
11 years ago
Miroslav Kobetski
93f05fed35
Fixed elif/elseif error that made highgui-windows fail on mac+cocoa.
11 years ago
peng xiao
29eefe52bb
Add OpenCL accelerated implementation for Retina.
11 years ago
Andrey Pavlenko
d4e098f401
enabling of VideoCapture(String) [fixing issue #3207 ]
...
- enable auto-wrap of VideoCapture;
- minor refactoring of generated code templates.
11 years ago
Roman Donchenko
9d283dea63
Merge pull request #1250 from denzp:opencl_detection_unix
11 years ago
peng xiao
7fe8403074
Let ocl::filter2D support kernel size >= 3.
11 years ago
Denis Zaryaev
f4010cef29
properly set OpenCL lib search path
11 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.
11 years ago
Roman Donchenko
390b67e5a0
Merge pull request #1251 from StevenPuttemans:bugfix_3209
11 years ago
Roman Donchenko
dc06d47f1c
Merge pull request #1241 from SpecLad:redundant-precomps
11 years ago
Roman Donchenko
d8c6e89a54
Merge pull request #1238 from SpecLad:cmake-min-ver
11 years ago
Roman Donchenko
afc6f79038
Inlined the getMD5 macro, which no longer saves us anything.
11 years ago
Roman Donchenko
57c1e8f333
Merge pull request #1242 from asmorkalov:android_native_cam
11 years ago
Roman Donchenko
504ebda7c4
Merge pull request #1235 from WonderRico:bugfix_dshow
11 years ago
kocheganovvm
086db9d6db
Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison
...
There's some disagreement about the correct formula.
has its supporters, however, for texture analysis, the newly introduced formula became
standard. The commit enables both uses without breaking backward compatibility.
First contributor of this commit was sperrholz.
11 years ago
StevenPuttemans
fd056235d3
Added bugfix 3209 : anchor point (-1,1) changed to (-1,-1)
11 years ago
WonderRico
d067749c21
fix _index / index
11 years ago
Roman Donchenko
19d8f4f8dd
Merge pull request #1247 from StevenPuttemans:bugfix_3205
11 years ago
Roman Donchenko
98cd04c191
Merge pull request #1163 from kdrobnyh:Morphology
11 years ago
StevenPuttemans
1a42dd905c
Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2
11 years ago
Roman Donchenko
314f3d84e1
Merge pull request #1246 from StevenPuttemans:bugfix_3206
11 years ago
StevenPuttemans
d11746e56d
Added fix mentioned in bug #3206
...
VideoWriter memory leak solved.
11 years ago
Denis Zaryaev
129f315f7c
bugfix for OpenCL detection with Intel OpenCL SDK 1.2 on linux (Bug #3140 )
11 years ago
WonderRico
a048387376
fix formating
11 years ago
Roman Donchenko
8d39350b4d
Merge pull request #1239 from Daniil-Osokin:fix_build_of_camera_calibration_android_sample
11 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.
11 years ago
Roman Donchenko
167abf0dae
Merge pull request #1244 from vkocheganov:bugfix_3179
11 years ago
Dmitry Retinskiy
2765f3f7ad
Minor language corrections in the tutorial document
11 years ago
kocheganovvm
e4b201be25
Fix unsequenced modifications (Bug #3179 ).
11 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.
11 years ago
Roman Donchenko
6d7f29a03a
Made it so that a dummy .cpp is actually created when compiling with VC++.
11 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.
11 years ago
kdrobnyh
7da5fa01d4
Removed extra {} in erosion and dilation functions
11 years ago
Roman Donchenko
e57407849a
Removed obsolete CMake workaround.
11 years ago
Roman Donchenko
36874300c8
Removed CMakeParseArguments.cmake, which we don't use.
...
It's part of CMake nowadays, too.
11 years ago
Roman Donchenko
a23abef9bd
Removed OpenCVFindPkgConfig.cmake, since it's bundled with CMake now.
...
In fact, I don't think we actually use it... but I kept the include,
just in case.
11 years ago
Roman Donchenko
656416d174
Dropped OpenCVConfig.cmake - we don't use it anymore.
11 years ago
Roman Donchenko
168e2a4ccb
Removed CMake version checks that we don't need anymore.
11 years ago
Roman Donchenko
a87756e9b3
Bumped minimal CMake version to 2.8.7.
11 years ago
Roman Donchenko
79b6f68f54
Merge pull request #1233 from vpisarev:24_ipp_78
11 years ago
Daniil Osokin
65c5c4df70
Fixed build of camera calibration android sample
11 years ago
Vadim Pisarevsky
d5539975d7
polished the patch
11 years ago
Andrey Pavlenko
1c55096c01
Merge pull request #1232 from StevenPuttemans:fix_wrong_documentation
11 years ago
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
11 years ago
Roman Donchenko
92c823f82f
Merge pull request #1237 from SpecLad:xls-separate-wh
11 years ago
Roman Donchenko
a495bbb967
Added a new file for recording minimal dependency versions.
11 years ago