Roman Donchenko
|
f76dd99299
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
|
2013-08-19 19:02:36 +04:00 |
|
Roman Donchenko
|
d9f71b762f
|
Deleted almost all of the precomp.cpp files.
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
|
2013-08-08 12:43:07 +04:00 |
|
Andrey Kamaev
|
199a35a105
|
Move C API of opencv_video to separate file
|
2013-04-11 17:38:33 +04:00 |
|
Andrey Kamaev
|
62adc01980
|
Move cv::Rect_
|
2013-04-01 15:24:33 +04:00 |
|
Andrey Kamaev
|
addf0309ec
|
Move cv::Size_
|
2013-04-01 15:24:32 +04:00 |
|
Andrey Kamaev
|
13b31b0804
|
Move C++ basic structures to separate header and inverse dependency from C API
cv::Complex, cv::Point_ and cv::Point3_ are moved.
|
2013-04-01 15:24:32 +04:00 |
|
Andrey Kamaev
|
2ad7b97f1c
|
All modules (except ocl and gpu) compiles and pass tests
|
2013-03-22 22:14:26 +04:00 |
|
Andrey Kamaev
|
89356ff16d
|
Move non-CV functionality from core.hpp to separate utility.hpp header
|
2013-03-20 17:56:06 +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
|
a126532cb7
|
Fix OS X build warnings
|
2012-11-09 11:29:52 +04:00 |
|
marina.kolpakova
|
7a5b9a6b7f
|
replase __APPLE__ marco with __clang__
|
2012-11-01 19:34:05 +04:00 |
|
Andrey Kamaev
|
2b0072d823
|
Suppress more warnings in gtest on OS X
|
2012-10-24 20:36:30 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Andrey Kamaev
|
e900952b87
|
quiet most of the OSX build warnings
|
2012-07-05 12:56:31 +00:00 |
|
Andrey Kamaev
|
d9c74f63e1
|
All tests writing temporary files are updated to use cv::tempfile() function
|
2012-06-25 11:24:06 +00:00 |
|
Andrey Kamaev
|
d48d7b2b46
|
Updated warning options for GCC; fixed new warnings.
|
2012-06-20 12:27:02 +00:00 |
|
Andrey Kamaev
|
c5aba337e9
|
Fixed number of warnings. Fixed mingw64 build.
|
2012-06-12 14:46:12 +00:00 |
|
Andrey Kamaev
|
47a4e87784
|
Ignored warnings from gtest with precompiled headers enabled
|
2012-06-08 14:54:17 +00:00 |
|
Andrey Kamaev
|
3a1f85d4e8
|
Remerged the 2.4.0 branch
|
2012-05-02 20:20:14 +00:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +00:00 |
|
Vadim Pisarevsky
|
beb7fc3c92
|
a LOT of obsolete stuff has been moved to the legacy module.
|
2012-03-30 12:19:25 +00:00 |
|
Vadim Pisarevsky
|
957e80abbd
|
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
|
2012-03-15 14:36:01 +00:00 |
|