mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-17 10:58:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
30,698 Commits 6 Branches 127 Tags 3 GiB
a7b17bfaf0
Commit Graph

245 Commits

Author SHA1 Message Date
Roman Donchenko
2c4bbb313c Merge commit '43aec5ad' into merge-2.4 
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
 2013-08-27 13:26:44 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +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
Alexander Smorkalov
2243118fc0 NEON instruction set enabled for WIN32 on ARM by default. 2013-08-04 08:47:42 -07:00
Roman Donchenko
029fce10c9 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	3rdparty/libjasper/CMakeLists.txt
	cmake/OpenCVDetectOpenCL.cmake
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/imgproc/src/floodfill.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_or.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/precomp.hpp
	modules/python/src2/api
	modules/ts/src/ts_func.cpp
	samples/gpu/bgfg_segm.cpp
 2013-05-21 17:19:23 +04:00
Andrey Kamaev
2665c39a0d Fix build warnings from gcc 4.8 2013-05-13 17:07:30 +04:00
Andrey Kamaev
ae4e76395f Make flann headers independent from OpenCV C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Andrey Kamaev
517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
Alexander Smorkalov
6f68640d4d Multiple fixes for WinRT 
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
 2013-03-26 17:19:52 -07:00
Andrey Kamaev
49f6dad13f Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00
Andrey Kamaev
be7bbe3aa9 Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
Andrey Kamaev
75513a46dc Remove all include directives for <string> 2013-03-22 22:14:47 +04:00
Andrey Kamaev
762aefd71b Compile opencv_test_core with cv::String instead of std::string 
All tests passed!
 2013-03-22 22:14:22 +04:00
Andrey Kamaev
a42a0f5fca Added compatibility headers 2013-03-13 17:26:56 +04:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up 
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
 2013-03-13 17:26:56 +04:00
Andrey Kamaev
2a6fb2867e Remove all using directives for STL namespace and members 
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
 2013-02-25 15:04:17 +04:00
Andrey Kamaev
61079547f0 Merge branch '2.4' 2013-02-01 14:59:40 +04:00
Ilya Lysenkov
098ea6fcb7 Checked key_size in LSH table for validness (#2677) 2013-01-31 23:19:19 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
88e9a072ec Fix binary compatibility of opencv_flann 2012-10-16 15:13:00 +04:00
Andrey Kamaev
a3b1971977 Bring back escaped virtual destructors from 2.4.2 2012-10-15 17:48:49 +04:00
Vadim Pisarevsky
d72cc06b96 fixed possibly inccorrect interval measurements in flann's timer (bug #1165). Note: this may break binary compatibility, but since the class is not wrapped in Java and not exposed in Windows API, for example (it's considered internal-use class for flann), the effect should be minimal 2012-10-11 22:40:37 +04:00
Andrey Kamaev
56b27bcc7e Fix inconsistent argument type in HammingLUT distance (flann) 
this fixes 64-bit MSVC warning
 2012-10-10 00:31:22 +04:00
Vadim Pisarevsky
d54f4e1cfb added #undef True/False to avoid collision with X11 (Patch #1562) 2012-10-09 16:02:06 +04:00
Marius Muja
7236858bea Exposed HierarchicalClusteringIndex in OpenCV wrapper 2012-09-27 03:58:17 -07:00
Vadim Pisarevsky
0bd68a70f1 fixed #2297, #2300; fixed several warnings 2012-08-28 13:45:35 +04:00
Alexander Mordvintesv
647b1dd96c comment fixed 2012-08-07 23:19:13 +03:00
Alexander Mordvintesv
0998669d26 Revert "fixed LshIndex types in its constructor" 
This reverts commit 54d68da8e7.
 2012-08-07 21:37:19 +03:00
