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
|
e5a33723fc
|
Move C API of opencv_calib3d to separate file
|
2013-04-11 21:00:17 +04:00 |
|
Andrey Kamaev
|
517062039e
|
Make core/internal.hpp a private header
|
2013-04-01 17:29:10 +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
|
6e244c83cd
|
Corrected sanity checks in several perf tests
Also fixed a typo in performance testing framework and removed hardcoded
temporary file name from highgui perf test
|
2012-12-12 01:00:47 +04:00 |
|
Anna Kogan
|
4e21f42714
|
increased time-limits
|
2012-11-28 18:17:33 +04:00 |
|
Andrey Kamaev
|
a126532cb7
|
Fix OS X build warnings
|
2012-11-09 11:29:52 +04:00 |
|
Andrey Kamaev
|
63ee26adda
|
Merge pull request #127 from cuda-geek/apple2clang
|
2012-11-02 14:29:39 +04:00 |
|
marina.kolpakova
|
7a5b9a6b7f
|
replase __APPLE__ marco with __clang__
|
2012-11-01 19:34:05 +04:00 |
|
Andrey Kamaev
|
e3be5f138a
|
Fixed sanity checks in several performance tests
|
2012-11-01 16:29:30 +04:00 |
|
Andrey Kamaev
|
2b0072d823
|
Suppress more warnings in gtest on OS X
|
2012-10-24 20:36:30 +04:00 |
|
Andrey Kamaev
|
585f3bc391
|
Disable perf test for unstable solvePnPRansac
|
2012-10-23 12:13:39 +04:00 |
|
Andrey Kamaev
|
5a5c477be6
|
Make performance tests for solvePnPRansec more determenistic
|
2012-10-09 18:41:26 +04:00 |
|
Andrey Kamaev
|
f8672d49a0
|
Add sanity checks to calib3d perf tests
|
2012-10-09 15:28:51 +04:00 |
|
Andrey Kamaev
|
73cb77842e
|
Replace jpegs with png (see 06a13d9 )
|
2012-10-05 18:15:44 +04:00 |
|
Daniil Osokin
|
45c49a9088
|
Added perf test
|
2012-08-10 17:37:48 +04:00 |
|
Andrey Kamaev
|
e900952b87
|
quiet most of the OSX build warnings
|
2012-07-05 12:56:31 +00:00 |
|
Andrey Kamaev
|
47a4e87784
|
Ignored warnings from gtest with precompiled headers enabled
|
2012-06-08 14:54:17 +00:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Vadim Pisarevsky
|
4985c1b632
|
fixed hundreds of warnings from MSVC 2010.
|
2012-03-16 21:21:04 +00:00 |
|
Andrey Kamaev
|
65f5343ed5
|
Refactored performance tests. TEST_CYCLE macro is renamed to TEST_CYCLE_N; SIMPLE_TEST_CYCLE is renamed to TEST_CYCLE; from now 100 iterations are default for performance tests
|
2011-12-29 16:46:16 +00:00 |
|
Andrey Kamaev
|
f937d68d60
|
Fixed build for x64 with sse2 disabled; several improvements in performance testing framework; enabled SANITY_CHECK() for performance tests
|
2011-12-27 16:37:24 +00:00 |
|
Andrey Kamaev
|
99d3ce52c5
|
Added performance tests for findCirclesGrid and solvePnP
|
2011-09-13 07:54:19 +00:00 |
|