Roman Donchenko
6d84671e8b
Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix
11 years ago
Roman Donchenko
ea3dd9d5e7
Merge pull request #2103 from ilya-lavrenov:typo
11 years ago
Roman Donchenko
4e35ebb52f
Merge pull request #2102 from Nerei:compilatin_for_windows
11 years ago
Patrick Tsai
b24f7ee57c
Fix compiler error with Android NDK r8e
...
Original error without the fix:
opencv/modules/objdetect/src/cascadedetect.cpp: In member function 'bool cv::CascadeClassifierImpl::ocl_detectSingleScale(const cv::_InputArray&, cv::Size, int, double, cv::Size)':
/opencv/modules/objdetect/src/cascadedetect.cpp:1215:
error: no matching function for call to 'cv::ocl::Kernel::args(cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, int, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::Size&, int&, float, cv::Rect&, cv::Size&, cv::CascadeClassifierImpl::<anonymous enum>)'
11 years ago
David Schmidt
ef61964768
Update py_face_detection.rst
...
bug in example
11 years ago
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
11 years ago
Ilya Lavrenov
0119e8553c
fixed cv::mixChannels OpenCL version
11 years ago
Nghia Ho
601b7d1dd3
Fixed a valgrind 'Conditional jump or move depends on uninitialised value(s)' on cv::kmeans(...). The original code used points(sampleCount, 1, CV_32FC2), which confused generateCentersPP into thinking it is a 1 dimensional center, instead of 2. As a result it would set only the x variable and leave y unitialised.
11 years ago
Kazuki Matsuda
2ae20c74a2
Fix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m)
...
Fix compilation erros when compiling this constructor.
First argument type of "convertTo" should be instance, not a pointer of instance.
First pull request was created for master branch.
But it should be marged for 2.4.
https://github.com/Itseez/opencv/pull/2113
11 years ago
Ilya Lavrenov
3a4d4080f4
fixed overflow for cv::norm NORM_L2
11 years ago
Pierre-Emmanuel Viel
3f458c6eb1
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified
11 years ago
Robbert Klarenbeek
e21c6e19db
Fix algorithm setter argument validation for uchar
11 years ago
Ilya Lavrenov
0c49360318
fixed typo
11 years ago
Anatoly Baksheev
c2dd7fd762
compilation for windows
11 years ago
Roman Donchenko
5327482b46
Merge pull request #2084 from ilya-lavrenov:cont
11 years ago
Vadim Pisarevsky
1c3bfae212
Merge pull request #1957 from Nerei:format_declaration_by_default
11 years ago
Roman Donchenko
984c4d200f
Set the version status to "-tp", for "technical preview".
11 years ago
Ilya Lavrenov
4f9c081dc3
fixed bug #3319
11 years ago
Roman Donchenko
cd576c7364
Merge pull request #2096 from kamjagin:master
11 years ago
Roman Donchenko
157202fc8d
Merge pull request #2094 from SpecLad:multimon-be-gone
11 years ago
Andrey Pavlenko
2d5723ccca
Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix
11 years ago
Andrey Pavlenko
967703c3ac
Merge pull request #2093 from SpecLad:merge-2.4
11 years ago
Andrey Pavlenko
8a456c5a6b
Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe
11 years ago
Miroslav Kobetski
3f07655231
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
11 years ago
Andrey Pavlenko
8151571dd6
Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs
11 years ago
Ilya Lavrenov
3e1bec5248
added OpenCL version of cv::patchNaNs
11 years ago
Ilya Lavrenov
a2e683d133
fixed umat access
11 years ago
Roman Donchenko
4ce684e61c
Merge pull request #2087 from ilya-lavrenov:remap_sse2_cond
11 years ago
Roman Donchenko
795c108f2b
Fixed MinGW build by declaring the minimal required Windows version.
...
Also deleted miscellaneous remaining multimon cruft.
Deleted #include <winuser.h>, because <windows.h> includes it
already.
This should have a nice side effect of preventing us from
accidentally using any Windows API that's too new.
11 years ago
Roman Donchenko
6811d2ab24
Merge pull request #2086 from ilya-lavrenov:mul_fix
11 years ago
Roman Donchenko
5f9c117d78
Merge pull request #2085 from severin-lemaignan:emscripten
11 years ago
Roman Donchenko
6d4c80083e
Merge pull request #2089 from ilya-lavrenov:tapi_examples
11 years ago
Roman Donchenko
cdc10defa3
Merge commit '05b9c991dd' into merge-2.4
...
Conflicts:
modules/cuda/test/test_objdetect.cpp
modules/gpu/perf/perf_core.cpp
modules/gpu/perf/perf_video.cpp
modules/gpu/test/test_core.cpp
11 years ago
Ilya Lavrenov
5db1754d49
SSE2 optimization of cv::remap doesn't work with big images
11 years ago
Séverin Lemaignan
9e13e3a5a4
[emscripten] Do not link to system libraries
...
This is not meaningful when compiling to javascript, and causes warning
at linking stage.
11 years ago
Roman Donchenko
e33759b358
Merge commit '46be47cb4b8' into merge-2.4 (-s ours)
11 years ago
Roman Donchenko
1312eca220
Merge commit '0566ab4d3d' into merge-2.4
...
Conflicts:
modules/core/src/system.cpp
11 years ago
Roman Donchenko
82e2e6dbc3
Merge commit '719149877e' into merge-2.4 (-s ours)
11 years ago
Roman Donchenko
7f795e964f
Merge commit 'ee36717d' into merge-2.4
11 years ago
Roman Donchenko
9dfb96389c
Merge commit '4b885e206' into merge-2.4
11 years ago
Roman Donchenko
d611509842
Merge commit '709e8e8e0' into merge-2.4
11 years ago
Ilya Lavrenov
09d25e11c6
fixed bug #3341
11 years ago
Roman Donchenko
09e154d214
Merge commit '60906d917' into merge-2.4
...
Conflicts:
modules/ts/src/cuda_perf.cpp
11 years ago
Roman Donchenko
2cdbf6c0b6
Merge commit '8fe79738c' into merge-2.4
11 years ago
Roman Donchenko
39fb8e03d7
Merge commit 'b94963d38' into merge-2.4
...
Conflicts:
cmake/OpenCVGenAndroidMK.cmake
11 years ago
Roman Donchenko
ce7a2f7edc
Merge commit '24be7b26c' into merge-2.4 (-s ours)
11 years ago
Roman Donchenko
0e552ea6e2
Merge commit '1acc1085d' into merge-2.4
11 years ago
Roman Donchenko
2de4ad0598
Merge commit 'edce617a5' into merge-2.4 (-s ours)
11 years ago
Roman Donchenko
9b7e77ccda
Merge commit '83cdd43a' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
11 years ago
Roman Donchenko
8c589438d1
Merge commit 'f22d9a23' into merge-2.4 (-s ours)
11 years ago