Andrey Kamaev
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
Andrey Kamaev
f87987ed72
Honor multidimensional matrices in InputArray::total
2012-12-22 17:56:02 +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
8dbde3297e
Merge branch '2.4'
2012-10-23 20:32:19 +04:00
Andrey Kamaev
e64bb3654a
Remove wrong assertion
2012-10-23 15:28:44 +04:00
Andrey Kamaev
a3b1971977
Bring back escaped virtual destructors from 2.4.2
2012-10-15 17:48:49 +04:00
Daniil Osokin
1516a6169a
fixed one more msvc warning in tbb kmeans
2012-10-10 14:53:29 +04:00
Daniil Osokin
cc2d12b3e6
fixed msvc warning in tbb kmeans
2012-10-10 14:35:28 +04:00
daniil.osokin
e83ff354bd
added TBB for kmeans (patch #1261 : thanks to Boris Mansencal)
2012-10-10 12:51:12 +04:00
Vladislav Vinogradov
11367e2c3d
added GpuMat support to OutputArray
2012-10-02 14:34:17 +04:00
Andrey Kamaev
b0927397e9
#2225 Rename getConvertData to getConvertElem to match the headers and documentation
2012-08-15 15:34:33 +04:00
Andrey Kamaev
e4965b143f
Fixed discrepancy between SSE and regular baranches in FREAK
2012-06-28 11:08:11 +00:00
Andrey Kamaev
f09ae32796
Fixed Mat::isContinuous for big matrix (thanks to Boris Mansencal) #2103
2012-06-27 14:19:35 +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
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
Andrey Kamaev
5f9e295adf
Added test and workaround for #1942
2012-05-16 15:11:17 +00:00
Vadim Pisarevsky
52797a55e2
added support for vector<Mat_<>> in InputArray, OutputArray, split & merge
2012-05-11 13:36:48 +00:00
Vadim Pisarevsky
7a7dae3627
fixed problem with Mat::copyTo() with Mat_<> arguments (ticket #1918 )
2012-05-11 12:40:20 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Maria Dimashova
84c9990632
fixed cvKMeans2 ( #1359 )
2012-03-28 15:45:14 +00:00
Maria Dimashova
6636d255f7
fixed iter index in kmeans
2012-03-28 14:56:18 +00:00
Vadim Pisarevsky
d62e486b69
avoid empty clusters in k-means in a more elegant way (relates to ticket #7698 )
2012-03-28 14:32:23 +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
Andrey Kamaev
bfaae7dd93
Input/Output arrays are updated to support fixed-type and fixed-size semantic for all compatible types
2012-03-26 08:18:53 +00:00
Marina Kolpakova
0bc5140b17
allocate CPU memory if Tegra GPU allocator failed.
2012-03-16 14:11:39 +00:00
Victoria Zhislina
fbdb93ec79
CV_ENABLE_UNROLLED
2012-02-10 06:05:04 +00:00
Andrey Pavlenko
fb051f78de
adjusting custom mat allocator when mat type is changed
2011-12-28 14:47:21 +00:00
Andrey Kamaev
bdfd4c3062
Refactored Tegra related macro usage
2011-12-22 12:51:01 +00:00
Kirill Kornyakov
893f75444d
Optimized version of ReduceR functions and one ReduceC function added
...
Attention! Optimized ReduceC function produced the bug
2011-12-22 06:22:16 +00:00
Andrey Kamaev
d6ef0378a2
Reverted invalid cv::reduce optimization
2011-12-01 12:56:29 +00:00
Kirill Kornyakov
ab2ae86e86
Optimized version of Reduce functions added
2011-12-01 11:07:25 +00:00
Vladislav Vinogradov
bd4239be7b
moved OpenGL wrappers to separate header
...
added GlBuffer, GlTexture and GpuMat support to InputArray
replaced addTextOpenGl function by render + GlFont
2011-11-30 06:20:29 +00:00
Andrey Pavlenko
467f936459
Adding optimized Mat Allocator
2011-11-25 15:39:24 +00:00
Vadim Pisarevsky
b74116e694
unified norm computing; added generalized Hamming distance
2011-10-11 15:13:53 +00:00
Vadim Pisarevsky
a1d6671451
fixed bug #1370
2011-09-22 09:58:58 +00:00
Vladislav Vinogradov
ce35a6d8be
fixed bug in cv::reduce in reduceC_ for multi-channels source
2011-09-22 06:43:52 +00:00
Vadim Pisarevsky
6942799669
fixed kmeans center initialization in the case of huge matrices (ticket #1291 ); fixed warinings in libtiff.
2011-08-11 22:27:18 +00:00
Maria Dimashova
0d7a37c1e7
added an ability to make push_back to the empty matrix
2011-07-21 09:38:25 +00:00
Vadim Pisarevsky
ff5e97c8e4
added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings
2011-07-19 12:27:07 +00:00
Vadim Pisarevsky
b204e73d9a
propagated some more fixes from 2.3 branch to the trunk
2011-06-29 22:06:42 +00:00
Vadim Pisarevsky
9b6d8c3963
added reduce(..., CV_REDUCE_MIN/CV_REDUCE_MAX, ...) for 16u/16s (ticket #1145 )
2011-06-17 19:03:26 +00:00
Vadim Pisarevsky
2d2b8a496e
renamed "None()" to "noArray()" to avoid conflicts with X11 (ticket #1122 )
2011-06-08 06:55:04 +00:00
Vadim Pisarevsky
0c877f62e9
replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()).
2011-06-06 14:51:27 +00:00
Vadim Pisarevsky
f2f8fc14b0
proper fix for reduce with op=CV_REDUCE_AVG and ddepth==CV_8U
2011-06-01 13:44:09 +00:00
Ilya Lysenkov
29b45e70bd
Fixed cluster centers returning in cvKMeans2 (ticket #706 )
2011-06-01 12:06:39 +00:00
Alexander Shishkov
80dfdf8ff7
removed ddepth from matrix (after Vadim's commit, it generates problem with core and ml tests)
...
returned the new floating-point number formatting
2011-05-31 21:14:42 +00:00
Vadim Pisarevsky
6de72ea8ee
resolved tickets #904 (nicer floating-point formatting) and #816 (reduce with CV_REDUCE_AVG on 8-bit arrays)
2011-05-31 14:01:21 +00:00
Vadim Pisarevsky
3a1f24e74c
fixed mat.push_back(mat) (ticket #1091 )
2011-05-27 20:32:48 +00:00
Vadim Pisarevsky
dd45fe13d1
fixed OutputArray::create, which resolves several failures in opencv_test_core
2011-04-18 16:32:43 +00:00