Hans Johnson
4c7ed03b5f
COMP: Fix problem with narrowing in c++11
...
modules/core/src/arithm.cpp:345:51:
error: constant expression evaluates to 4294967295 which cannot be narrowed to type 'int' [-Wc++11-narrowing]
static int CV_DECL_ALIGNED(16) v64f_absmask[] = { 0xffffffff, 0x7fffffff, 0xffffffff, 0x7fffffff };
^~~~~~~~~~
Converted to unsigned int. This variable is only used to initialize a bit pattern anywhy for a 128bit type.
2014-06-17 15:49:06 -05:00
Alexander Alekhin
ce5bae1c67
Merge pull request #2871 from vbystricky:oclopt_integral
2014-06-17 18:23:31 +04:00
Alexander Alekhin
1db9cc3f0d
Merge pull request #2854 from ilya-lavrenov:tapi_filter2d
2014-06-17 16:59:00 +04:00
Alexander Alekhin
04628d770c
Merge pull request #2849 from ElenaGvozdeva:ocl_matchTemplate_3cn
2014-06-17 14:37:52 +04:00
vbystricky
606df0469a
Fix pointer conversion
2014-06-16 18:14:05 +04:00
vbystricky
9bf296eeb0
Small refactoring
2014-06-16 17:17:16 +04:00
Ilya Lavrenov
7391df386f
fixed usage of reshape
2014-06-16 15:19:13 +04:00
vbystricky
6550c4f682
Join kernel code for int and float destination types
2014-06-16 15:08:15 +04:00
Alexander Alekhin
f269a89792
Merge pull request #2865 from ilya-lavrenov:morph
2014-06-16 13:35:57 +04:00
Alexander Alekhin
758a1eb63d
Merge pull request #2855 from ilya-lavrenov:tapi_warpp_fix
2014-06-16 13:22:03 +04:00
vbystricky
504bc7634a
Remove pre_invalid parameter
2014-06-16 13:07:39 +04:00
Ilya Lavrenov
d5244eb645
invoking OCL before IPP
2014-06-16 12:33:13 +04:00
Vadim Pisarevsky
45f21e4f12
Merge pull request #2783 from daferna2:master
2014-06-12 21:41:28 +04:00
Vadim Pisarevsky
2c134318f7
Merge pull request #2784 from saree90:bugfix_Simplex
2014-06-12 21:41:10 +04:00
Vadim Pisarevsky
41ceadf9ed
Merge pull request #2799 from 23pointsNorth:patch-1
2014-06-12 21:40:53 +04:00
Vadim Pisarevsky
052c8516a8
Merge pull request #2845 from shaibagon:patch-1
2014-06-12 21:38:56 +04:00
Ilya Lavrenov
7ccbe10970
fixed cv::warpPerspective
2014-06-12 15:17:24 +04:00
Alexander Alekhin
14671e0cd6
Merge pull request #2823 from ilya-lavrenov:tapi_warpaffine
2014-06-11 14:41:29 +04:00
Elena Gvozdeva
feeb386bf3
Added support for 3-channels
2014-06-11 11:49:22 +04:00
Daniel Fernandes
b3655233f1
Changing #include to generic video.hpp
...
Per https://github.com/Itseez/opencv/pull/2783#discussion_r13573590
2014-06-11 02:00:21 -05:00
Alexander Alekhin
88ceee05c6
Merge pull request #2837 from ilya-lavrenov:tapi_norm_relative
2014-06-10 22:21:09 +04:00
Alexander Alekhin
96ce9810a9
Merge pull request #2844 from ilya-lavrenov:tapi_perf_pow
2014-06-10 19:32:03 +04:00
Alexander Alekhin
071daa1d8f
Merge pull request #2839 from ilya-lavrenov:tapi_fix
2014-06-10 19:30:26 +04:00
Alexander Alekhin
bf39f694ea
Merge pull request #2835 from ilya-lavrenov:defects
2014-06-10 19:29:47 +04:00
Shai
91201b225a
Update global_motion.cpp
...
An extremely rare case where, for numeric reasons bestM finds more inliers than ninliersMax.
This RARE case causes memory corruption and a nasty seg fault.
2014-06-10 17:31:18 +03:00
Ilya Lavrenov
9edd24fe51
changed power in cv::pow test to test actual kernel
2014-06-10 17:41:43 +04:00
Ilya Lavrenov
556206de2d
fixed defects found by coverity scan
2014-06-10 13:14:51 +04:00
Roman Donchenko
e0f40a7f4a
Merge pull request #2841 from SpecLad:merge-2.4
2014-06-10 11:50:12 +04:00
Alexander Alekhin
8681b52dba
Merge pull request #2838 from ilya-lavrenov:tapi_warnings
2014-06-09 20:25:28 +04:00
Ilya Lavrenov
634da9f3bf
added norm_inf support to minmaxloc kernel
2014-06-09 20:05:26 +04:00
Roman Donchenko
659d21332e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/spinimages.cpp
2014-06-09 18:03:03 +04:00
Ilya Lavrenov
0b2cafb08b
bixed cv::boxFilter
2014-06-09 17:09:44 +04:00
Ilya Lavrenov
cf72d2695c
fixed possible runtime error
2014-06-09 16:48:59 +04:00
Roman Donchenko
278616bada
Merge pull request #2813 from 23pointsNorth:patch-2
2014-06-09 15:58:24 +04:00
Ilya Lavrenov
ff6f5d4d24
fixed warnings
2014-06-09 15:54:10 +04:00
Roman Donchenko
ed1c56e063
Merge pull request #2817 from bf:patch-1
2014-06-09 15:06:07 +04:00
Roman Donchenko
150dd39b08
Merge pull request #2822 from timedia:akaze-java
2014-06-09 14:27:51 +04:00
Ilya Lavrenov
7f2662b310
fixes
2014-06-09 00:50:14 +04:00
Ilya Lavrenov
5403bdd228
optimized cv::norm with NORM_RELATIVE
2014-06-07 21:26:40 +04:00
Ilya Lavrenov
2040995801
optimized cv::norm with 2 args
2014-06-07 20:45:28 +04:00
atinfinity
f08d88fa78
fixed calculation method of "cv::TickMeter"
2014-06-07 07:29:22 +09:00
Ilya Lavrenov
1a7a262f74
optimized cv::norm with NORM_INF
2014-06-06 19:34:26 +04:00
Alexander Alekhin
e430ab1a58
Merge pull request #2785 from akarsakov:ocl_pyrDown_borders
2014-06-06 18:53:14 +04:00
Alexander Alekhin
ea417ac04a
Merge pull request #2755 from vbystricky:oclopt_LUT
2014-06-06 18:52:40 +04:00
Ilya Lavrenov
fd5a8b3e97
minmaxloc
2014-06-06 18:39:08 +04:00
Alexander Alekhin
f30301d171
Merge pull request #2801 from ilya-lavrenov:tapi_reduction
2014-06-06 18:38:22 +04:00
VBystricky
5d924b7a75
If lut table has one channel and src aligned to 4, work with src as with one channel matrix
2014-06-05 19:31:31 +04:00
VBystricky
0c0ebca855
Read 4 pixel for aligned data with 1 channel
2014-06-04 23:50:23 +04:00
VBystricky
8a5f2781fc
Fix kernel by comments
2014-06-04 20:13:42 +04:00
Alexander Alekhin
3f485d58bb
Merge pull request #2808 from ilya-lavrenov:tapi_normalize_mask
2014-06-04 18:10:13 +04:00
