758a1eb63d
Merge pull request #2855 from ilya-lavrenov:tapi_warpp_fix
2014-06-16 13:22:03 +04:00
45f21e4f12
Merge pull request #2783 from daferna2:master
2014-06-12 21:41:28 +04:00
2c134318f7
Merge pull request #2784 from saree90:bugfix_Simplex
2014-06-12 21:41:10 +04:00
41ceadf9ed
Merge pull request #2799 from 23pointsNorth:patch-1
2014-06-12 21:40:53 +04:00
afe6b66d33
Merge pull request #2828 from otsedom:updating_and_adding_haarcascades_mcs
2014-06-12 21:39:50 +04:00
052c8516a8
Merge pull request #2845 from shaibagon:patch-1
2014-06-12 21:38:56 +04:00
ad7440c014
Merge pull request #2850 from Sekunde:master
2014-06-12 21:38:41 +04:00
7ccbe10970
fixed cv::warpPerspective
2014-06-12 15:17:24 +04:00
14671e0cd6
Merge pull request #2823 from ilya-lavrenov:tapi_warpaffine
2014-06-11 14:41:29 +04:00
055adc2302
Update MatchTemplate_Demo.cpp
2014-06-11 10:29:30 +02:00
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
88ceee05c6
Merge pull request #2837 from ilya-lavrenov:tapi_norm_relative
2014-06-10 22:21:09 +04:00
96ce9810a9
Merge pull request #2844 from ilya-lavrenov:tapi_perf_pow
2014-06-10 19:32:03 +04:00
071daa1d8f
Merge pull request #2839 from ilya-lavrenov:tapi_fix
2014-06-10 19:30:26 +04:00
bf39f694ea
Merge pull request #2835 from ilya-lavrenov:defects
2014-06-10 19:29:47 +04:00
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
9edd24fe51
changed power in cv::pow test to test actual kernel
2014-06-10 17:41:43 +04:00
556206de2d
fixed defects found by coverity scan
2014-06-10 13:14:51 +04:00
e0f40a7f4a
Merge pull request #2841 from SpecLad:merge-2.4
2014-06-10 11:50:12 +04:00
8681b52dba
Merge pull request #2838 from ilya-lavrenov:tapi_warnings
2014-06-09 20:25:28 +04:00
634da9f3bf
added norm_inf support to minmaxloc kernel
2014-06-09 20:05:26 +04:00
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
0b2cafb08b
bixed cv::boxFilter
2014-06-09 17:09:44 +04:00
cf72d2695c
fixed possible runtime error
2014-06-09 16:48:59 +04:00
278616bada
Merge pull request #2813 from 23pointsNorth:patch-2
2014-06-09 15:58:24 +04:00
ff6f5d4d24
fixed warnings
2014-06-09 15:54:10 +04:00
ed1c56e063
Merge pull request #2817 from bf:patch-1
2014-06-09 15:06:07 +04:00
4ef311949b
Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4
2014-06-09 14:29:44 +04:00
150dd39b08
Merge pull request #2822 from timedia:akaze-java
2014-06-09 14:27:51 +04:00
3a35ca5190
Merge pull request #2831 from alalek:android_examples
2014-06-09 14:26:31 +04:00
64344f4545
Merge pull request #2818 from StevenPuttemans:fix_linux_tutorial
2014-06-09 13:37:39 +04:00
7f2662b310
fixes
2014-06-09 00:50:14 +04:00
5403bdd228
optimized cv::norm with NORM_RELATIVE
2014-06-07 21:26:40 +04:00
2040995801
optimized cv::norm with 2 args
2014-06-07 20:45:28 +04:00
f08d88fa78
fixed calculation method of "cv::TickMeter"
2014-06-07 07:29:22 +09:00
1a7a262f74
optimized cv::norm with NORM_INF
2014-06-06 19:34:26 +04:00
e430ab1a58
Merge pull request #2785 from akarsakov:ocl_pyrDown_borders
2014-06-06 18:53:14 +04:00
ea417ac04a
Merge pull request #2755 from vbystricky:oclopt_LUT
2014-06-06 18:52:40 +04:00
fd5a8b3e97
minmaxloc
2014-06-06 18:39:08 +04:00
f30301d171
Merge pull request #2801 from ilya-lavrenov:tapi_reduction
2014-06-06 18:38:22 +04:00
15b6fd2ec4
android: allow to build & run examples without Android OpenCV Manager
2014-06-06 18:01:04 +04:00
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
0c0ebca855
Read 4 pixel for aligned data with 1 channel
2014-06-04 23:50:23 +04:00
8a5f2781fc
Fix kernel by comments
2014-06-04 20:13:42 +04:00
3f485d58bb
Merge pull request #2808 from ilya-lavrenov:tapi_normalize_mask
2014-06-04 18:10:13 +04:00
a42259421c
Merge pull request #2794 from mletavin:pullreq/140516-median
2014-06-04 16:36:37 +04:00
b327312bd3
Updated and added haarcascade_mcs*.xml files
2014-06-04 12:24:33 +01:00
47f1026ce0
Merge pull request #2820 from ilya-lavrenov:tapi_flip
2014-06-04 15:22:07 +04:00
405f12fe80
optimized cv::flip (CV_8UC1)
2014-06-04 14:21:42 +04:00
6d3413bc6a
Merge pull request #2810 from ilya-lavrenov:tapi_copytomask
2014-06-04 12:23:36 +04:00
Alexander Alekhin