Andrey Kamaev
69020da607
Merge branch 'release2.4.3' into 2.4
12 years ago
Andrey Kamaev
f4e33ea0ba
Fix build of samples
12 years ago
Andrey Kamaev
7225f89ea2
Revert opencv_videostab to the state of 2.4.2
12 years ago
marina.kolpakova
e5437e5486
Fix binary compatibility of opencv_gpu
12 years ago
Andrey Kamaev
ed51162568
Fix binary compatibility of Java wrappers
12 years ago
Andrey Kamaev
42c8a42ad3
Fix binary compatibility of opencv_objdetect
12 years ago
Andrey Kamaev
a07cc84436
Fix binary compatibility of opencv_nonfree
12 years ago
Andrey Kamaev
26bcb3812c
Fix binary compatibility of opencv_contrib
12 years ago
Andrey Kamaev
971d02cde6
Fix binary compatibility of opencv_stitching
12 years ago
Andrey Kamaev
edee177ef1
Fix binary compatibility of opencv_ml
12 years ago
Andrey Kamaev
7d6a2f1bca
Revert "skip of table header in MLData ( #1962 )"
...
This reverts commit 4d36be8794
.
Conflicts:
modules/ml/include/opencv2/ml/ml.hpp
modules/ml/src/data.cpp
12 years ago
Andrey Kamaev
0dc3d61071
Revert "yet another portion of changes towards the binary compatibility"
...
This reverts commit 618fbf5508
.
12 years ago
Andrey Kamaev
5a730d09cd
Fix binary compatibility of opencv_features2d
12 years ago
Andrey Kamaev
88e9a072ec
Fix binary compatibility of opencv_flann
12 years ago
Andrey Kamaev
64b56d7018
Revert "remaining C-style planar subdivisions data structures are moved to legacy"
...
This reverts commit 4aaaef5967
.
Conflicts:
modules/imgproc/include/opencv2/imgproc/types_c.h
modules/legacy/include/opencv2/legacy/legacy.hpp
12 years ago
Andrey Kamaev
ebac3a02aa
Fix backward compatibility of opencv_core
12 years ago
Andrey Kamaev
d566c6bc86
Revert "add new version of CommandLineParser. add empty docs"
...
This reverts commit 54a202b3d5
.
Conflicts:
modules/core/doc/command_line_parser.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/cmdparser.cpp
modules/gpu/perf/main.cpp
modules/gpu/test/main.cpp
modules/ts/src/ts_perf.cpp
12 years ago
Andrey Kamaev
52e490ef88
Revert "fixed compile error under linux"
...
This reverts commit e2d9fc4dcc
.
12 years ago
Andrey Kamaev
58f31819cc
Return drawContours back to imgproc
...
This partly reverts commit 6ca618277c
.
12 years ago
Andrey Kamaev
dbd30d4fba
Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"
...
This reverts commit eb4ce67dac
.
Conflicts:
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java
12 years ago
Andrey Kamaev
a3b1971977
Bring back escaped virtual destructors from 2.4.2
12 years ago
Andrey Kamaev
3ffe0f0117
Remove unused tbb::task_scheduler_init from perf tests
12 years ago
Andrey Kamaev
c3881ede62
Refactor thread management in performance tests
12 years ago
Kirill Kornyakov
aedf56404e
made imread description slightly better #2406
12 years ago
Vadim Pisarevsky
5b2271c6fb
another fix for #2332 test
12 years ago
Vadim Pisarevsky
78a0b9787c
fixed build errors on Mac; moved test for #2332 from imgproc to highgui
12 years ago
Andrey Kamaev
460644b8a4
Reimplement thread management functions:
...
* Refactor auto-detection of parallel frameworks
* Implement cv:getNumThreads, cv::setNumThreads and cv::getThreadNum for all supported frameworks
* From now cv::setNumThreads(0) can be used to turn off parallelisation
12 years ago
Andrey Kamaev
b54f59de90
Move thread-related functions implementation to parallel.cpp
12 years ago
Ilya Lavrenov
2cda65a782
fixed cvtColor (RGB <-> Lab) tests and created another one
12 years ago
Ilya Lavrenov
5f9aedbe01
fixed bug in cvtColor RGB(BGR) <-> Lab conversion
12 years ago
Anatoly Baksheev
f9ac5e2404
minor
12 years ago
KOLANICH
c1f2b1fcc4
replaced python build script with WSH one for windows platforms
12 years ago
Evgeny Talanin
cfe28e3b73
Added test inspired by #2332
12 years ago
Kirill Kornyakov
e770691522
deleted wrong line
12 years ago
Kirill Kornyakov
de98da42f7
commented wrong line
12 years ago
Kirill Kornyakov
84176fa027
Added perf test for warpPerpsective with large resolutions
12 years ago
Vadim Pisarevsky
fa368d6202
Merge remote-tracking branch 'origin/master'
12 years ago
Vadim Pisarevsky
5474b4d4bc
finally, a proper fix for VNG (both SSE2 and C version)
12 years ago
marina.kolpakova
319e861cf2
FAIL_NO_CPU marco
12 years ago
marina.kolpakova
8d7ac8ad19
minor ending fix
12 years ago
marina.kolpakova
800cb9d0e6
allow gpu module write sanity data for GPU and CPU tests in one xml
12 years ago
Daniil Osokin
4500c48349
fixed 7 point mode in findFundamentalMat #1978
12 years ago
Evgeny Talanin
5dd1ec98f7
#720 patch apply
12 years ago
Vsevolod Glumov
b91ca6a73f
Removed the phrase, that was causing all the confusion. Issue #2406 .
...
+ Some minor formatting fixes.
12 years ago
Vadim Pisarevsky
7bbf8744d6
Merge remote-tracking branch 'origin/master'
12 years ago
Vadim Pisarevsky
cb58e5a3a4
let Kalman handle the missing measurements (bug #1380 )
12 years ago
marina.kolpakova
296aa7c4fb
One more fix for Kepler-specific gpu::integral usage
12 years ago
Daniil Osokin
1d3ec99102
fixed batchDistance minimum finding #2292
12 years ago
Andrey Kamaev
2abb67cc92
Merge pull request #29 from thorikawa/feature-523
12 years ago
Evgeny Talanin
2e7656dbdf
#2192 patch apply
12 years ago