Roman Donchenko
9bb1a7d34d
Merge pull request #1234 from SpecLad:ios-plist
2013-08-23 15:43:08 +04:00
Roman Donchenko
cae4480834
Merge pull request #1332 from pengx17:2.4_fix_parallel
2013-08-23 14:47:49 +04:00
Alexander Shishkov
16814c7fb1
Update build_framework.py
2013-08-23 12:51:50 +04:00
Roman Donchenko
e1397f6c1f
Merge pull request #1324 from SpecLad:try-compile
2013-08-23 12:06:57 +04:00
Roman Donchenko
ceb522ad2f
Merge pull request #1329 from SpecLad:msvc-werror
2013-08-23 12:04:33 +04:00
peng xiao
2519a21935
Fix a potential bug of ParallelLoopBodyWrapper::operator(Range)
...
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.
2013-08-23 15:35:55 +08:00
Roman Donchenko
10860783ef
Added warnings-as-errors support for MSVC.
2013-08-22 18:25:38 +04:00
Roman Donchenko
a9e9ce859e
Fix errors in usages of try_compile
...
* There's no OPENCV_BINARY_DIR variable;
* No need to append CMakeFiles/CMakeTmp, as CMake does it for you;
* Output variables are unused;
* Wrong usage of CMAKE_FLAGS;
* Small quoting and style issues.
2013-08-22 15:56:35 +04:00
Roman Donchenko
20bf1aa244
Merge pull request #1321 from asmorkalov:winrt_mode_warn_fix
2013-08-22 12:46:00 +04:00
Roman Donchenko
fe4c7ae4ae
Merge pull request #1317 from jet47:gpu-tvl1-optimization
2013-08-22 11:55:24 +04:00
Roman Donchenko
43aec5ad4a
Merge pull request #1318 from SpecLad:wow
2013-08-22 11:49:45 +04:00
Alexander Smorkalov
8aae54b7f4
WindowsRT mode build warning fix.
2013-08-21 23:59:27 -07:00
Roman Donchenko
9c60a2c24c
Merge pull request #1316 from asmorkalov:winrt_c4447_fix
2013-08-21 19:24:25 +04:00
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
0d8cb2e319
Disabled whitespace checking for 3rdparty.
2013-08-21 18:59:24 +04:00
Roman Donchenko
748201c3dc
Added more text/binary/whitespace attributes for files we have.
2013-08-21 18:59:24 +04:00
Roman Donchenko
ad7073bc22
Merge pull request #1305 from SpecLad:perf-precomp
2013-08-21 18:34:48 +04:00
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
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
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
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
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
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
