Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Alexander Smorkalov
7c5bd78804
Test fixes
...
Calib3d badarg tests fixed. Default exception handling enabled;
Highgui Video I/O tests fixed on ARM;
Code cleanup.
2013-06-27 15:47:37 +04:00
Alexander Smorkalov
43122939cb
Media foundation video i/o fixes.
...
Bug in Video for Windows capture init fixed;
Media Foundation based capture finalization fixed;
Highgui tests for video i/o updated.
2013-06-25 03:35:30 -07:00
Alexander Smorkalov
996f02a531
Multiple Media Foundation video i/o fixes.
...
Video i/o tests enabled for media foundation;
Negative stride support added to VideoCapture;
Error handling improved, dead lock in case of playback error fixed;
Some code refacotring done.
2013-06-24 02:45:27 -07:00
Fedor Morozov
84ea0c9a97
Tests and rgbe fix
2013-06-24 05:54:58 +04:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from 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
Alexander Smorkalov
4703f4552a
Experimental MS Media Foundation API support added
2013-04-02 18:10:55 -07:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
Alexander Smorkalov
09bc99a0c0
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 08:03:51 -07:00
Alexander Smorkalov
de95a2b278
Video IO tests turned off for ARM WinRT.
2013-03-27 00:45:41 -07:00
Alexander Smorkalov
7ec2b6bad0
Highgui tests for GUI disabled for WinRT;
...
Warnings fix;
2013-03-21 16:18:19 +04:00
Andrey Kamaev
2d764fe1c6
Merge pull request #665 from taka-no-me:core_utility
2013-03-21 14:47:49 +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
AoD314
7d0c600504
improved test of webp
2013-03-19 18:04:15 +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
AoD314
eb012a5993
added tests for WebP
2013-03-11 11:51:46 +04:00
Andrey Kamaev
68bb317ce1
Merge pull request #462 from kobigurk:master
2013-02-28 00:38:20 +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
kobigurk
18a5b8dfc6
fixed tab indent
2013-02-13 14:21:34 +02:00
kobigurk
88e0127f44
API of TiffDecoder back to what it was - normalizeChannelsNumber moved to protected
...
test code unified - channels number is tested for other formats as well
2013-02-13 14:13:36 +02:00
kobigurk
109e047a28
* img_test is now tested for channel numbers instead of img
...
* fixed indentation to use spaces and trailing spaces
2013-02-13 13:33:07 +02:00
Ilya Lavrenov
5512f91d08
removed libstdc++ dependency
2013-02-12 14:20:23 +04:00
kobigurk
9f80c6c989
added test for 4 channel tiff
2013-02-12 11:21:51 +02:00
Andrey Kamaev
5cae645ba1
Temporary disabled parallel_writers_and_readers test
2013-02-11 16:52:20 +04:00
Andrey Kamaev
3c39e146a3
Make parallel video writer test pass if compiled without threading support
2013-02-04 14:34:44 +04:00
Alexander Smorkalov
75191e8f2f
Smartek Giganetix Cameras support (Patch #2192 ) integrated to master.
2013-02-01 16:54:00 +04:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Andrey Kamaev
55b90d7bae
Modify decode_tile16384x16384 test to not fail when available memory is not enough for test
2013-01-31 18:51:24 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
Andrey Kamaev
2d6253609c
Fix truncation of fourcc value in dshow capture property setter (bug #2535 )
...
Added test checking that all valid fourcc values are converted properly
2013-01-31 12:00:04 +04:00
Andrey Kamaev
9b4f2d1b53
Merge pull request #373 from ilysenkov:bugfix_2440
2013-01-30 19:37:16 +04:00
Andrey Kamaev
11871528ce
Solve conflict between tiff.h and opencv2/core/types_c.h
...
Сonflict exists between some versions of libtiff and opencv headers
2013-01-30 16:36:50 +04:00
Ilya Lysenkov
56fbcc541f
Tested cvDestroyAllWindows() without windows
2013-01-30 15:25:10 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
b4d0dff4c5
Added minimal support for tiff encoder parameters and test for issue #2161
2013-01-30 00:07:30 +04:00
Andrey Kamaev
78a338159d
Merge branch '2.4'
2013-01-29 14:17:13 +04:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +04:00
Andrey Kamaev
da884b4e1d
Merge pull request #347 from asmorkalov:WITH_FFMPEG_logic
2013-01-29 14:00:10 +04:00
Alexander Smorkalov
8c45b9d03d
Video IO perf tests guarded.
2013-01-29 11:09:49 +04:00
Andrey Kamaev
255cd61a8c
Improve error reporting of JPEG image encoder
...
OpenCV issue #2604
After this patch applied an attempt to encode empty images produces exception
saying "Raw image encoder error: Empty JPEG image (DNL not supported)"
2013-01-28 16:55:00 +04:00
Andrey Kamaev
00fbf58902
Revert incompletely applied patch from #2192
...
This reverts commit 2e7656dbdf
2012-12-03 09:55:53 +04:00
Ilya Lavrenov
4abf0b3193
thread-safe VideoWriter and VideoCapture
2012-11-19 16:44:23 +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
3e10e057cb
Merge pull request #110 from vpisarev/test_fixes2
2012-10-31 16:52:50 +04:00
Vadim Pisarevsky
63bd6f9adf
fixed compile errors in ocl tests; disabled a few problematic tests
2012-10-29 23:37:18 +04:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +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
Vadim Pisarevsky
5b2271c6fb
another fix for #2332 test
2012-10-15 14:12:32 +04:00
Vadim Pisarevsky
78a0b9787c
fixed build errors on Mac; moved test for #2332 from imgproc to highgui
2012-10-15 13:55:32 +04:00
Evgeny Talanin
2e7656dbdf
#2192 patch apply
2012-10-12 13:03:43 +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
Vadim Pisarevsky
58fb8692c3
added test for png encoding bug #2352
2012-09-17 16:44:40 +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
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +00:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +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
Evgeny Talanin
d3c73071ea
Temporarily disable test on Mac
2012-05-29 11:41:24 +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
Alexander Shishkov
0ac70e6883
fixed #1421
2012-03-29 13:46:54 +00:00
Vadim Pisarevsky
0404b2989e
fixed line clipping (ticket #1284 )
2012-03-29 13:06:38 +00:00
Alexander Reshetnikov
cff117c08b
Updated saving paths for highgui tests
2012-03-28 15:27:55 +00:00
Alexander Reshetnikov
76852a499d
Minor refactoring of video i/o tests: fixed error with indexes
2012-03-28 14:05:26 +00:00
Alexander Reshetnikov
8313095734
Changed saving paths for another highgui tests
2012-03-28 13:49:55 +00:00
Alexander Reshetnikov
07ec83cd1f
Updated ffmpeg test for big video writing (changed saving paths + added removing files)
2012-03-28 12:15:25 +00:00
Alexander Reshetnikov
a185302c5d
Updated test_video_pos.cpp
2012-03-28 11:33:36 +00:00
Alexander Reshetnikov
0aa74f3846
Updated new video positioning test
2012-03-23 16:41:41 +00:00
Alexander Reshetnikov
e3d0c6515f
Added new video posiitioning test
2012-03-23 08:53:56 +00:00
Alexander Reshetnikov
7817e11e01
Fixed compilation error under Windows
2012-03-22 22:26:33 +00:00
Alexander Reshetnikov
6de7064836
Updated ffmpeg test for big video writing
2012-03-22 22:18:43 +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
Alexander Reshetnikov
5d4a8d0889
Updated license text in highgui files
2012-03-20 16:39:02 +00:00
Vadim Pisarevsky
846e37ded5
fixed many warnings from GCC 4.6.1
2012-03-17 09:22:31 +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
d7763d99de
Minor code changes in test_video_io.cpp
2012-02-22 22:10:53 +00:00
Alexander Reshetnikov
23c2275449
Added conditional compiling for video i/o tests in highgui.
2012-02-22 17:12:25 +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
edc9d4f951
fixed compiling error under Windows; updated test_video_io.cpp
2012-02-13 12:41:27 +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
Alexander Reshetnikov
a41b0902f4
Prepared some videos for future tests. Added first version of common positioning video test.
2012-01-31 21:02:05 +00:00
Andrey Kamaev
4168a698f6
Fixed highgui tests for Android
2011-12-20 07:45:49 +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
Alexander Shishkov
d40b37dbf3
modified output stream
2011-06-17 11:51:15 +00:00
Andrey Morozov
03c7784186
added several new highgui tests
2011-06-03 08:33:27 +00:00
Andrey Morozov
19900d9894
converted all highgui tests to the format of google test system
2011-06-02 15:23:37 +00:00
Vadim Pisarevsky
ddd8f897fe
fixed drawing test
2011-06-02 12:45:00 +00:00
Andrey Morozov
da9e3ed6fb
commented several tests because it's very slow
2011-06-02 11:43:13 +00:00