Maria Dimashova
54d68da8e7 fixed LshIndex types in its constructor 2012-07-24 17:09:24 +04:00
Vincent Rabaud
3df72fe669 fix gcc C++11 bug mentioned in http://answers.opencv.org/question/283 . Bug also fixed in FLANN upstream 2012-07-12 16:02:02 +00:00
Vadim Pisarevsky
73ce3ef8c1 fixed ios framework build (ticket #2092) 2012-06-27 19:52:59 +00:00
Andrey Kamaev
a381b95e91 Fixed buggy NEON check inside flann 2012-06-22 16:10:43 +00:00
Andrey Kamaev
e94e5866a1 Fixed mingw build warnings 2012-06-20 17:57:26 +00:00
Alexander Mordvintsev
08b2bd9174 fixed #1974 2012-06-11 07:20:34 +00:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Andrey Kamaev
f62028dc16 Fixed mingw build. 2012-06-08 03:15:08 +00:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Marius Muja
fd9a8c609f Bug fix in LSH index 2012-04-05 06:46:42 +00:00
Andrey Kamaev
72f2523d0f Fixed ~20 potential errors identified by the MS complier. 2012-03-31 11:09:16 +00:00
Vadim Pisarevsky
29077f11f8 got rid of "long double" in OpenCV; ticket #1515 2012-03-26 13:36:47 +00:00
Vadim Pisarevsky
4985c1b632 fixed hundreds of warnings from MSVC 2010. 2012-03-16 21:21:04 +00:00
Anatoly Baksheev
84db4eb6fa fixed ~200 warnings for windows 
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
 2012-02-14 10:22:34 +00:00
Marius Muja
fcf9a224fb Bug fix 2012-02-07 02:18:54 +00:00
Marius Muja
63efa5b2de Fixing ticket #1539 2012-01-09 21:31:51 +00:00
Marius Muja
f1efd955b4 Fix to solve conflicts to standalone FLANN 2011-12-12 09:39:02 +00:00
Marius Muja
4330777d1c Fixing uint32_t typedef for MSVC 2011-11-23 22:24:36 +00:00
Marius Muja
2c5de6dd59 Fix ticket #1346 2011-11-23 22:01:06 +00:00
Andrey Kamaev
d7ff92439d Better NEON Hamming distance 2011-10-26 13:04:53 +00:00
Marius Muja
a73b509b1e Clang compilation fixes, closes #1432 2011-10-18 18:37:47 +00:00
Vadim Pisarevsky
b74116e694 unified norm computing; added generalized Hamming distance 2011-10-11 15:13:53 +00:00
Vadim Pisarevsky
1e6479224a fixed bug #1331 2011-10-05 01:20:52 +00:00
Vadim Pisarevsky
60ebe2003f fixed multiple warnings on Windows. fixed bug #1368 2011-10-03 11:00:28 +00:00
Marius Muja
0e18f066a8 Fixing ticket #1402 2011-09-30 16:39:06 +00:00
Jose Luis Blanco
5029dfed87 Removed extra "," that raised GCC warnings. 2011-09-22 00:31:45 +00:00
Vadim Pisarevsky
cdbee71f1c always initialize the output values in LSH-based k-nearest search (patch by Alex Mordvintsev) 2011-09-14 10:57:50 +00:00
Alexander Mordvintsev
069c43835b work on #1360 (custom LshIndex params fixed) 2011-09-13 09:14:49 +00:00
Marius Muja
16dd655dd3 Fixing ticket #1366 2011-09-13 06:08:38 +00:00
Marius Muja
281b953815 Fixing include defines 2011-09-12 20:20:49 +00:00
Vadim Pisarevsky
a51a8ad577 fixed tickets #1301, #1303, #1305 2011-08-14 19:46:39 +00:00
Andrey Kamaev
874196e384 Implemented read/write methods for FlannBasedMatcher; fixed features2d wrappers for java 2011-08-04 14:13:07 +00:00
Vadim Pisarevsky
4884c911fb fixed compile warnings in FLANN about too long integer constants 2011-08-02 11:39:31 +00:00
Marius Muja
b5cfe6be32 Specifying correct parameter types for cv::flann::GenericIndex and cv::flann::Index_ 2011-07-25 23:58:54 +00:00
Vadim Pisarevsky
ff5e97c8e4 added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings 2011-07-19 12:27:07 +00:00
Marius Muja
d8ebf22444 Fixes 2011-07-18 22:01:42 +00:00
Marius Muja
ddc1267410 Checking for already defined proprocessor macros 2011-07-18 22:00:06 +00:00
Marius Muja
481256017e Fixing ticket #1230 2011-07-18 21:57:28 +00:00
Marius Muja
c071f5487e Fixing ticket #1228 2011-07-17 06:26:40 +00:00
Vadim Pisarevsky
ca2433c212 fixed opencv_flann (with flann 1.6) compile errors on Windows (VS2005 & VS2008) 2011-07-14 11:26:13 +00:00
Vadim Pisarevsky
562914e33b upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN. 2011-07-13 23:04:39 +00:00
Vadim Pisarevsky
848be8dfe1 temporarily reverted to FLANN 1.5 (FLANN 1.6 is put to a separate branch FLANN_1.6 until it's stabilized) 2011-06-20 09:20:17 +00:00
Vadim Pisarevsky
6767f1db9e added dummy symbol to flann to make OpenCV compile on Windows 2011-06-20 08:42:08 +00:00
Vadim Pisarevsky
24cb30fed5 fixed errors and warnings when building with MSVC 2011-06-20 07:53:46 +00:00
Marius Muja
3b2d4b57a0 Bringing get_param and print_params into cv::flann namespace. 2011-06-20 00:26:16 +00:00
Marius Muja
9153018bd2 Updated FLANN 2011-06-19 23:46:23 +00:00
Anatoly Baksheev
1c18e5fef9 fixed ~300 warnings under windows (had to hack gtest a bit) 2011-05-06 21:45:48 +00:00
Anatoly Baksheev
cce26e58b8 fixed warning: can't generate assignment operator 2011-05-06 18:29:53 +00:00
Vadim Pisarevsky
23a9b7bb9c fixed several warnings from Xcode 4 LLVM compiler; fixed bug #920 2011-04-30 19:29:26 +00:00
Marius Muja
53e6bab678 Prefixed constants in flann with FLANN_ to prevent clashes with constants from other includes, closes bug #890 2011-02-16 08:42:52 +00:00
Marius Muja
7d42dbdd71 Removing 'using namespace std' from header files, closes bugs #730 and #846 2011-02-16 06:36:15 +00:00
Maria Dimashova
40f0b1c009 fixed #841 2011-01-31 15:16:40 +00:00
Marius Muja
204c54291d Bug fix in flann wrapper 2011-01-06 05:46:08 +00:00
Marius Muja
9bf80fb209 Renaming log constants, fixes bug #792 2011-01-05 22:06:03 +00:00
Vadim Pisarevsky
695aa02e98 little change in flann save_value. Likely does not affect anything 2010-12-04 17:09:40 +00:00
Vadim Pisarevsky
1286c1db45 fixed multiple warnings from VS2010. 2010-11-25 16:55:46 +00:00
Vadim Pisarevsky
abfcf8a257 renamed PooledAllocator::malloc to PooledAllocator::allocateBytes, Matrix::free to Matrix::release to avoid conflicts with VisualStudio 2010-11-25 10:52:57 +00:00
Vadim Pisarevsky
d8ace43753 fixed some more tests on Windows; changed inheritance Matx -> Vec to Vec -> Matx 2010-11-06 21:51:21 +00:00
Vadim Pisarevsky
4a14795eb6 fixed several gcc 4.1 warnings 2010-10-21 18:30:57 +00:00
Vadim Pisarevsky
a44629d46f add missing #include <stdarg.h> 2010-10-20 19:56:21 +00:00
Marius Muja
e77e152a15 Renamed header include sentinels to fix compile problem when used together with standalone flann 2010-10-20 19:05:41 +00:00
Victor Erukhimov
0c3803a61c Fixing a problem with conflict of ROS and opencv flann 2010-10-20 15:08:26 +00:00
Vadim Pisarevsky
f678c8f07b made FLANN (and dependent on it code) build fine on Windows. Most of the changes are added CV_EXPORTS' into the class declarations and extern variables are turned into external functions (as a nice side effect the variables are now read-only) 2010-10-15 18:57:59 +00:00
Marius Muja
16b1f61c83 Updated FLANN to version 1.5 2010-10-12 19:47:50 +00:00