Nghia Ho
d194bb6143
Merge https://github.com/Itseez/opencv
11 years ago
Roman Donchenko
556028eff5
Merge pull request #1253 from kamjagin:fixingCompilationOnOSX
11 years ago
kamjagin
ed29d91d42
adding std to cstdint typedef of uint32_t
11 years ago
Miroslav Kobetski
b595d73d6d
defined uint for non-windows platforms too. replaced isnan for cvIsNaN.
11 years ago
Roman Donchenko
d09c89c63e
Merge pull request #1265 from abidrahmank:misc_docs2
11 years ago
Roman Donchenko
8e245f8a3a
Merge pull request #1186 from SpecLad:dont-export-templates
11 years ago
Nghia Ho
2c9c4188ae
Merge https://github.com/Itseez/opencv
11 years ago
Roman Donchenko
7992402ecf
Merge pull request #1149 from jet47:generalized-hough-refactoring
11 years ago
Roman Donchenko
18358521f2
Merge pull request #1162 from jet47:cudev-integration
11 years ago
abidrahmank
1b93ecfae8
docs changes
11 years ago
abidrahmank
92d04d439e
docs changes
11 years ago
Roman Donchenko
99624628a9
Merge pull request #1260 from SpecLad:no-cr-master
11 years ago
Nghia Ho
79965c9ee9
Replaced isfinite() with cvIsInf and cvIsNan
11 years ago
Nghia Ho
723bc3cae9
Merge https://github.com/Itseez/opencv
11 years ago
Roman Donchenko
77df8e574f
Fixed CR line endings in non_linear_svms.rst.
11 years ago
Roman Donchenko
9d283dea63
Merge pull request #1250 from denzp:opencl_detection_unix
11 years ago
Denis Zaryaev
f4010cef29
properly set OpenCL lib search path
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
19d8f4f8dd
Merge pull request #1247 from StevenPuttemans:bugfix_3205
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
Denis Zaryaev
129f315f7c
bugfix for OpenCL detection with Intel OpenCL SDK 1.2 on linux (Bug #3140 )
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
Nghia Ho
95ee02ba8e
Added extra comment to test buildbot
11 years ago
Roman Donchenko
a495bbb967
Added a new file for recording minimal dependency versions.
11 years ago
Nghia
18e7aa5d19
Update intersection.cpp
...
Added #ifdef _WIN32 for finite number testing
11 years ago
Andrey Pavlenko
04c86f28b1
Merge pull request #1228 from vkocheganov:bug_3191
11 years ago
Andrey Pavlenko
ab4fe8dd2c
Merge pull request #1230 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
48a6edbdfe
Fixed compilation errors.
11 years ago
Roman Donchenko
8bed7bb5f9
Fixed documentation errors.
11 years ago
Roman Donchenko
2f780ed994
Fix whitespace errors.
11 years ago
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
11 years ago
kocheganovvm
e9b9a6fc03
Fix unsequenced assignment (Bug #3191 ).
11 years ago
Roman Donchenko
b2d1d87ed1
Merge pull request #1225 from apavlenko:fix_format_security
11 years ago
Roman Donchenko
4fb2e9a85a
Merge pull request #1196 from rdm12:bugfix_3121_cvtcolor
11 years ago
Roman Donchenko
d92b638768
Merge pull request #1226 from apavlenko:fix_java_test_ellipse2poly
11 years ago
Andrey Pavlenko
7b0734caf9
fixing java test after fix in OpenCV library
11 years ago
Andrey Pavlenko
a06891851d
fixing compilation with `-Werror=format-security` enabled
11 years ago
Andrey Pavlenko
4c03afe006
Merge pull request #1079 from AlexeySpizhevoy:master
11 years ago
Andrey Pavlenko
6483754860
Merge pull request #1220 from asmorkalov:msmf_sizet_fix
11 years ago
Andrey Pavlenko
8a3aa1f5b6
Merge pull request #1221 from philippefoubert:branch_cmake_cmp0004
11 years ago
Andrey Pavlenko
af8a03e17f
Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
11 years ago
Andrey Pavlenko
487ff4f3aa
Merge pull request #1151 from jet47:gpubgsegm-refactoring
11 years ago
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)..."
11 years ago
Alexander Smorkalov
aada5f7844
Difference in method definition and declaration fixed (Bug #3189 ).
11 years ago