Andrey Kamaev
0442bca235
Revert "partially recovered binary compatibility (ticket #2415 )"
...
This reverts commit 94b97b7a63
.
2012-10-16 19:37:12 +04:00
Andrey Kamaev
075372a71c
Revert "fixed compilation error because of DetectionBasedTracker"
...
This reverts commit 9b8c47399a
.
2012-10-16 19:37:02 +04:00
Andrey Kamaev
e7b81688a4
Revert "yet another portion of changes towards the binary compatibility"
...
This reverts commit 618fbf5508
.
2012-10-16 19:35:57 +04:00
Andrey Kamaev
18ab16dbd3
Revert "some more fixes towards binary compatibility"
...
This reverts commit a8c5e35619
.
Conflicts:
modules/imgproc/src/imgwarp.cpp
2012-10-16 19:35:28 +04:00
Andrey Kamaev
88e9a072ec
Fix binary compatibility of opencv_flann
2012-10-16 15:13:00 +04:00
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
2012-10-16 15:13:00 +04:00
Andrey Kamaev
ebac3a02aa
Fix backward compatibility of opencv_core
2012-10-16 15:13:00 +04:00
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
2012-10-15 20:01:44 +04:00
Andrey Kamaev
52e490ef88
Revert "fixed compile error under linux"
...
This reverts commit e2d9fc4dcc
.
2012-10-15 20:01:44 +04:00
Andrey Kamaev
58f31819cc
Return drawContours back to imgproc
...
This partly reverts commit 6ca618277c
.
2012-10-15 18:12:33 +04:00
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
2012-10-15 17:53:57 +04:00
Andrey Kamaev
a3b1971977
Bring back escaped virtual destructors from 2.4.2
2012-10-15 17:48:49 +04:00
Andrey Kamaev
3ffe0f0117
Remove unused tbb::task_scheduler_init from perf tests
2012-10-15 16:25:06 +04:00
Andrey Kamaev
c3881ede62
Refactor thread management in performance tests
2012-10-15 16:14:11 +04:00
Kirill Kornyakov
aedf56404e
made imread description slightly better #2406
2012-10-15 15:23:38 +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
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
2012-10-15 12:44:16 +04:00
Andrey Kamaev
b54f59de90
Move thread-related functions implementation to parallel.cpp
2012-10-15 12:44:16 +04:00
Ilya Lavrenov
2cda65a782
fixed cvtColor (RGB <-> Lab) tests and created another one
2012-10-15 12:22:36 +04:00
Ilya Lavrenov
5f9aedbe01
fixed bug in cvtColor RGB(BGR) <-> Lab conversion
2012-10-15 12:21:16 +04:00
Anatoly Baksheev
f9ac5e2404
minor
2012-10-12 23:03:31 +04:00
KOLANICH
c1f2b1fcc4
replaced python build script with WSH one for windows platforms
2012-10-12 23:03:30 +04:00
Evgeny Talanin
cfe28e3b73
Added test inspired by #2332
2012-10-12 18:43:00 +04:00
Kirill Kornyakov
e770691522
deleted wrong line
2012-10-12 17:31:26 +04:00
Kirill Kornyakov
de98da42f7
commented wrong line
2012-10-12 17:30:23 +04:00
Kirill Kornyakov
84176fa027
Added perf test for warpPerpsective with large resolutions
2012-10-12 17:14:23 +04:00
Vadim Pisarevsky
fa368d6202
Merge remote-tracking branch 'origin/master'
2012-10-12 16:29:20 +04:00
Vadim Pisarevsky
5474b4d4bc
finally, a proper fix for VNG (both SSE2 and C version)
2012-10-12 16:28:26 +04:00
marina.kolpakova
319e861cf2
FAIL_NO_CPU marco
2012-10-12 14:46:18 +04:00
marina.kolpakova
8d7ac8ad19
minor ending fix
2012-10-12 14:46:18 +04:00
marina.kolpakova
800cb9d0e6
allow gpu module write sanity data for GPU and CPU tests in one xml
2012-10-12 14:46:18 +04:00
Daniil Osokin
4500c48349
fixed 7 point mode in findFundamentalMat #1978
2012-10-12 14:38:52 +04:00
Evgeny Talanin
5dd1ec98f7
#720 patch apply
2012-10-12 14:25:36 +04:00
Vsevolod Glumov
b91ca6a73f
Removed the phrase, that was causing all the confusion. Issue #2406 .
...
+ Some minor formatting fixes.
2012-10-12 14:15:30 +04:00
Vadim Pisarevsky
7bbf8744d6
Merge remote-tracking branch 'origin/master'
2012-10-12 14:01:47 +04:00
Vadim Pisarevsky
cb58e5a3a4
let Kalman handle the missing measurements (bug #1380 )
2012-10-12 14:01:36 +04:00
marina.kolpakova
296aa7c4fb
One more fix for Kepler-specific gpu::integral usage
2012-10-12 13:45:09 +04:00
Daniil Osokin
1d3ec99102
fixed batchDistance minimum finding #2292
2012-10-12 13:25:55 +04:00
Andrey Kamaev
2abb67cc92
Merge pull request #29 from thorikawa/feature-523
2012-10-12 13:16:17 +04:00
Evgeny Talanin
2e7656dbdf
#2192 patch apply
2012-10-12 13:03:43 +04:00
Andrey Kamaev
83799d6bf4
Fix Mat indexing in TrackingMotion tutorial code (supersedes pull request #38 )
2012-10-12 12:59:50 +04:00
Vladislav Vinogradov
304714862f
fixed bug in gpu::HOGDescriptor::computeConfidenceMultiScale
2012-10-12 12:49:10 +04:00
Vladislav Vinogradov
8abcad6b00
fixed CUDA_FAST_MATH flag
2012-10-12 12:49:10 +04:00
Andrey Kamaev
a390c1e2e6
Merge pull request #40 from emchristiansen/manualBRISKFREAK
2012-10-12 12:31:11 +04:00
Eric Christiansen
594ce1c869
fixed indentation
2012-10-12 12:31:11 +04:00
Eric Christiansen
caebcdcb3d
Minor tweak to add BRISK and FREAK support for the Java wrapper
2012-10-12 12:31:11 +04:00
Andrey Kamaev
a3a658c034
Quiet MSVC warning
2012-10-12 12:19:34 +04:00
Vadim Pisarevsky
bddd06e6c4
another fix for the updated parallel_for_ implementation
2012-10-11 23:22:32 +04:00
Vadim Pisarevsky
d64438dcfd
fixed build errors in the case of TBB and Concurrency
2012-10-11 23:04:45 +04:00