mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 12:10:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,153 Commits 6 Branches 126 Tags 3 GiB
9a97c74ef3
Commit Graph

4021 Commits

Author SHA1 Message Date
Andrey Kamaev
9a97c74ef3 Merge pull request #61 from vpisarev/bug_2509 2012-10-19 11:17:25 +04:00
Andrey Kamaev
1341c64290 Merge pull request #51 from taka-no-me/java/fix-build-after-normalization 2012-10-19 10:27:16 +04:00
Andrey Kamaev
65d07c56fb Merge pull request #57 from vpisarev/bug_2429_2.4 2012-10-18 19:42:14 +04:00
Andrey Kamaev
e1c3ffb23f Fix weight calculation for the last pixel in generic area resize. 
Also removed assigned only variable.
 2012-10-18 19:41:45 +04:00
Vadim Pisarevsky
80f9bd864f fixed bug #2429 
[edit: cleaned whitespace]
 2012-10-18 19:39:22 +04:00
Vadim Pisarevsky
c40718ab61 fixed bug #2059 2012-10-18 14:41:26 +04:00
Vadim Pisarevsky
f5742e6cac fix bug #2447 - unary operator bug for single column matrix 2012-10-18 13:28:01 +04:00
Andrey Kamaev
57d077b936 Fix Java API generation after normalization 
The rst_parser.py was unintentionally corrupted by normalization.
This fix repairs the script and fixes Java API generation.
 2012-10-17 18:20:46 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
7225f89ea2 Revert opencv_videostab to the state of 2.4.2 2012-10-17 02:09:43 +04:00
marina.kolpakova
e5437e5486 Fix binary compatibility of opencv_gpu 2012-10-17 02:09:40 +04:00
Andrey Kamaev
ed51162568 Fix binary compatibility of Java wrappers 2012-10-17 02:09:37 +04:00
Andrey Kamaev
42c8a42ad3 Fix binary compatibility of opencv_objdetect 2012-10-17 02:09:34 +04:00
Andrey Kamaev
a07cc84436 Fix binary compatibility of opencv_nonfree 2012-10-17 02:09:31 +04:00
Andrey Kamaev
26bcb3812c Fix binary compatibility of opencv_contrib 2012-10-17 02:09:28 +04:00
Andrey Kamaev
971d02cde6 Fix binary compatibility of opencv_stitching 2012-10-17 02:09:26 +04:00
Andrey Kamaev
edee177ef1 Fix binary compatibility of opencv_ml 2012-10-17 02:09:23 +04:00
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
 2012-10-17 02:09:20 +04:00
Andrey Kamaev
0dc3d61071 Revert "yet another portion of changes towards the binary compatibility" 
This reverts commit 618fbf5508.
 2012-10-17 02:09:17 +04:00
Andrey Kamaev
5a730d09cd Fix binary compatibility of opencv_features2d 2012-10-17 02:09:14 +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
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