Commit Graph

9472 Commits

Author SHA1 Message Date
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
Andrey Pavlenko
7b0734caf9 fixing java test after fix in OpenCV library 2013-08-05 11:45:17 +04:00
Andrey Pavlenko
a06891851d fixing compilation with -Werror=format-security enabled 2013-08-05 11:11:54 +04:00
Andrey Pavlenko
4c03afe006 Merge pull request #1079 from AlexeySpizhevoy:master 2013-08-05 10:54:44 +04:00
Andrey Pavlenko
6483754860 Merge pull request #1220 from asmorkalov:msmf_sizet_fix 2013-08-05 10:26:39 +04:00
Andrey Pavlenko
8a3aa1f5b6 Merge pull request #1221 from philippefoubert:branch_cmake_cmp0004 2013-08-05 10:26:23 +04:00
Andrey Pavlenko
af8a03e17f Merge pull request #1222 from philippefoubert:branch_2.4_pvapi 2013-08-05 10:20:25 +04:00
Andrey Pavlenko
487ff4f3aa Merge pull request #1151 from jet47:gpubgsegm-refactoring 2013-08-05 10:20:00 +04:00
Philippe FOUBERT
ebd413c696 Solve the problem seen when using recent versions of CMake (such as 2.8.11): OpenCVConfig.cmake violates the policy CMP0004.
Symptoms:
CMake Error at CMakeLists.txt:10 (add_executable):
Target "my_app" links to item "C:/Program Files " which has leading
or trailing whitespace. This is now an error according to policy CMP0004.

This problem occurs when building on Windows when we depend on libraries located (for example) in "C:\Program Files (x86)..."
2013-08-04 20:52:49 +02:00
Alexander Smorkalov
aada5f7844 Difference in method definition and declaration fixed (Bug #3189). 2013-08-04 22:34:36 +04:00
Andrey Pavlenko
a2ff1b07b3 Merge pull request #1219 from asmorkalov:winrt_neon 2013-08-04 21:59:06 +04:00
Alexander Smorkalov
2243118fc0 NEON instruction set enabled for WIN32 on ARM by default. 2013-08-04 08:47:42 -07:00
Alexander Shishkov
afd7429cbd Update OpenCVDetectPython.cmake
On my MacOS the output of the sphinx-build binary is the following:

Error: Insufficient arguments.

Sphinx v1.2b1
Usage: /usr/local/bin/sphinx-build [options] sourcedir outdir [filenames...]

...

I have installed sphinx, but without this change HAVE_SPHINX==0 for me, so I can't build docs.
2013-08-03 00:17:40 +04:00
Andrey Pavlenko
ee8687ba19 Merge pull request #1214 from StevenPuttemans:feature_3169_others 2013-08-02 17:59:06 +04:00
Vladislav Vinogradov
d13ecd0d76 increase epsilon for GEMM & Convolve sanity tests for CUDA 5.5 2013-08-02 17:31:34 +04:00
Andrey Pavlenko
f0d854ce39 Merge pull request #1205 from asmorkalov:winrt_api_cert_fix 2013-08-02 16:27:23 +04:00
StevenPuttemans
f28496c628 Added sample links in documentation for python2, ocl and gpu 2013-08-02 14:05:08 +02:00
Alexander Smorkalov
63786c389f Warning and review notes fixes.
WITH_WINRT -> ENABLE_WINRT_MODE;
Some temporary char* replaced with Ptr<char>;
Build fix for regular WIN32;
Windows Platform SDK and MSVC search added to cmake;
Warinig fixes.
2013-08-02 04:10:56 -07:00
Andrey Pavlenko
add2ea75c3 Merge pull request #1212 from jet47:gpu-calc-hist 2013-08-02 13:23:04 +04:00
Vladislav Vinogradov
55cb26551f use NPP version for Fermi 2013-08-02 09:05:21 +04:00