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
|
4ef311949b
|
Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4
|
2014-06-09 14:29:44 +04:00 |
|
Roman Donchenko
|
150dd39b08
|
Merge pull request #2822 from timedia:akaze-java
|
2014-06-09 14:27:51 +04:00 |
|
Roman Donchenko
|
3a35ca5190
|
Merge pull request #2831 from alalek:android_examples
|
2014-06-09 14:26:31 +04:00 |
|
Roman Donchenko
|
64344f4545
|
Merge pull request #2818 from StevenPuttemans:fix_linux_tutorial
|
2014-06-09 13:37:39 +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 |
|
Alexander Alekhin
|
15b6fd2ec4
|
android: allow to build & run examples without Android OpenCV Manager
|
2014-06-06 18:01:04 +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 |
|
Alexander Alekhin
|
a42259421c
|
Merge pull request #2794 from mletavin:pullreq/140516-median
|
2014-06-04 16:36:37 +04:00 |
|
Modesto Castrillón
|
b327312bd3
|
Updated and added haarcascade_mcs*.xml files
|
2014-06-04 12:24:33 +01:00 |
|
Alexander Alekhin
|
47f1026ce0
|
Merge pull request #2820 from ilya-lavrenov:tapi_flip
|
2014-06-04 15:22:07 +04:00 |
|
Ilya Lavrenov
|
405f12fe80
|
optimized cv::flip (CV_8UC1)
|
2014-06-04 14:21:42 +04:00 |
|
Alexander Alekhin
|
6d3413bc6a
|
Merge pull request #2810 from ilya-lavrenov:tapi_copytomask
|
2014-06-04 12:23:36 +04:00 |
|
Alexander Alekhin
|
c2ca059baf
|
Merge pull request #2798 from ilya-lavrenov:tapi_copymakeborder
|
2014-06-04 12:22:52 +04:00 |
|
Alexander Alekhin
|
ab9dff12d5
|
Merge pull request #2812 from arkunze:pullreq/140520-filter2D
|
2014-06-04 12:20:54 +04:00 |
|
Alexander Alekhin
|
ee8adc10a1
|
Merge pull request #2821 from ilya-lavrenov:tapi_reduce
|
2014-06-04 12:18:30 +04:00 |
|
Alexander Alekhin
|
a49ea6d066
|
Merge pull request #2826 from ilya-lavrenov:tapi_perf_warp
|
2014-06-04 12:11:54 +04:00 |
|
Roman Donchenko
|
85edb9e9b1
|
Merge pull request #1552 from Exocoder:gtk3
|
2014-06-04 12:07:17 +04:00 |
|
Tony
|
f0887a99e2
|
On branch gtk3
Changes to be committed:
modified: CMakeLists.txt
Corrected merge error from last resync
|
2014-06-03 21:29:54 +01:00 |
|
Tony
|
bd12d64641
|
Merge branch 'gtk3' of https://github.com/Exocoder/opencv into gtk3
resyncing gtk3 with remote.
|
2014-06-03 20:55:49 +01:00 |
|
Ilya Lavrenov
|
108527c951
|
added missed INTER_CUBIC
|
2014-06-03 21:46:30 +04:00 |
|
Alexander Alekhin
|
607cd37b48
|
Merge pull request #2750 from ilya-lavrenov:tapi_convertto
|
2014-06-03 16:36:48 +04:00 |
|
Ilya Lavrenov
|
2cc4cf3644
|
optimized cv::warpAffine
|
2014-06-03 13:45:22 +04:00 |
|
Muto Masayuki
|
518d0df201
|
Add AKAZE support for the Java wrapper
|
2014-06-03 18:41:58 +09:00 |
|
Alexander Alekhin
|
93af92c878
|
Merge pull request #2795 from ilya-lavrenov:tapi_setto
|
2014-06-03 13:21:05 +04:00 |
|
Alexander Alekhin
|
5e8a3cde94
|
Merge pull request #2757 from ElenaGvozdeva:ocl_flip
|
2014-06-03 13:19:42 +04:00 |
|
Ilya Lavrenov
|
26b73a7bbd
|
merged 2 kernels
|
2014-06-03 13:14:51 +04:00 |
|
Alexander Alekhin
|
72385979c4
|
Merge pull request #2761 from ilya-lavrenov:tapi_warpers
|
2014-06-02 20:37:17 +04:00 |
|
Roman Donchenko
|
c836613bad
|
Merge pull request #2819 from SpecLad:merge-2.4
|
2014-06-02 17:12:07 +04:00 |
|
mletavin
|
e224e72bbc
|
Added condition to use optimized kernels for images of size that multiple of 4 only
|
2014-06-02 15:58:59 +04:00 |
|
Ilya Lavrenov
|
ab428c9dbd
|
optimized cv::copyMakeBorder
|
2014-06-02 15:46:44 +04:00 |
|