Andrey Kamaev [Tue, 23 Oct 2012 08:57:56 +0000 (12:57 +0400)]
Hide non-windows variable in gtest
Andrey Kamaev [Tue, 23 Oct 2012 08:52:54 +0000 (12:52 +0400)]
Don't use _interlockedExchangeAdd in case of GNU compiler
Andrey Kamaev [Tue, 23 Oct 2012 14:03:52 +0000 (18:03 +0400)]
Merge pull request #86 from taka-no-me/test/python_kmeans
Andrey Kamaev [Tue, 23 Oct 2012 13:28:01 +0000 (17:28 +0400)]
Merge pull request #84 from Daniil-Osokin/perfTest-warpPerspective
Andrey Kamaev [Tue, 23 Oct 2012 12:22:16 +0000 (16:22 +0400)]
Merge pull request #82 from taka-no-me/perf/fix_failures
Andrey Kamaev [Tue, 23 Oct 2012 12:20:56 +0000 (16:20 +0400)]
Merge pull request #88 from taka-no-me/build_ubuntu_x86_o2
Daniil Osokin [Tue, 23 Oct 2012 11:14:40 +0000 (15:14 +0400)]
extended perf test warpPerspectiveLarge
Andrey Kamaev [Tue, 23 Oct 2012 11:52:11 +0000 (15:52 +0400)]
Force build with -O2 instead of -O3 on 32-bit linux
Andrey Kamaev [Tue, 23 Oct 2012 11:28:44 +0000 (15:28 +0400)]
Remove wrong assertion
Andrey Kamaev [Tue, 23 Oct 2012 08:13:39 +0000 (12:13 +0400)]
Disable perf test for unstable solvePnPRansac
Andrey Kamaev [Tue, 23 Oct 2012 08:07:32 +0000 (12:07 +0400)]
Limit 32S data in perf test for addWeighted to avoid integer overflow
Andrey Kamaev [Tue, 23 Oct 2012 08:07:01 +0000 (12:07 +0400)]
Fix argument parsing for old command line parser
Andrey Kamaev [Mon, 22 Oct 2012 17:08:47 +0000 (21:08 +0400)]
Merge pull request #76 vpisarev/test_fixes_1
Vadim Pisarevsky [Mon, 22 Oct 2012 13:26:22 +0000 (17:26 +0400)]
disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW
Andrey Kamaev [Mon, 22 Oct 2012 16:56:53 +0000 (20:56 +0400)]
Merge pull request #79 from taka-no-me:warnings
Andrey Kamaev [Mon, 22 Oct 2012 15:13:29 +0000 (19:13 +0400)]
Fix OS X build warnings
Andrey Kamaev [Mon, 22 Oct 2012 14:46:26 +0000 (18:46 +0400)]
Fix windows build warnings
Andrey Kamaev [Mon, 22 Oct 2012 14:39:56 +0000 (18:39 +0400)]
Fix implementation of PCA overload with retained variance parameter
Andrey Kamaev [Mon, 22 Oct 2012 14:19:32 +0000 (18:19 +0400)]
Fix linux build warning
Andrey Kamaev [Mon, 22 Oct 2012 14:31:20 +0000 (18:31 +0400)]
Merge pull request #75 form taka-no-me:comments/2463
Andrey Kamaev [Mon, 22 Oct 2012 13:24:43 +0000 (17:24 +0400)]
Remove russian comments
Andrey Kamaev [Mon, 22 Oct 2012 12:39:09 +0000 (16:39 +0400)]
Merge pull request #55 from vpisarev/ocl_fixes
Andrey Kamaev [Mon, 22 Oct 2012 12:27:10 +0000 (16:27 +0400)]
Merge pull request #48 from kazuki-ma/2430_ostream_24
Vadim Pisarevsky [Mon, 22 Oct 2012 11:57:42 +0000 (04:57 -0700)]
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(?))
Vadim Pisarevsky [Mon, 22 Oct 2012 11:07:07 +0000 (04:07 -0700)]
Merge pull request #66 from alekcac/ios-armv7s
added support armv7s for iOS framework; tested on my computer (OSX 10.8, Xcode 4.5)
marina.kolpakova [Mon, 22 Oct 2012 09:16:27 +0000 (13:16 +0400)]
Merge remote-tracking branch 'cuda-geek/surf-with-mask-fix' into 2.4
Niko [Mon, 22 Oct 2012 07:14:22 +0000 (15:14 +0800)]
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
marina.kolpakova [Sun, 21 Oct 2012 07:37:35 +0000 (11:37 +0400)]
fix GPU SURF tests for masked case
marina.kolpakova [Sun, 21 Oct 2012 07:20:39 +0000 (11:20 +0400)]
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.
Kazuki MATSUDA [Sat, 20 Oct 2012 02:19:42 +0000 (11:19 +0900)]
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_)
Andrey Kamaev [Fri, 19 Oct 2012 16:49:19 +0000 (20:49 +0400)]
Merge pull request #65 from taka-no-me:android/warnings
Andrey Kamaev [Fri, 19 Oct 2012 14:46:47 +0000 (18:46 +0400)]
Merge pull request #64 from vpisarev/bugs_1939_2100
Vadim Pisarevsky [Fri, 19 Oct 2012 09:43:14 +0000 (13:43 +0400)]
fixed type "compatible -> incompatible" in the error message
Vadim Pisarevsky [Thu, 18 Oct 2012 11:29:03 +0000 (15:29 +0400)]
fixed bugs #2100 (kind of) and #1393
[edit: cleaned whitespace]
Alexander Shishkov [Fri, 19 Oct 2012 14:56:12 +0000 (18:56 +0400)]
added support armv7s for iOS framework
for supporting with iOS 6 devices
Andrey Kamaev [Fri, 19 Oct 2012 12:08:10 +0000 (16:08 +0400)]
Fix Android build warnings
Andrey Kamaev [Fri, 19 Oct 2012 11:02:30 +0000 (15:02 +0400)]
Merge pull request #54 from taka-no-me:doc/fix-signatures
Andrey Kamaev [Fri, 19 Oct 2012 10:57:08 +0000 (14:57 +0400)]
Merge pull request #50 from taka-no-me:parallel/fix-build-2445
Andrey Kamaev [Wed, 17 Oct 2012 13:00:53 +0000 (17:00 +0400)]
Include unistd.h to parallel.cpp on UNIX-like systems
This fixes build without TBB and CUDA. Issue #2445
marina.kolpakova [Fri, 19 Oct 2012 09:04:04 +0000 (13:04 +0400)]
Merge pull request #63 from jet47/gpu-sep-filters
Vladislav Vinogradov [Thu, 18 Oct 2012 06:59:25 +0000 (10:59 +0400)]
gpu separable filters for CV_8UC3, CV_32FC3 and CV_32FC4 types
Andrey Kamaev [Fri, 19 Oct 2012 07:16:50 +0000 (11:16 +0400)]
Merge pull request #61 from vpisarev/bug_2509
Andrey Kamaev [Fri, 19 Oct 2012 06:59:31 +0000 (10:59 +0400)]
Merge pull request #60 from kirill-kornyakov/documentation-link-to-answers2
Andrey Kamaev [Fri, 19 Oct 2012 06:26:58 +0000 (10:26 +0400)]
Merge pull request #51 from taka-no-me/java/fix-build-after-normalization
Andrey Kamaev [Thu, 18 Oct 2012 15:42:14 +0000 (19:42 +0400)]
Merge pull request #57 from vpisarev/bug_2429_2.4
Andrey Kamaev [Thu, 18 Oct 2012 15:35:57 +0000 (19:35 +0400)]
Fix weight calculation for the last pixel in generic area resize.
Also removed assigned only variable.
Vadim Pisarevsky [Wed, 17 Oct 2012 19:04:22 +0000 (23:04 +0400)]
fixed bug #2429
[edit: cleaned whitespace]
Vadim Pisarevsky [Thu, 18 Oct 2012 10:41:26 +0000 (14:41 +0400)]
fixed bug #2059
Kirill Kornyakov [Mon, 15 Oct 2012 13:56:59 +0000 (17:56 +0400)]
changed link to Q&A forum in the docs
Andrey Kamaev [Thu, 18 Oct 2012 09:21:41 +0000 (13:21 +0400)]
Merge pull request #56 from vpisarev/bug_2447_2.4
Vadim Pisarevsky [Wed, 17 Oct 2012 18:33:37 +0000 (22:33 +0400)]
fix bug #2447 - unary operator bug for single column matrix
Andrey Kamaev [Wed, 17 Oct 2012 17:24:55 +0000 (21:24 +0400)]
Eliminate discrepancies between signatures in documentation and OpenCV headers
All errors were found by doc/check_docs2.py
Andrey Kamaev [Wed, 17 Oct 2012 14:20:46 +0000 (18:20 +0400)]
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.
OpenCV Buildbot [Tue, 16 Oct 2012 23:18:30 +0000 (03:18 +0400)]
Normalize line endings and whitespace
vpisarev [Wed, 17 Oct 2012 11:08:03 +0000 (15:08 +0400)]
made opencv_ocl module build with VS2012
Andrey Kamaev [Tue, 16 Oct 2012 22:12:20 +0000 (02:12 +0400)]
Merge branch 'release2.4.3' into 2.4
Andrey Kamaev [Tue, 16 Oct 2012 16:03:07 +0000 (20:03 +0400)]
Fix build of samples
Andrey Kamaev [Tue, 16 Oct 2012 19:18:05 +0000 (23:18 +0400)]
Revert opencv_videostab to the state of 2.4.2
marina.kolpakova [Tue, 16 Oct 2012 14:06:45 +0000 (18:06 +0400)]
Fix binary compatibility of opencv_gpu
Andrey Kamaev [Tue, 16 Oct 2012 10:22:17 +0000 (14:22 +0400)]
Fix binary compatibility of Java wrappers
Andrey Kamaev [Tue, 16 Oct 2012 13:48:51 +0000 (17:48 +0400)]
Fix binary compatibility of opencv_objdetect
Andrey Kamaev [Mon, 15 Oct 2012 22:05:26 +0000 (02:05 +0400)]
Fix binary compatibility of opencv_nonfree
Andrey Kamaev [Mon, 15 Oct 2012 21:59:49 +0000 (01:59 +0400)]
Fix binary compatibility of opencv_contrib
Andrey Kamaev [Mon, 15 Oct 2012 21:06:37 +0000 (01:06 +0400)]
Fix binary compatibility of opencv_stitching
Andrey Kamaev [Tue, 16 Oct 2012 13:48:42 +0000 (17:48 +0400)]
Fix binary compatibility of opencv_ml
Andrey Kamaev [Mon, 15 Oct 2012 19:00:22 +0000 (23:00 +0400)]
Revert "skip of table header in MLData (#1962)"
This reverts commit
4d36be8794a56e3ea91fbd9df53e299dc8d951aa.
Conflicts:
modules/ml/include/opencv2/ml/ml.hpp
modules/ml/src/data.cpp
Andrey Kamaev [Mon, 15 Oct 2012 18:56:30 +0000 (22:56 +0400)]
Revert "yet another portion of changes towards the binary compatibility"
This reverts commit
618fbf5508c8a55cd9132605bb9fc4a686b3872a.
Andrey Kamaev [Mon, 15 Oct 2012 17:09:24 +0000 (21:09 +0400)]
Fix binary compatibility of opencv_features2d
Andrey Kamaev [Mon, 15 Oct 2012 16:46:39 +0000 (20:46 +0400)]
Fix binary compatibility of opencv_flann
Andrey Kamaev [Mon, 15 Oct 2012 16:26:42 +0000 (20:26 +0400)]
Revert "remaining C-style planar subdivisions data structures are moved to legacy"
This reverts commit
4aaaef5967240d2da4d78674048c0c3a1a6fef53.
Conflicts:
modules/imgproc/include/opencv2/imgproc/types_c.h
modules/legacy/include/opencv2/legacy/legacy.hpp
Andrey Kamaev [Mon, 15 Oct 2012 15:30:18 +0000 (19:30 +0400)]
Fix backward compatibility of opencv_core
Andrey Kamaev [Mon, 15 Oct 2012 15:46:57 +0000 (19:46 +0400)]
Revert "add new version of CommandLineParser. add empty docs"
This reverts commit
54a202b3d522f19a05993998ab40a40733a0d3b8.
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
Andrey Kamaev [Mon, 15 Oct 2012 15:30:47 +0000 (19:30 +0400)]
Revert "fixed compile error under linux"
This reverts commit
e2d9fc4dcc9d4f9bc3daefdaaa55e36e34fac7af.
Andrey Kamaev [Mon, 15 Oct 2012 14:12:33 +0000 (18:12 +0400)]
Return drawContours back to imgproc
This partly reverts commit
6ca618277c8ec110eb2a28f00cc3fb7329b1d00b.
Andrey Kamaev [Mon, 15 Oct 2012 13:53:57 +0000 (17:53 +0400)]
Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"
This reverts commit
eb4ce67dac4b0ebdb7e0c6f97cecd3bf263c14e5.
Conflicts:
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java
Andrey Kamaev [Mon, 15 Oct 2012 13:48:49 +0000 (17:48 +0400)]
Bring back escaped virtual destructors from 2.4.2
Andrey Kamaev [Mon, 15 Oct 2012 12:25:06 +0000 (16:25 +0400)]
Remove unused tbb::task_scheduler_init from perf tests
Andrey Kamaev [Mon, 15 Oct 2012 12:14:11 +0000 (16:14 +0400)]
Refactor thread management in performance tests
Kirill Kornyakov [Mon, 15 Oct 2012 11:23:38 +0000 (15:23 +0400)]
made imread description slightly better #2406
Vadim Pisarevsky [Mon, 15 Oct 2012 10:12:32 +0000 (14:12 +0400)]
another fix for #2332 test
Vadim Pisarevsky [Mon, 15 Oct 2012 09:55:32 +0000 (13:55 +0400)]
fixed build errors on Mac; moved test for #2332 from imgproc to highgui
Andrey Kamaev [Fri, 12 Oct 2012 16:06:40 +0000 (20:06 +0400)]
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
Andrey Kamaev [Fri, 12 Oct 2012 10:49:22 +0000 (14:49 +0400)]
Move thread-related functions implementation to parallel.cpp
Ilya Lavrenov [Mon, 15 Oct 2012 08:22:36 +0000 (12:22 +0400)]
fixed cvtColor (RGB <-> Lab) tests and created another one
Ilya Lavrenov [Mon, 15 Oct 2012 08:21:16 +0000 (12:21 +0400)]
fixed bug in cvtColor RGB(BGR) <-> Lab conversion
Anatoly Baksheev [Wed, 10 Oct 2012 20:54:45 +0000 (00:54 +0400)]
minor
KOLANICH [Fri, 12 Oct 2012 15:43:45 +0000 (19:43 +0400)]
replaced python build script with WSH one for windows platforms
Evgeny Talanin [Fri, 12 Oct 2012 14:43:00 +0000 (18:43 +0400)]
Added test inspired by #2332
Kirill Kornyakov [Fri, 12 Oct 2012 13:31:26 +0000 (17:31 +0400)]
deleted wrong line
Kirill Kornyakov [Fri, 12 Oct 2012 13:30:23 +0000 (17:30 +0400)]
commented wrong line
Kirill Kornyakov [Fri, 12 Oct 2012 13:10:58 +0000 (17:10 +0400)]
Added perf test for warpPerpsective with large resolutions
Vadim Pisarevsky [Fri, 12 Oct 2012 12:29:20 +0000 (16:29 +0400)]
Merge remote-tracking branch 'origin/master'
Vadim Pisarevsky [Fri, 12 Oct 2012 12:28:26 +0000 (16:28 +0400)]
finally, a proper fix for VNG (both SSE2 and C version)
marina.kolpakova [Fri, 12 Oct 2012 10:34:10 +0000 (14:34 +0400)]
FAIL_NO_CPU marco
marina.kolpakova [Fri, 12 Oct 2012 10:33:19 +0000 (14:33 +0400)]
minor ending fix
marina.kolpakova [Fri, 12 Oct 2012 10:32:47 +0000 (14:32 +0400)]
allow gpu module write sanity data for GPU and CPU tests in one xml
Daniil Osokin [Fri, 12 Oct 2012 10:38:37 +0000 (14:38 +0400)]
fixed 7 point mode in findFundamentalMat #1978
Evgeny Talanin [Fri, 12 Oct 2012 10:25:36 +0000 (14:25 +0400)]
#720 patch apply
Vsevolod Glumov [Fri, 12 Oct 2012 10:15:30 +0000 (14:15 +0400)]
Removed the phrase, that was causing all the confusion. Issue #2406.
+ Some minor formatting fixes.
Vadim Pisarevsky [Fri, 12 Oct 2012 10:01:47 +0000 (14:01 +0400)]
Merge remote-tracking branch 'origin/master'