Alexander Alekhin
|
cf4a536440
|
Merge pull request #3098 from jet47:fix-cuda-compilation
|
2014-08-14 10:05:49 +00:00 |
|
Vadim Pisarevsky
|
f7243be79c
|
Merge pull request #3090 from akarsakov:ocl_reduce_fix
|
2014-08-14 08:52:18 +00:00 |
|
Vadim Pisarevsky
|
5240a03217
|
Merge pull request #3100 from vpisarev:disabled_neon_split_merge_on_ios
|
2014-08-14 08:51:44 +00:00 |
|
Vadim Pisarevsky
|
6f86c9f118
|
another mac-related fix, let's squeeze it in this PR too
|
2014-08-14 10:45:47 +04:00 |
|
Vadim Pisarevsky
|
5d8098a2c3
|
avoid compiler warnings
|
2014-08-14 10:06:10 +04:00 |
|
Vadim Pisarevsky
|
a602185fb6
|
Merge pull request #3097 from mshabunin:gdal-support
|
2014-08-13 19:26:10 +00:00 |
|
Vadim Pisarevsky
|
5f590ebed0
|
Merge pull request #3094 from Adil-Ibragimov:minor_fixes_in_Mat-data
|
2014-08-13 18:28:51 +00:00 |
|
Vadim Pisarevsky
|
71ff228ad3
|
Merge pull request #3089 from Adil-Ibragimov:fix_cuda_constness
|
2014-08-13 18:09:42 +00:00 |
|
Vadim Pisarevsky
|
a37876ab95
|
fixed build of iOS framework another time; clang does not like the new NEON-optimized split/merge
|
2014-08-13 19:59:26 +04:00 |
|
Vladislav Vinogradov
|
9786e0a760
|
fix cudabgsegm module compilation
|
2014-08-13 19:20:23 +04:00 |
|
mshabunin
|
3ed89a8879
|
Merge with master and fix conflicts
|
2014-08-13 18:24:11 +04:00 |
|
Vladislav Vinogradov
|
8392296eda
|
remove -fvisibility-inlines-hidden from CUDA compiler flags
it generates warning
|
2014-08-13 18:08:48 +04:00 |
|
Vladislav Vinogradov
|
f5d9359da8
|
use directory-based include_directories command if we build with CUDA
|
2014-08-13 18:08:08 +04:00 |
|
Vladislav Vinogradov
|
0825120f6a
|
move CUDA compilation step from ocv_glob_module_sources to ocv_add_library
|
2014-08-13 18:07:31 +04:00 |
|
Vadim Pisarevsky
|
12c69ad490
|
Merge pull request #3095 from vpisarev:restore_ocl_div_mul_and_repeat
|
2014-08-13 13:56:19 +00:00 |
|
Adil Ibragimov
|
9ac06a9333
|
fix for gcc
|
2014-08-13 16:34:18 +04:00 |
|
Vadim Pisarevsky
|
d97f9fc477
|
now the tests pass with loop_times==30
|
2014-08-13 16:32:01 +04:00 |
|
Adil Ibragimov
|
8a4a1bb018
|
Several type of formal refactoring:
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
|
2014-08-13 15:21:35 +04:00 |
|
Vadim Pisarevsky
|
30111a786a
|
Merge pull request #3085 from nickdademo:pvapi_fix_decimation_enum
|
2014-08-13 10:51:46 +00:00 |
|
Vadim Pisarevsky
|
3cd7941098
|
Merge pull request #3083 from akarsakov:ocl_transpose_check_locmem
|
2014-08-13 10:50:51 +00:00 |
|
Vadim Pisarevsky
|
01bd4961e3
|
Merge pull request #3081 from akarsakov:small_fixes
|
2014-08-13 10:50:33 +00:00 |
|
Alexander Karsakov
|
c3100eeb19
|
Fixed buffer initialization in reduce kernel. Enabled OCL version of reduce for SUM, MAX, MIN modes.
|
2014-08-13 12:03:06 +04:00 |
|
Adil Ibragimov
|
dfd0b297ce
|
datastart must be non-const in CUDA.
|
2014-08-13 11:11:33 +04:00 |
|
Alexander Alekhin
|
28f3a44e33
|
Merge pull request #3080 from ElenaGvozdeva:ocl_stich
|
2014-08-12 16:52:41 +00:00 |
|
Alexander Karsakov
|
713ddb89bd
|
Set minimum matrix size for AmdBlas::gemm to 20 since it works incorrect for small sizes
|
2014-08-12 18:02:29 +04:00 |
|
Vadim Pisarevsky
|
c97c0be4f2
|
Merge pull request #3082 from ElenaGvozdeva:ocl_morphSmall
|
2014-08-12 13:56:59 +00:00 |
|
Vadim Pisarevsky
|
5505aa28ce
|
Merge pull request #3078 from vpisarev:refactor_features2d_take3
|
2014-08-12 13:56:17 +00:00 |
|
Nick D'Ademo
|
91676de638
|
Change decimation enum values so they can be used in resolution calculations.
BUGFIX: Fixed bugged when setting PVAPI property CV_CAP_PROP_FRAME_HEIGHT.
|
2014-08-12 15:18:11 +02:00 |
|
Alexander Karsakov
|
b4d3b34acf
|
Disabled ippiFilterBoxBorder_* in case maskSize equal roiSize for any dimension
|
2014-08-12 16:38:11 +04:00 |
|
Elena Gvozdeva
|
1c7ee88b84
|
fixed test for ocl PlaneWarperTest
|
2014-08-12 16:37:34 +04:00 |
|
Alexander Karsakov
|
3deea1c3ce
|
Added check required local memory size for non-inplace transpose kernel
|
2014-08-12 16:26:08 +04:00 |
|
Vadim Pisarevsky
|
5119564579
|
Merge pull request #3033 from nathanjackson:clahe_datatypes
|
2014-08-12 10:45:29 +00:00 |
|
Vadim Pisarevsky
|
1629d50999
|
removed some more trailing whitespaces
|
2014-08-12 14:33:18 +04:00 |
|
Alexander Karsakov
|
5898dcae4a
|
Added ROUNDING_EPS for identical rounding after dividing on different platforms
|
2014-08-12 14:28:48 +04:00 |
|
Alexander Alekhin
|
da806cc3e7
|
Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc
|
2014-08-12 10:21:41 +00:00 |
|
Elena Gvozdeva
|
8124d10526
|
fixed Erode and Dilate in case of kernel = Mat()
|
2014-08-12 12:19:13 +04:00 |
|
vbystricky
|
6fb282aa39
|
Remove mul24, for CV8UC3 3840x2160 it generates implementation specific result
|
2014-08-12 11:25:23 +04:00 |
|
Alexander Karsakov
|
10b3d00fd1
|
Increased epsilon for passing test with IPPICV
|
2014-08-12 10:42:42 +04:00 |
|
Vadim Pisarevsky
|
bca4eb5e00
|
fixed more doc builder warnings
|
2014-08-12 10:40:23 +04:00 |
|
Alexander Karsakov
|
f3dfdfef8a
|
Fixed warning with "uninitialized local variable"
|
2014-08-12 10:35:15 +04:00 |
|
Nathan Jackson
|
563200fbf6
|
CPU (non-OpenCL) CLAHE now supports CV_16UC1.
|
2014-08-11 18:25:08 -04:00 |
|
Vadim Pisarevsky
|
d119afafdb
|
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
|
2014-08-12 00:30:06 +04:00 |
|
Vadim Pisarevsky
|
fe7b48aa8f
|
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
|
2014-08-12 00:29:56 +04:00 |
|
Vadim Pisarevsky
|
27d2d3cbac
|
fixed doc builder complains and the test failures
|
2014-08-12 00:03:40 +04:00 |
|
Vadim Pisarevsky
|
31df47b6ea
|
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
|
2014-08-11 23:26:39 +04:00 |
|
Vadim Pisarevsky
|
f937f4d951
|
Merge pull request #3077 from kenlck:master
|
2014-08-11 16:41:30 +00:00 |
|
Vadim Pisarevsky
|
6df1198e8b
|
Merge pull request #3071 from mshabunin:stitch-fix
|
2014-08-11 16:08:40 +00:00 |
|
Alexander Alekhin
|
8fd61c9aa6
|
Merge pull request #3075 from akarsakov:ipp_imgproc_fix
|
2014-08-11 15:02:53 +00:00 |
|
Alexander Alekhin
|
73115233bb
|
Merge pull request #3074 from ElenaGvozdeva:ocl_lut
|
2014-08-11 15:01:25 +00:00 |
|
Vadim Pisarevsky
|
8202ab37d8
|
Merge pull request #3072 from nickdademo:pvapi_decimation_binning
|
2014-08-11 14:04:38 +00:00 |
|