kdrobnyh
dc1eb583b4
Merge pull request #5 from Itseez/2.4
...
Some changes in OpenCV
2013-08-29 07:53:46 -07:00
Roman Donchenko
53818f0f5f
Merge pull request #1361 from asmorkalov:winrt_api_container
2013-08-29 18:09:06 +04:00
Roman Donchenko
78a6692e53
Merge pull request #1359 from asmorkalov:winrt_tiff_api_fix
2013-08-29 18:07:58 +04:00
Alexander Smorkalov
ebe7f00cb4
/apicontainer added to linker flags on WinRT to fix api test issues.
2013-08-28 08:36:57 -07:00
Roman Donchenko
90cf8fbd60
Merge pull request #1338 from asmorkalov:android_tegra_detector
2013-08-28 19:02:09 +04:00
Roman Donchenko
e958767a8b
Merge pull request #1343 from asmorkalov:android_img_manipulations_fix
2013-08-28 19:01:15 +04:00
Alexander Smorkalov
3036ec4b89
LibTIFF Win32 API back-end disabled for Windows RT.
2013-08-28 07:31:46 -07:00
Alexander Smorkalov
aa00b5a0ab
New Tegra detector with Android 4.3 support added. Manager version++.
2013-08-28 15:22:14 +04:00
Alexander Smorkalov
8d4cbf4deb
Bug #3238 Android sample image manipulations blinks in non-preview modes fixed.
2013-08-28 15:08:13 +04:00
Roman Donchenko
2b90b20be2
Merge pull request #1357 from SpecLad:less-precomps
2013-08-28 14:52:28 +04:00
Roman Donchenko
cdf6cf2cd8
Merge pull request #1213 from kdrobnyh:color
2013-08-28 13:31:09 +04:00
Roman Donchenko
122d0f8685
Deleted the now-empty ocl perf_precomp.cpp.
...
See pull request #1241 for why.
2013-08-28 13:26:30 +04:00
Roman Donchenko
8bb9994094
Merge pull request #1349 from ilya-lavrenov:ocl_perf_finish
2013-08-28 12:46:01 +04:00
ilya-lavrenov
3c86aa4ae1
appended ocl::finish to test_cycle defines
2013-08-28 00:39:58 +04:00
Roman Donchenko
cd5b8af609
Restored one executable bit that was lost during the war on whitespace.
2013-08-27 14:39:43 +04:00
Roman Donchenko
0e32d7ccb3
Merge pull request #1346 from jet47:gpu-tvl1-optimization
2013-08-27 12:36:45 +04:00
Vladislav Vinogradov
bff0fad6c3
gpu TVL1 Optical Flow optimization:
...
do not calculate sum of error in every round of iteration;
instead the error will be summed every 2nd times or more,
if the previous sum of error is too far away from threshold.
2013-08-27 11:21:41 +04:00
Roman Donchenko
525b6eca2e
Merge pull request #1311 from leszekhanusz:png_palette_alpha
2013-08-26 16:59:45 +04:00
Roman Donchenko
b43890a7e1
Merge pull request #1326 from ilya-lavrenov:perf_ocl
2013-08-26 16:54:59 +04:00
Roman Donchenko
d44adcd6e8
Merge pull request #1336 from jet47:gpu-resize
2013-08-26 16:40:50 +04:00
ilya-lavrenov
d02ccc9590
the code was refactored and old test system code was removed
2013-08-26 12:36:31 +04:00
ilya-lavrenov
4c28a6f0f6
most of the performance tests was rewritten in google-test manner
2013-08-26 11:43:44 +04:00
Vladislav Vinogradov
21c4753fed
used global memory access for up-scaling
2013-08-23 18:08:06 +04:00
Roman Donchenko
7cefb6f50b
Merge pull request #1335 from alekcac:ios-build-fix
2013-08-23 16:54:48 +04:00
Roman Donchenko
3182e68b8a
Merge pull request #1334 from MarkBelmont:bugfix_1
2013-08-23 16:49:51 +04:00
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
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
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
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
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