Commit Graph

328 Commits

Author SHA1 Message Date
Anatoly Baksheev
50946b59c1 minor device namespace refactor 2012-12-10 17:36:02 +04:00
Andrey Kamaev
18e77d606c Drop functions working with multibyte characters 2012-12-08 18:18:11 +04:00
Vladislav Vinogradov
b689eca8a0 fixed OpenGL tests
now create window only once per test case
2012-12-05 14:18:57 +04:00
Vladislav Vinogradov
05d842bcd8 a bit more opengl refactoring:
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
* fixed indentation in gl_core_3_1
* minor improvments for opengl sample
2012-12-03 13:11:06 +04:00
Vladislav Vinogradov
08fbf667f9 refactored opengl functionality
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
2012-11-30 17:35:28 +04:00
Andrey Kamaev
49c35fafc0 Adjust OpenCV version to 2.4.3.1 2012-11-30 14:33:28 +04:00
Vladislav Vinogradov
d2591704e8 Merge branch 'kepler-optimization' into cuda-dev 2012-11-27 16:34:45 +04:00
marina.kolpakova
1712d0930c Merge origin/master into cuda-dev 2012-11-26 18:56:33 +04:00
Vladislav Vinogradov
f00efcfc59 added optimized deviceSupports function 2012-11-26 11:41:52 +04:00
Andrey Kamaev
7f542e391a Merge branch 2.4
Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Andrey Kamaev
04481d9ef4 Fix Android build with clang compiler 2012-11-20 15:20:04 +04:00
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
Vladislav Vinogradov
afff9cf716 Optimized buffers reuse in gpu module:
ensureSizeIsEnough now doesn't reallocate memory, if buffer is small submat of big matrix
fixed createContinous according new changes
2012-11-12 10:30:35 +04:00
Andrey Kamaev
e5ffbf9498 Fix stream output operator for Vec<uchar,n>
This fixes output for 8U and 8S vector depths.
They were mistakenly printed as characters instead of numbers.
2012-11-09 09:54:43 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
Vadim Pisarevsky
9a08b7be45 fixed compile problem with the old Xcode (<4.5) 2012-11-02 15:29:16 +04:00
Andrey Kamaev
4a2f626d85 Remove "-rc" suffix from version 2012-11-02 14:27:34 +04:00
marina.kolpakova
09dec4e873 Merge pull request #124 from branch taka-no-me:vs8-vs9-tbb 2012-11-01 19:26:30 +04:00
Vadim Pisarevsky
d9d4e8df6f fixed bugs #2300 (Vector::dot) and #2467 (build with Xcode 4.5 with --stdlib=libc++) 2012-11-01 16:37:39 +04:00
Andrey Kamaev
fd4909360f Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library. 2012-11-01 12:44:10 +04:00
Andrey Kamaev
729d76ad09 Merge branch '2.4' 2012-10-25 15:32:48 +04:00
LeonidBeynenson
d6aa3bd8ed Made changes in cv::Algorithm
made it to give more verbose errors when arguments of wrong types are passed, added setters with types (e.g. setInt, etc)
2012-10-23 21:37:27 +04:00
Andrey Kamaev
8dbde3297e Merge branch '2.4' 2012-10-23 20:32:19 +04:00
Andrey Kamaev
6f08d03322 Advance version number to 2.4.3-rc 2012-10-23 17:59:59 +04:00
Andrey Kamaev
40030d2ca0 Fix windows build warnings 2012-10-22 19:13:18 +04:00
Andrey Kamaev
57775988e7 Merge branch '2.4' 2012-10-22 16:57:56 +04:00
Kazuki MATSUDA
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
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
0442bca235 Revert "partially recovered binary compatibility (ticket #2415)"
This reverts commit 94b97b7a63.
2012-10-16 19:37:12 +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
ebac3a02aa Fix backward compatibility of opencv_core 2012-10-16 15:13:00 +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
a3b1971977 Bring back escaped virtual destructors from 2.4.2 2012-10-15 17:48:49 +04:00
Vadim Pisarevsky
8441cf700d added function cv::findNonZero (patch #2205) 2012-10-11 22:52:15 +04:00
Vadim Pisarevsky
354a5f2686 added recommended number of stripes to parallel_for_, modified some of the functions to use larger stripes (for better performance) 2012-10-11 22:37:14 +04:00
Vadim Pisarevsky
7ee6040192 enable Matx as Mat elements (bug #1705). 2012-10-11 15:02:48 +04:00
Vadim Pisarevsky
a135e862c1 made opencv headers windows.h-less (Bug #2122) 2012-10-09 17:12:42 +04:00
Vadim Pisarevsky
a8c5e35619 some more fixes towards binary compatibility 2012-10-09 15:56:16 +04:00
Vadim Pisarevsky
4be7619ce4 _InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3 2012-10-08 21:37:15 +04:00
Vadim Pisarevsky
94b97b7a63 partially recovered binary compatibility (ticket #2415) 2012-10-08 17:06:05 +04:00
Vladislav Vinogradov
11367e2c3d added GpuMat support to OutputArray 2012-10-02 14:34:17 +04:00
Andrey Kamaev
f32eb05ea1 Fix AVX and other SIMD support detection 2012-09-17 13:30:28 +04:00
Vadim Pisarevsky
0598f33a85 refactored command line parser, fixed the docs 2012-09-07 17:44:01 +04:00
AoD314
54a202b3d5 add new version of CommandLineParser. add empty docs 2012-09-07 13:24:48 +04:00
Andrey Kamaev
bcd0aefbca Fix gcc build errors and warnings 2012-09-05 15:51:51 +04:00
Kevin
93155c6ae0 Overloaded PCA constructor and ( ) operator to implement Feature#2287 - PCA that retains a specified amount of variance from the data. A sample was added to samples/cpp to demonstrate the new functionality. Docs and Tests were also updated 2012-09-04 13:58:59 +04:00
Vincent Rabaud
f56432559e add conversion from/to Matx 2012-08-28 15:13:41 +04:00
Vadim Pisarevsky
0bd68a70f1 fixed #2297, #2300; fixed several warnings 2012-08-28 13:45:35 +04:00
Anatoly Baksheev
70204a8e68 Removed PtrElemStep, Marked DevMem1D as deprecated, now should use PtrStepSz now 2012-08-24 02:02:42 +04:00
Vincent Rabaud
1baf5209c4 fix the compile bug 2012-08-23 14:20:31 +02:00
Vladislav Vinogradov
da5aaab277 optimized gpu::integral for Kepler 2012-08-22 12:13:34 +04:00
Vadim Pisarevsky
8efb84b5a4 added ios camera support in highgui. turned on optimization in opencv2.framework (ticket #2232) 2012-08-20 19:36:36 +04:00
Vadim Pisarevsky
41b6d25bdd added cross-platform Mutex implementation; enable platform-native (GDC/Concurrency) parallel_for_ implementation when TBB is not installed. 2012-08-17 17:32:06 +04:00
Vladislav Vinogradov
7928cec670 added linesAccumGlobal kernel 2012-08-15 13:18:35 +04:00
Alexander Mordvintesv
a2df490914 added CV_IN_OUT to img argument of drawing functions 2012-08-08 11:18:52 +03:00
Vadim Pisarevsky
310b1ad7b9 moved parallel_for_ and ParallelLoopBody to core.hpp 2012-08-03 16:41:00 +04:00
Vadim Pisarevsky
fd9069422a Merge remote-tracking branch 'origin/master' 2012-08-03 16:14:38 +04:00
Ilya Lavrenov
27c2aa3a4e parallel version of bilateral filter was implemented using parallel_for_ 2012-08-02 16:25:30 +04:00
Vadim Pisarevsky
fac3d9994c integrated another portion of SSE optimizations from Grigory Frolov 2012-07-31 19:07:55 +04:00
Sam Bromley
49b55a7245 Protect check for _MSC_VER with #if defined. 2012-07-26 12:35:21 -02:30
Vadim Pisarevsky
b782d8bb53 integrated patch with some SSE2/SSE4.2 optimizations from Grigory Frolov 2012-07-24 17:24:31 +04:00
Marina Kolpakova
66aff45e96 fixed #2130 2012-07-05 20:55:55 +00:00
Andrey Kamaev
e900952b87 quiet most of the OSX build warnings 2012-07-05 12:56:31 +00:00
Andrey Kamaev
afe11f69fb Fixed Windows build warnings and configuration problem. 2012-06-30 20:45:01 +00:00
Leonid Beynenson
6d3fecd490 Fixed small bug in cv::Ptr<_Tp> conversion to cv::Ptr<_Tp2>. Now this conversion is made in a more accurate way. 2012-06-29 16:38:03 +00:00
Andrey Kamaev
4d09d62f85 Added Ptr<T> support to AlgorithmInfo; fixed some warnings 2012-06-29 07:46:53 +00:00
Vadim Pisarevsky
fd901d8323 fixed #2108 (thanks to Vincent for the report and proposed solution) 2012-06-28 15:52:34 +00:00
Leonid Beynenson
d822989c8b Added template method cv::Algorithm::set(const char* _name, const Ptr<_Tp>& value),
which allows to pass as the second parameter of the method set any cv::Ptr<_Tp> object.
2012-06-28 12:17:11 +00:00
Andrey Kamaev
e4965b143f Fixed discrepancy between SSE and regular baranches in FREAK 2012-06-28 11:08:11 +00:00
Andrey Kamaev
7dcbf32532 Fixed WString related build problem in Android build 2012-06-18 13:08:59 +00:00
Andrey Kamaev
7cccc93bdf Fixed Android build warnings and few warnings in specific cnfigurations 2012-06-13 13:19:43 +00:00
Andrey Kamaev
c5aba337e9 Fixed number of warnings. Fixed mingw64 build. 2012-06-12 14:46:12 +00:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Alexander Shishkov
74786075e3 test commit 2012-06-06 09:21:09 +00:00
Alexander Shishkov
80a4157f11 test commit 2012-06-06 09:12:11 +00:00
Andrey Kamaev
834a0b518c Trunk OpenCV version is set to 2.4.9 2012-05-31 11:59:43 +00:00
Vadim Pisarevsky
17d9509e31 changed "void FileStorage::release(string&)" to "string FileStorage::releaseAndGetString()" 2012-05-30 13:02:45 +00:00
Vadim Pisarevsky
74882fe188 replaced "string FileStorage::release()" with 2 methods to preserve backward compatibility. 2012-05-30 11:29:22 +00:00
Andrey Kamaev
05de6302fd Fixed documentation: corrected parameter names 2012-05-29 10:36:19 +00:00
Andrey Kamaev
6ca618277c More fixes for documentation. 2012-05-28 20:11:38 +00:00
Vadim Pisarevsky
bc929a7d46 added API for storing OpenCV data structures to text string and reading them back 2012-05-28 15:38:58 +00:00
Andrey Kamaev
78329b0dfe New bunch of documentation fixes 2012-05-28 14:36:15 +00:00
Andrey Kamaev
71625ad458 Fixed more documentation & source discrepancies 2012-05-28 11:22:43 +00:00
Vadim Pisarevsky
fd68cc768a fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876) 2012-05-21 14:56:07 +00:00
Maria Dimashova
28297c0224 fixed Mat::diag (#1939) 2012-05-18 14:38:54 +00:00
Vadim Pisarevsky
52797a55e2 added support for vector<Mat_<>> in InputArray, OutputArray, split & merge 2012-05-11 13:36:48 +00:00
Andrey Kamaev
3a1f85d4e8 Remerged the 2.4.0 branch 2012-05-02 20:20:14 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vladislav Vinogradov
f65d841d6f fixed several warnings (VS2010, Win64)
added getParams method to VideoWriter_GPU
2012-04-23 14:22:02 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Alexander Shishkov
66fd36f79e changed version to 2.4 2012-04-01 08:58:24 +00:00
Andrey Kamaev
1af9b8ecab Applied patch from #1133 2012-03-30 06:19:21 +00:00
Vadim Pisarevsky
586ff429ec fixed bug #1318. extended RNG::fill with the optional saturateRange parameter 2012-03-29 12:00:34 +00:00
Vadim Pisarevsky
56f5fcd28c added Vec Matx::solve(Vec) (ticket #1376) 2012-03-28 15:21:30 +00:00
Andrey Kamaev
9941cf7c95 Fixed MSCV2005 build with TBB enabled. 2012-03-27 23:17:53 +00:00
Andrey Kamaev
8eb788c6e7 #842 #include <sys/mman.h> is moved from public headers closer to usage 2012-03-27 21:29:58 +00:00
Vadim Pisarevsky
af8e5696f0 fixed a few compile problems in SparseMat code; fixed iteration over an empty sparse matrix (ticket #1587) 2012-03-27 14:43:24 +00:00
Vladislav Vinogradov
eaea6782d5 added more assertion on device features to gpu functions and tests
moved TargerArchs and DeviceInfo to core
fixed bug in GpuMat::copy with mask (incorrect index in function tab)
2012-03-27 10:34:30 +00:00