Ilya Lavrenov
|
37789f015a
|
deleted excess semicolons, commas
|
2014-01-18 01:31:33 +04:00 |
|
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 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +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 |
|
Vadim Pisarevsky
|
fbe0d6963c
|
disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW
|
2012-10-22 21:13:26 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Andrey Kamaev
|
95e657714f
|
Minor improvements: reduced verbosity of positioning tests; run.py - filter out non-executables on windows
|
2012-04-27 19:13:58 +00:00 |
|
Vadim Pisarevsky
|
bc3c49518d
|
ok, now positioning seem to work well, at least with ffmpeg 0.10.2 on MacOSX 10.7
|
2012-04-26 07:07:37 +00:00 |
|
Andrey Kamaev
|
2bedf5bfd5
|
Refactored build conditionals in highgui tests
|
2012-04-18 21:32:56 +00:00 |
|
Vadim Pisarevsky
|
b253665f8c
|
added explicit VideoWriter::release(). Fixed video stream finalization (write remaining frames); Fixed occasional crash in the case of odd-width or odd-height videos; Fixed a few problems in ffmpeg tests. Positioning still does not work well.
|
2012-04-09 23:12:52 +00:00 |
|
Alexander Shishkov
|
fc68c18c92
|
unrolled changes from r7601 (problems with Android,...)
|
2012-03-22 13:36:07 +00:00 |
|
Alexander Reshetnikov
|
ce8c2892d8
|
Removed OS conditions from highgui tests
|
2012-03-22 09:38:44 +00:00 |
|
Vadim Pisarevsky
|
4985c1b632
|
fixed hundreds of warnings from MSVC 2010.
|
2012-03-16 21:21:04 +00:00 |
|
Alexander Reshetnikov
|
a92e3dcdad
|
Updated positioning test (removed frame reading)
|
2012-02-27 14:37:20 +00:00 |
|
Alexander Reshetnikov
|
deee349ba7
|
removed highgui video tests execution on macos; also minor code changes
|
2012-02-15 12:06:46 +00:00 |
|
Alexander Reshetnikov
|
35c19442a7
|
updated 3 highgui tests
|
2012-02-11 15:28:03 +00:00 |
|
Alexander Reshetnikov
|
6ead21b1a2
|
added licenses to some tests; updated new highgui tests
|
2012-02-09 10:51:53 +00:00 |
|
Alexander Reshetnikov
|
46fa7b49c5
|
updated positioning test for videos
|
2012-02-06 13:53:25 +00:00 |
|
Andrey Morozov
|
b3b80bc397
|
fixed compile under linux
|
2012-02-05 08:09:00 +00:00 |
|
Alexander Reshetnikov
|
b4895dbcaf
|
completed tests checking positioning & frame count for videos (C interface); added new test videos
|
2012-02-04 16:17:05 +00:00 |
|
Alexander Reshetnikov
|
89702dc10c
|
File with positioning test was renamed to test_positioning.cpp
|
2012-02-04 15:55:12 +00:00 |
|