Roman Donchenko
|
473ca0849d
|
Merge pull request #1285 from SpecLad:enum-compare
|
2013-08-19 12:00:18 +04:00 |
|
Roman Donchenko
|
2349f7ea89
|
Merge pull request #1257 from SpecLad:merge-2.4
|
2013-08-16 18:42:18 +04:00 |
|
Roman Donchenko
|
2530b580a8
|
Merge branch 'master' into merge-2.4
Conflicts:
modules/photo/doc/inpainting.rst
|
2013-08-16 14:14:12 +04:00 |
|
Roman Donchenko
|
2304a561ca
|
Fixed a -Wenum-compare warning in cudev.
|
2013-08-16 13:53:37 +04:00 |
|
Roman Donchenko
|
556028eff5
|
Merge pull request #1253 from kamjagin:fixingCompilationOnOSX
|
2013-08-15 11:54:55 +04:00 |
|
kamjagin
|
ed29d91d42
|
adding std to cstdint typedef of uint32_t
|
2013-08-14 17:16:52 +02:00 |
|
Miroslav Kobetski
|
b595d73d6d
|
defined uint for non-windows platforms too. replaced isnan for cvIsNaN.
|
2013-08-14 17:16:52 +02:00 |
|
Roman Donchenko
|
d09c89c63e
|
Merge pull request #1265 from abidrahmank:misc_docs2
|
2013-08-14 19:03:45 +04:00 |
|
Roman Donchenko
|
8e245f8a3a
|
Merge pull request #1186 from SpecLad:dont-export-templates
|
2013-08-14 17:25:01 +04:00 |
|
Roman Donchenko
|
7992402ecf
|
Merge pull request #1149 from jet47:generalized-hough-refactoring
|
2013-08-14 13:26:24 +04:00 |
|
Roman Donchenko
|
18358521f2
|
Merge pull request #1162 from jet47:cudev-integration
|
2013-08-14 12:00:34 +04:00 |
|
abidrahmank
|
1b93ecfae8
|
docs changes
|
2013-08-13 22:07:44 +05:30 |
|
abidrahmank
|
92d04d439e
|
docs changes
|
2013-08-13 21:58:49 +05:30 |
|
Roman Donchenko
|
99624628a9
|
Merge pull request #1260 from SpecLad:no-cr-master
|
2013-08-13 16:00:20 +04:00 |
|
Roman Donchenko
|
339dd983ee
|
Adjusted the camera calibration sample to master API.
|
2013-08-13 14:55:27 +04:00 |
|
Roman Donchenko
|
77df8e574f
|
Fixed CR line endings in non_linear_svms.rst.
|
2013-08-13 13:29:09 +04:00 |
|
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
|
2013-08-13 12:56:39 +04:00 |
|
Roman Donchenko
|
9d283dea63
|
Merge pull request #1250 from denzp:opencl_detection_unix
|
2013-08-13 11:57:22 +04:00 |
|
Denis Zaryaev
|
f4010cef29
|
properly set OpenCL lib search path
|
2013-08-12 18:25:01 +03:00 |
|
Roman Donchenko
|
d8c6e89a54
|
Merge pull request #1238 from SpecLad:cmake-min-ver
|
2013-08-12 15:50:23 +04:00 |
|
Roman Donchenko
|
afc6f79038
|
Inlined the getMD5 macro, which no longer saves us anything.
|
2013-08-12 15:38:58 +04:00 |
|
Roman Donchenko
|
57c1e8f333
|
Merge pull request #1242 from asmorkalov:android_native_cam
|
2013-08-12 14:47:48 +04:00 |
|
Roman Donchenko
|
504ebda7c4
|
Merge pull request #1235 from WonderRico:bugfix_dshow
|
2013-08-12 14:33:30 +04:00 |
|
WonderRico
|
d067749c21
|
fix _index / index
|
2013-08-12 11:19:53 +02:00 |
|
Roman Donchenko
|
19d8f4f8dd
|
Merge pull request #1247 from StevenPuttemans:bugfix_3205
|
2013-08-12 12:21:36 +04:00 |
|
Roman Donchenko
|
98cd04c191
|
Merge pull request #1163 from kdrobnyh:Morphology
|
2013-08-12 12:06:31 +04:00 |
|
StevenPuttemans
|
1a42dd905c
|
Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2
|
2013-08-12 10:04:15 +02:00 |
|
Roman Donchenko
|
314f3d84e1
|
Merge pull request #1246 from StevenPuttemans:bugfix_3206
|
2013-08-12 11:57:39 +04:00 |
|
StevenPuttemans
|
d11746e56d
|
Added fix mentioned in bug #3206
VideoWriter memory leak solved.
|
2013-08-12 09:49:19 +02:00 |
|
Denis Zaryaev
|
129f315f7c
|
bugfix for OpenCL detection with Intel OpenCL SDK 1.2 on linux (Bug #3140)
|
2013-08-11 21:05:30 +03:00 |
|
WonderRico
|
a048387376
|
fix formating
|
2013-08-09 16:13:40 +02:00 |
|
Roman Donchenko
|
8d39350b4d
|
Merge pull request #1239 from Daniil-Osokin:fix_build_of_camera_calibration_android_sample
|
2013-08-09 17:45:21 +04:00 |
|
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.
|
2013-08-09 17:43:21 +04:00 |
|
Roman Donchenko
|
167abf0dae
|
Merge pull request #1244 from vkocheganov:bugfix_3179
|
2013-08-09 11:49:27 +04:00 |
|
kocheganovvm
|
e4b201be25
|
Fix unsequenced modifications (Bug #3179).
|
2013-08-08 18:55:47 +04:00 |
|
kdrobnyh
|
7da5fa01d4
|
Removed extra {} in erosion and dilation functions
|
2013-08-08 12:30:28 +04:00 |
|
Roman Donchenko
|
e57407849a
|
Removed obsolete CMake workaround.
|
2013-08-08 12:03:41 +04:00 |
|
Roman Donchenko
|
36874300c8
|
Removed CMakeParseArguments.cmake, which we don't use.
It's part of CMake nowadays, too.
|
2013-08-08 12:03:41 +04:00 |
|
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.
|
2013-08-08 12:03:41 +04:00 |
|
Roman Donchenko
|
656416d174
|
Dropped OpenCVConfig.cmake - we don't use it anymore.
|
2013-08-08 12:03:41 +04:00 |
|
Roman Donchenko
|
168e2a4ccb
|
Removed CMake version checks that we don't need anymore.
|
2013-08-08 12:03:41 +04:00 |
|
Roman Donchenko
|
a87756e9b3
|
Bumped minimal CMake version to 2.8.7.
|
2013-08-08 12:03:30 +04:00 |
|
Roman Donchenko
|
79b6f68f54
|
Merge pull request #1233 from vpisarev:24_ipp_78
|
2013-08-08 12:00:52 +04:00 |
|
Daniil Osokin
|
65c5c4df70
|
Fixed build of camera calibration android sample
|
2013-08-08 09:31:25 +04:00 |
|
Vadim Pisarevsky
|
d5539975d7
|
polished the patch
|
2013-08-07 22:34:29 +04:00 |
|
Andrey Pavlenko
|
1c55096c01
|
Merge pull request #1232 from StevenPuttemans:fix_wrong_documentation
|
2013-08-07 21:05:43 +04:00 |
|
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.
|
2013-08-07 14:49:33 +02:00 |
|
Roman Donchenko
|
92c823f82f
|
Merge pull request #1237 from SpecLad:xls-separate-wh
|
2013-08-07 15:21:35 +04:00 |
|
Roman Donchenko
|
a495bbb967
|
Added a new file for recording minimal dependency versions.
|
2013-08-07 13:56:09 +04:00 |
|
Roman Donchenko
|
e23f31311d
|
xls-report.py: separated image width and height for easier analysis.
|
2013-08-07 13:43:03 +04:00 |
|