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
|
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
|
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
|
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 |
|
Vadim Pisarevsky
|
06a13d9ba0
|
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
|
2012-10-02 23:07:46 +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
|
2f40905548
|
Fixed Android build
|
2012-06-08 08:11:17 +00:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Alexey Spizhevoy
|
d8fa374167
|
Fixed the multi-band blending test
|
2012-02-01 10:00:38 +00:00 |
|
Alexey Spizhevoy
|
c09eae4969
|
Updated the multi-band blending test
|
2012-01-31 14:36:55 +00:00 |
|
Alexey Spizhevoy
|
7ddb706b29
|
Added a test for the multi-band blender
|
2012-01-30 10:31:10 +00:00 |
|
Alexey Spizhevoy
|
e99b090871
|
Fixed bug in ROI based features finder (stitching)
|
2011-09-26 13:17:06 +00:00 |
|