Roman Donchenko
ebb6c842f9
Merge pull request #1295 from asmorkalov:winrt_ptr_usage_fix
2013-08-21 18:28:36 +04:00
Alexander Smorkalov
b15addec70
C4447 warning about main function format suppressed.
2013-08-21 07:24:46 -07:00
Alexander Smorkalov
d62c98527a
Invalid usage of cv::Ptr for arrays fixed.
2013-08-21 07:20:35 -07:00
Vladislav Vinogradov
de214950c4
minor gpu TVL1 optical flow optimization:
...
don't calc diff term if it is not used for epsilon criterion
2013-08-21 18:17:45 +04:00
Roman Donchenko
1a7c2eefb8
Merge pull request #1306 from jet47:gpu-bitwize-fix
2013-08-21 16:18:31 +04:00
Hanusz Leszek
32635a6834
using unsigned char instead of uint8_t to compile under windows
2013-08-21 12:33:51 +02:00
Roman Donchenko
868e355e33
Merge pull request #1269 from kdrobnyh:FindIPP-cmake-script
2013-08-21 13:32:27 +04:00
Roman Donchenko
84a9755597
Merge pull request #1215 from jet47:cuda-5.5-sanity
2013-08-21 13:25:28 +04:00
kdrobnyh
ea5dd74af1
Add IPP 8.0 support in FindIPP script
2013-08-21 13:02:18 +04:00
Roman Donchenko
7831a2d45c
Merge pull request #1314 from jet47:ts-gpu-fix
2013-08-21 11:56:29 +04:00
Vladislav Vinogradov
2899d558ac
record cuda gpu name to output report
2013-08-21 10:12:44 +04:00
Vladislav Vinogradov
b7ec673001
added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros
2013-08-21 10:00:40 +04:00
Hanusz Leszek
cf39ba5801
Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel
...
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
2013-08-21 05:31:44 +02:00
Vladislav Vinogradov
cb2985c526
fixed gpu bitwize operation:
...
incorrect types for template instantiation
2013-08-20 16:28:45 +04:00
Roman Donchenko
9667a8a1ae
Fix the name of perf tests' precompiled header.
...
(cherry picked from commit aa96d8d053
2013-08-20 14:54:31 +04:00
Roman Donchenko
adc1dd2799
Merge pull request #1301 from asmorkalov:java_video_capture_fix
2013-08-20 12:12:22 +04:00
Alexander Smorkalov
e37f7a4c73
Typo in Java generator fixed.
...
Typo breaks debug build for Android platform.
2013-08-19 16:27:06 +04:00
kdrobnyh
c1de14c27a
Fix bilateralFilter function
2013-08-19 15:52:34 +04:00
Roman Donchenko
abf372d759
Fixed incorrect extension on 3rdparty/libpng/opencv-libpng.patch.
2013-08-19 15:00:36 +04:00
Roman Donchenko
70fffa48e5
Merge pull request #1293 from jet47:gpu-cvtcolor-fix
2013-08-19 14:14:22 +04:00
Roman Donchenko
bed3512dd5
Merge pull request #1288 from nghiaho12:haar
2013-08-19 12:04:24 +04:00
Vladislav Vinogradov
cfbd791465
fixed gpu cvtColor for BGR <-> YUV
2013-08-19 11:56:58 +04:00
kdrobnyh
e18651059d
Merge pull request #4 from Itseez/2.4
...
OpenCV changes
2013-08-17 09:24:43 -07:00
kdrobnyh
3c9f307193
macros -> template in IPP support cvtColor
2013-08-17 20:04:03 +04:00
Nghia Ho
c6858c3fb0
Buffer is accessed out of bounds.
2013-08-17 20:32:13 +10:00
Roman Donchenko
449b99a6d7
Merge pull request #1286 from SpecLad:optflow-sf-init
2013-08-16 19:59:26 +04:00
Roman Donchenko
7919bcef70
Merge pull request #1277 from NCBee:2.4
2013-08-16 19:59:12 +04:00
Bahram Dahi
230bc03d97
Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp
2013-08-16 08:14:32 -07:00
Roman Donchenko
e8f85903c5
Merge pull request #1280 from asmorkalov:winrt_detect_fix
2013-08-16 19:03:45 +04:00
Alexander Smorkalov
ddbeac503c
WindowsRT availability check reorganized. Build script updated.
2013-08-16 05:22:54 -07:00
Roman Donchenko
5ca1b559a8
Merge pull request #1284 from melody-rain:superres_example_2
2013-08-16 16:07:41 +04:00
Roman Donchenko
7d768d2159
In calcOpticalFlowSF, fixed several uninitialized uses of matrices.
...
This should fix that pesky test failure that pops up from time to time.
I don't actually know if the default values should be zeros, but the tests
pass, so...
2013-08-16 14:43:18 +04:00
Roman Donchenko
47b3e7855f
Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix
2013-08-16 14:05:39 +04:00
Roman Donchenko
a3bbb3dd3d
Merge pull request #1279 from asmorkalov:ocv_opt_tabs
2013-08-16 13:58:14 +04:00
Jin Ma
1bcd1fd3a2
Used perf_precomp.hpp instead of precomp.hpp for test.
2013-08-16 17:39:17 +08:00
Roman Donchenko
46fb737bdc
Merge pull request #1152 from StevenPuttemans:bugfix_2795
2013-08-16 12:52:48 +04:00
Jin Ma
8fb6b689c6
1. Added OpenCL version of superres to the sample.
...
2. Modified according to the feedback of the community.
2013-08-16 16:31:31 +08:00
Roman Donchenko
ac8506db32
Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix
2013-08-16 12:22:18 +04:00
Alexander Smorkalov
a3dd13450c
All optimized function tables wrapped to getters to change its
...
initialization time.
2013-08-16 12:10:07 +04:00
Jin Ma
a3aa7966ae
Resolved compiling errors under Linux.
2013-08-16 16:07:53 +08:00
Roman Donchenko
35cb59bb22
Merge pull request #1258 from apavlenko:java_video_capture
2013-08-16 12:05:13 +04:00
Jin Ma
916b92bc3b
Resolved a compiling warning under Windows.
2013-08-16 15:33:43 +08:00
Jin Ma
8feaadc69f
Resolved a compiling error under Linux.
2013-08-16 15:25:11 +08:00
Jin Ma
3fb0bf6e99
Added MOG and MOG2.
2013-08-16 14:19:46 +08:00
Andrey Pavlenko
5a9bd3f080
restoring binary compatibility
2013-08-15 23:49:32 +04:00
Roman Donchenko
95143fdc13
Merge pull request #1275 from rdm12:bug_1922
2013-08-15 19:12:23 +04:00
Alexander Smorkalov
9af2c1661a
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
...
for libpng added.
2013-08-15 06:42:00 -07:00
Dmitry Retinskiy
ab8c0fde52
applied comments after review
2013-08-15 16:18:01 +04:00
Roman Donchenko
73c5069f54
Merge pull request #1276 from nghiaho12:mushroom
2013-08-15 12:05:02 +04:00
Bahram Dahi
83e21568ee
Minor bug fix, missing const in method signature
2013-08-14 15:54:13 -07:00
