bfa466dcbd
Merge pull request #75 form taka-no-me:comments/2463
2012-10-22 18:31:20 +04:00
9900f8deb2
Remove russian comments
2012-10-22 17:24:43 +04:00
769f61f8c7
Merge pull request #55 from vpisarev/ocl_fixes
2012-10-22 16:40:18 +04:00
d1d6ce63fc
Merge pull request #48 from kazuki-ma/2430_ostream_24
2012-10-22 16:27:10 +04:00
eea6fe8e7f
Merge pull request #71 from NikoKJ/ocl4_2.4.3
...
This patch is for the ocl module of 2.4.3
(tested on Mac (OSX 10.8, Xcode 4.5, OpenCL 1.1(?))
2012-10-22 04:57:42 -07:00
1770ba1df7
Merge pull request #66 from alekcac/ios-armv7s
...
added support armv7s for iOS framework; tested on my computer (OSX 10.8, Xcode 4.5)
2012-10-22 04:07:07 -07:00
8e2f729aa7
Merge remote-tracking branch 'cuda-geek/surf-with-mask-fix' into 2.4
2012-10-22 13:16:27 +04:00
5df77a841e
remove redundant OPENCL_DIR flag
...
remove as much warnings as possible
use enum instead of MACRO for ocl.hpp
add command line parser in accuracy test and perf test
some bug fix for arthim functions
2012-10-22 15:14:22 +08:00
b14f447cc6
fix GPU SURF tests for masked case
2012-10-21 11:40:08 +04:00
99c666691e
Restore core multiply/divide depth to CV_64F value.
...
After setting depth to CV_32F for non double types this produces difference in results. I've attached test that reproduce this issue.The issue was found during anali broken GPU tests for multiply/device functions.
2012-10-21 11:20:39 +04:00
72c93dabd3
Add stream operators (Requested #2430 )
...
Add output stream operators (<<) for Rect, Size, Matx, Vec.
I can't add operations for cv::KeyPoint.
And putting together all operator<<.
(Matx, Point_, Point3_, Vec, Size_, Rect_)
2012-10-20 11:19:42 +09:00
b6a2717c2b
Merge pull request #65 from taka-no-me:android/warnings
2012-10-19 20:49:19 +04:00
59452dfc6f
Merge pull request #64 from vpisarev/bugs_1939_2100
2012-10-19 20:47:58 +04:00
40a30b6f30
fixed type "compatible -> incompatible" in the error message
2012-10-19 20:47:58 +04:00
d652cc72f2
fixed bugs #2100 (kind of) and #1393
...
[edit: cleaned whitespace]
2012-10-19 20:47:57 +04:00
2dba13f7d4
added support armv7s for iOS framework
...
for supporting with iOS 6 devices
2012-10-19 19:36:20 +04:00
8fb6d9f650
Fix Android build warnings
2012-10-19 16:14:14 +04:00
546ec2af65
Merge pull request #54 from taka-no-me:doc/fix-signatures
2012-10-19 15:02:30 +04:00
09abcd567e
Merge pull request #50 from taka-no-me:parallel/fix-build-2445
2012-10-19 14:57:08 +04:00
7173c82382
Include unistd.h to parallel.cpp on UNIX-like systems
...
This fixes build without TBB and CUDA. Issue #2445
2012-10-19 14:38:30 +04:00
ec8fb32336
Merge pull request #63 from jet47/gpu-sep-filters
2012-10-19 13:08:44 +04:00
34b4a35ea7
gpu separable filters for CV_8UC3, CV_32FC3 and CV_32FC4 types
2012-10-19 12:41:14 +04:00
9a97c74ef3
Merge pull request #61 from vpisarev/bug_2509
2012-10-19 11:17:25 +04:00
49397f7946
Merge pull request #60 from kirill-kornyakov/documentation-link-to-answers2
2012-10-19 11:00:10 +04:00
1341c64290
Merge pull request #51 from taka-no-me/java/fix-build-after-normalization
2012-10-19 10:27:16 +04:00
65d07c56fb
Merge pull request #57 from vpisarev/bug_2429_2.4
2012-10-18 19:42:14 +04:00
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
80f9bd864f
fixed bug #2429
...
[edit: cleaned whitespace]
2012-10-18 19:39:22 +04:00
c40718ab61
fixed bug #2059
2012-10-18 14:41:26 +04:00
908f25bc43
changed link to Q&A forum in the docs
2012-10-18 14:25:34 +04:00
634fedc3cb
Merge pull request #56 from vpisarev/bug_2447_2.4
2012-10-18 13:28:01 +04:00
f5742e6cac
fix bug #2447 - unary operator bug for single column matrix
2012-10-18 13:28:01 +04:00
461b69f6ee
Eliminate discrepancies between signatures in documentation and OpenCV headers
...
All errors were found by doc/check_docs2.py
2012-10-17 21:24:55 +04:00
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
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
f75946a16a
made opencv_ocl module build with VS2012
2012-10-17 15:08:03 +04:00
69020da607
Merge branch 'release2.4.3' into 2.4
2012-10-17 02:17:08 +04:00
f4e33ea0ba
Fix build of samples
2012-10-17 02:09:46 +04:00
7225f89ea2
Revert opencv_videostab to the state of 2.4.2
2012-10-17 02:09:43 +04:00
e5437e5486
Fix binary compatibility of opencv_gpu
2012-10-17 02:09:40 +04:00
ed51162568
Fix binary compatibility of Java wrappers
2012-10-17 02:09:37 +04:00
42c8a42ad3
Fix binary compatibility of opencv_objdetect
2012-10-17 02:09:34 +04:00
a07cc84436
Fix binary compatibility of opencv_nonfree
2012-10-17 02:09:31 +04:00
26bcb3812c
Fix binary compatibility of opencv_contrib
2012-10-17 02:09:28 +04:00
971d02cde6
Fix binary compatibility of opencv_stitching
2012-10-17 02:09:26 +04:00
edee177ef1
Fix binary compatibility of opencv_ml
2012-10-17 02:09:23 +04:00
7d6a2f1bca
Revert "skip of table header in MLData ( #1962 )"
...
This reverts commit 4d36be8794
2012-10-17 02:09:20 +04:00
0dc3d61071
Revert "yet another portion of changes towards the binary compatibility"
...
This reverts commit 618fbf5508
2012-10-17 02:09:17 +04:00
5a730d09cd
Fix binary compatibility of opencv_features2d
2012-10-17 02:09:14 +04:00
88e9a072ec
Fix binary compatibility of opencv_flann
2012-10-16 15:13:00 +04:00
Andrey Kamaev