Roman Donchenko
|
95c2e8b51f
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
|
2013-09-10 11:30:19 +04:00 |
|
Roman Donchenko
|
6ebfa87181
|
Delete a bunch more trailing whitespace that slipped through the cracks.
|
2013-09-04 16:13:27 +04:00 |
|
Andrey Kamaev
|
90ff4e6fc8
|
Convert test image to losless format
This fixes java tests failing with new jpeg versions
|
2013-01-17 20:43:57 +04:00 |
|
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
2012-10-17 15:57:49 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Leonid Beynenson
|
3885772f3e
|
Added lbp cascade to the tests res/raw folder
|
2011-07-16 11:26:57 +00:00 |
|
Kirill Kornyakov
|
63f8feb2a1
|
java tests: added a chessboard image
|
2011-07-12 14:53:09 +00:00 |
|
Kirill Kornyakov
|
43097c6afb
|
lena added
|
2011-07-04 10:51:06 +00:00 |
|
Andrey Kamaev
|
150c2215bb
|
Fixed Android tests resources and settings
|
2011-06-30 14:16:14 +00:00 |
|
Kirill Kornyakov
|
56e26b9624
|
initial commit of JavaAPI unit tests
|
2011-06-30 09:29:35 +00:00 |
|