Alexander Shishkov
88712d97c6
fix CMake changes
2013-08-23 16:09:41 +04:00
Roman Donchenko
c11502cf56
Merge pull request #1333 from kirill-kornyakov:bugfix-for-3231
2013-08-23 15:56:11 +04:00
Roman Donchenko
9bb1a7d34d
Merge pull request #1234 from SpecLad:ios-plist
2013-08-23 15:43:08 +04:00
Roman Donchenko
580677f43d
Merge pull request #1304 from berak:doc_tut_cascade
2013-08-23 15:18:06 +04:00
Roman Donchenko
365def6090
Merge pull request #1323 from SpecLad:find-git
2013-08-23 14:48:22 +04:00
Roman Donchenko
cae4480834
Merge pull request #1332 from pengx17:2.4_fix_parallel
2013-08-23 14:47:49 +04:00
Vladislav Vinogradov
d1f6a23abf
improved texture usage:
...
* use explicit extrapolation only for sub-matrixes
* use built-in interpolation for INTER_NEAREST mode
2013-08-23 13:57:12 +04:00
Vladislav Vinogradov
241cc417f9
added custom implementation for nearest and linear interpolation
2013-08-23 13:57:12 +04:00
Vladislav Vinogradov
3b05acf936
reorganize code for further modifiction
2013-08-23 13:56:35 +04:00
Alexander Shishkov
396f6bb55f
fixed problems with building iOS version
2013-08-23 13:41:19 +04:00
Alexander Shishkov
16814c7fb1
Update build_framework.py
2013-08-23 12:51:50 +04:00
MarkBelmont
cf34b3d65b
Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span."
2013-08-23 16:39:39 +08:00
Kirill Kornyakov
030fa5673e
bugfix-for-3231
2013-08-23 12:34:35 +04:00
Vladislav Vinogradov
f826bd8bce
removed NPP implementation
2013-08-23 12:16:41 +04:00
Roman Donchenko
5a32f0b6ca
Merge pull request #1322 from SpecLad:terse
2013-08-23 12:11:41 +04:00
Roman Donchenko
e1397f6c1f
Merge pull request #1324 from SpecLad:try-compile
2013-08-23 12:06:57 +04:00
Roman Donchenko
66aa3255b9
Merge pull request #1328 from SpecLad:zlib-update
2013-08-23 12:06:17 +04:00
Changlin Hsieh
723ba29660
Update cmake files by using CUDA_CUDA_LIBRARIES
2013-08-23 16:05:35 +08: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
Alexander Alekhin
7685b983db
OCL: tests: repair moments implementation in master branch, enable tests
2013-08-22 23:37:06 +04:00
berak
50288f1314
rebased commits
2013-08-22 18:40:30 +02:00
berak
926d6876d3
using VideoCapture instead of CvCapture* in cascade tutorial
...
corrected constants, changed objdetection.cpp as well
updated objDetection2.cpp as well
fixed headers in objdetection2.cpp
removed useles RNG
fixed buildbot warnings (wow, i like that bot!)
victim of the war on whitespace
fixing buildbot warnings
fixing last buildbot warning, heya .
trying to rebase/squash commits
2013-08-22 17:38:59 +02:00
Roman Donchenko
10860783ef
Added warnings-as-errors support for MSVC.
2013-08-22 18:25:38 +04:00
Roman Donchenko
9c01a96b14
Set minimal zlib version to 1.2.3.
...
Rationale: 1.2.3 was a security update, and we should avoid using
versions with known security vulnerabilities.
2013-08-22 18:17:19 +04:00
Roman Donchenko
6fed0e85c2
Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
...
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
2013-08-22 18:17:19 +04:00
Roman Donchenko
797beef383
Updated zlib to 1.2.8.
2013-08-22 17:59:27 +04:00
Ilya Lavrenov
6c4ad9b597
fixer error with incorrect condition
2013-08-22 17:38:55 +04:00
Ilya Lavrenov
ec461a2ff0
added a test for ocl::norm
2013-08-22 17:37:48 +04:00
Alexander Alekhin
b7b584984e
OCL: tests: repair/disable failed tests in ocl module
2013-08-22 17:06:47 +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
880306f6d6
Don't search for Git ourselves - CMake can handle it now.
2013-08-22 13:28:17 +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
e45526b9c0
Dropped the CMAKE_VERBOSE option.
...
There's no reason for it to exist, since it just duplicates the
CMAKE_VERBOSE_MAKEFILE variable.
2013-08-22 12:41:14 +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
893e8b4371
Merge pull request #942 from achalddave:patch-1
2013-08-21 16:06:31 +04:00
