generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,326 Commits 3 Branches 47 Tags 422 MiB
339dd983ee
Commit Graph

9326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Donchenko
339dd983ee Adjusted the camera calibration sample to master API. 2013-08-13 14:55:27 +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
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
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
Roman Donchenko
95bdd4b670 Merge pull request #1189 from pengx17:2.4_sort_by_key 2013-08-07 11:41:23 +04:00
Andrey Pavlenko
04c86f28b1 Merge pull request #1228 from vkocheganov:bug_3191 2013-08-06 21:01:40 +04:00
Andrey Pavlenko
a7da129984 Merge pull request #1187 from kdrobnyh:mean_and_sum 2013-08-06 20:54:52 +04:00
Andrey Pavlenko
ab4fe8dd2c Merge pull request #1230 from SpecLad:merge-2.4 2013-08-06 20:54:30 +04:00
Andrey Pavlenko
e0659a5967 Merge pull request #1231 from SpecLad:static-ts 2013-08-06 20:53:43 +04:00
WonderRico
7e7fb0b75d Bug #3201 fix 2013-08-06 18:35:49 +02:00
Vadim Pisarevsky
10fde1ca5c disabled 64f IPP DFT; added IPP Gaussian filter; added IPP GetRectSubPix; added IPP BilateralFilter (temporarily disabled) 2013-08-06 18:31:06 +04:00
Roman Donchenko
48a6edbdfe Fixed compilation errors. 2013-08-06 18:07:08 +04:00
Roman Donchenko
8bed7bb5f9 Fixed documentation errors. 2013-08-06 18:07:08 +04:00
Roman Donchenko
2f780ed994 Fix whitespace errors. 2013-08-06 18:07:00 +04:00
Roman Donchenko
131458847b Make ts always static. 
This allows us to forget about the GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
macros and to get rid of the dependency on cvconfig.h.
 2013-08-06 17:56:25 +04:00
Roman Donchenko
2911b12145 Merge pull request #1216 from alekcac:sphinx 2013-08-06 14:31:15 +04:00
Alexander Shishkov
b84b8db277 Removed useless .* 2013-08-06 14:28:07 +04:00
Roman Donchenko
dcaf923517 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	3rdparty/ffmpeg/ffmpeg_version.cmake
	cmake/OpenCVFindLibsGrfmt.cmake
	cmake/templates/cvconfig.h.cmake
	modules/bioinspired/doc/retina/index.rst
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/calib3d/src/precomp.hpp
	modules/contrib/src/inputoutput.cpp
	modules/contrib/src/precomp.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/types_c.h
	modules/core/src/drawing.cpp
	modules/core/src/precomp.hpp
	modules/core/src/system.cpp
	modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
	modules/features2d/doc/common_interfaces_of_feature_detectors.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/src/precomp.hpp
	modules/flann/src/precomp.hpp
	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/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/src/precomp.hpp
	modules/gpu/test/test_imgproc.cpp
	modules/highgui/CMakeLists.txt
	modules/highgui/test/test_precomp.hpp
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/precomp.hpp
	modules/java/generator/src/cpp/Mat.cpp
	modules/legacy/src/precomp.hpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/ml/src/precomp.hpp
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/src/precomp.hpp
	modules/objdetect/include/opencv2/objdetect/objdetect.hpp
	modules/objdetect/src/cascadedetect.cpp
	modules/objdetect/src/hog.cpp
	modules/objdetect/src/precomp.hpp
	modules/objdetect/test/test_latentsvmdetector.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/opencl/objdetect_hog.cl
	modules/ocl/src/precomp.hpp
	modules/photo/src/precomp.hpp
	modules/stitching/src/precomp.hpp
	modules/superres/perf/perf_precomp.hpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	modules/superres/test/test_precomp.hpp
	modules/ts/include/opencv2/ts.hpp
	modules/video/src/precomp.hpp
	modules/videostab/src/precomp.hpp
	modules/world/src/precomp.hpp
 2013-08-06 13:56:49 +04:00
kocheganovvm
e9b9a6fc03 Fix unsequenced assignment (Bug #3191). 2013-08-06 08:08:13 +04:00
Roman Donchenko
b2d1d87ed1 Merge pull request #1225 from apavlenko:fix_format_security 2013-08-05 12:58:37 +04:00
Roman Donchenko
4fb2e9a85a Merge pull request #1196 from rdm12:bugfix_3121_cvtcolor 2013-08-05 12:52:15 +04:00
Roman Donchenko
d92b638768 Merge pull request #1226 from apavlenko:fix_java_test_ellipse2poly 2013-08-05 12:38:19 +04:00