Alexander Alekhin
e4aa2ccd66
Merge pull request #10136 from alalek:issue_10134
2017-11-22 18:39:47 +00:00
Alexander Alekhin
f37f4cf3b4
Merge pull request #9994 from r2d3:dnn_memory_load
2017-11-22 18:15:00 +00:00
Alexander Alekhin
e7d62d6ef3
Merge pull request #10126 from alalek:dnn_issue_10125
2017-11-22 18:03:51 +00:00
Alexander Alekhin
b29893b938
dnn: autogenerated files
2017-11-22 18:34:07 +03:00
Alexander Alekhin
1c88a566e0
dnn: rename caffe protobuf package
2017-11-22 18:34:07 +03:00
Alexander Alekhin
3f37be5a30
core: fix compilation of intrinsic code
2017-11-22 17:28:50 +03:00
Alexander Alekhin
9db5cbf9a4
dnn: sync output/internals blobs back
2017-11-22 14:00:58 +03:00
Alexander Alekhin
8e6280fc8e
ocl: binary program cache
2017-11-22 12:56:38 +03:00
Vadim Pisarevsky
f8ad289311
Merge pull request #10092 from alalek:dnn_rename_caffe_proto
2017-11-22 08:16:20 +00:00
Vadim Pisarevsky
a9b5233f67
Merge pull request #9931 from mshabunin:bss-cleanup
2017-11-22 08:13:35 +00:00
Maksim Shabunin
e57f22a386
Fixed allocSingleton
2017-11-21 18:07:30 +03:00
Maksim Shabunin
12662e064b
align singleton malloc
2017-11-21 17:55:23 +03:00
Maksim Shabunin
1c46034166
Other buffers
2017-11-21 17:55:23 +03:00
Maksim Shabunin
2178c5e95e
init ABtoXZ
2017-11-21 17:55:23 +03:00
Maksim Shabunin
b3018ba89e
LUV tables
2017-11-21 17:55:23 +03:00
Maksim Shabunin
e75056a084
static init
2017-11-21 17:55:23 +03:00
Maksim Shabunin
51fc891a5c
cvtColor: fixed tables init, moved some tables to heap
2017-11-21 17:55:23 +03:00
Alexander Alekhin
0f34628af7
dnn: drop OpenCL code path for DetectionOutputLayer
...
getUMat()/getMat() calls are scope based. Results of these calls can't be
stored somewhere for future usage.
2017-11-21 17:28:42 +03:00
Vadim Pisarevsky
c3cced0f89
Merge pull request #10121 from alalek:ocl_syntax_fix
2017-11-21 12:40:19 +00:00
Rostislav Vasilikhin
397b57dd72
Merge pull request #10041 from savuor:RevHoughWorks
...
HoughCircles rewritten (PR #7434 updated) (#10041 )
* initial version of renewed HoughCircles done
* fixed compilation
* fixed SIMD ability & compilation warning
* fixed accumulator nonmax comparison
* common Mutex for all invokers
* nzLocal is std::vector
* nz is std::vector
* SSE2 -> SIMD128
* centers is now std::vector
* circles is std::vector
* estimateRadius updated
* accum calculation w/o mutex
* less deprecated code
* several bugs fixed
* back to mutex, TLS gathering doesn't work
* extra code removed
* little refactoring
* docs note updated
* a little speedup
* warning fixed
2017-11-21 14:18:47 +03:00
zhongwuzw
01b581048d
Fix customPreviewLayer layout issue when rotateVideo is NO in iOS
2017-11-21 12:56:23 +08:00
Alexander Alekhin
438e456ce9
Merge pull request #10113 from wzw-intel:fusion
2017-11-20 18:13:33 +00:00
Alexander Alekhin
b389c1cfe7
core(ocl): syntax fix
2017-11-20 19:19:35 +03:00
Alexander Alekhin
f19f2bbcde
dnn: autogenerated files
...
rename caffe.proto => opencv-caffe.proto
2017-11-20 19:04:02 +03:00
Alexander Alekhin
f6d927ef3b
dnn: avoid conflicts with original caffe.proto
...
rename caffe.proto => opencv-caffe.proto
2017-11-20 19:04:00 +03:00
Alexander Alekhin
75b980ac64
Merge pull request #10120 from dkurt:remove_caffe_header_from_layer
2017-11-20 15:59:56 +00:00
David Geldreich
f723cede2e
add loading TensorFlow/Caffe net from memory buffer
...
add a corresponding test
2017-11-20 16:28:22 +01:00
Dmitry Kurtaev
6c5dd5cf6d
Replace caffe::NormalizedBBox to local structure
2017-11-20 18:03:31 +03:00
elenagvo
3a09da71d8
add HAL for medianBlur
2017-11-20 17:09:22 +03:00
Tomoaki Teshima
3cbe60cca2
Merge pull request #9753 from tomoaki0705:universalMatmul
...
* add accuracy test and performance check for matmul
* add performance tests for transform and dotProduct
* add test Core_TransformLargeTest for 8u version of transform
* remove raw SSE2/NEON implementation from matmul.cpp
* use universal intrinsic instead of raw intrinsic
* remove unused templated function
* add v_matmuladd which multiply 3x3 matrix and add 3x1 vector
* add v_rotate_left/right in universal intrinsic
* suppress intrinsic on some function and platform
* add pure SW implementation of new universal intrinsics
* add test for new universal intrinsics
* core: prevent memory access after the end of buffer
* fix perf tests
2017-11-20 15:56:53 +03:00
gdkessler
2674c6b5e0
Merge pull request #10093 from gdkessler/gdal_image_read_fix_10089
...
Fix GDAL image decoding color problems identified by issue #10089 , by: (#10093 )
* Fix GDAL image decoding color problems identified by issue #10089 , by:
Fixing CV_8UC1 symbol, which should be CV_8UC3 for RGB GDAL color table images.
Fixing image.ptr<VecX>(row,col)[] to be (*image.ptr<VecX>(row,col))[] to correctly access VecX array elements, as ptr<VecX>() returns a pointer to the VecX, not the first element of VecX. This fixes the color problem with color table gif images, and avoids out-of-bounds memory access.
Respecting the color identification of raster bands provided by the GDAL image driver, and produce BGR or BGRA images. Note that color bands of images using the HSL, CMY, CMYK, or YCbCr color space are ignored, rather than converting them to BGR.
* When reading image files using the GDAL decoder, exit with an error if a color band is encountered that isn't used (eg. from CMYK or YCbCbr), rather than silently ignoring the band's data.
2017-11-20 15:07:24 +03:00
Wu Zhiwen
45d11dde57
dnn(ocl4dnn): add fusion support for Power activation and eltwise add
...
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2017-11-20 14:58:53 +08:00
Alexander Alekhin
c7f1843584
Merge pull request #10087 from mshabunin:small-cmake-fixes
2017-11-18 18:07:14 +00:00
Jonathan Viney
b1d208891b
Merge pull request #10011 from jviney:master
...
Fix build with FFmpeg master. Some deprecated APIs have been removed. (#10011 )
* Fix build with FFmpeg master.
* ffmpeg: update AVFMT_RAWPICTURE support removal
2017-11-18 21:08:41 +03:00
Alexander Alekhin
017a38a54e
Merge pull request #10108 from mshabunin:fix-eigen-stride
2017-11-17 20:09:08 +00:00
Alexander Alekhin
b45403ed75
Merge pull request #10102 from seiko2plus:coreVsxPacksFix
2017-11-17 19:01:38 +00:00
Maksim Shabunin
f50ec229de
Eigen: fix Mat construction stride
2017-11-17 18:27:09 +03:00
Alexander Alekhin
3e33820ee5
Merge pull request #10104 from wzw-intel:fusion_debug
2017-11-17 13:57:36 +00:00
Maksim Shabunin
73d4f12c14
Merge pull request #9997 from ElenaGvozdeva:GaussianBlur_bug
2017-11-17 13:37:28 +00:00
elenagvo
20c08eab73
change border type for medianBlur to BORDER_ISOLATED
2017-11-17 15:13:04 +03:00
Maksim Shabunin
eb136ebba6
Do not reset step for single-row Mat created on user data
2017-11-17 13:15:15 +03:00
elenagvo
1a9d8e9447
test for GaussianBlur with border
2017-11-17 13:15:15 +03:00
Alexander Alekhin
0eb1bfa874
Merge pull request #10099 from alalek:fix_js_tests
2017-11-17 09:16:34 +00:00
Maksim Shabunin
5ebb234746
cmake: simplified configuration output
2017-11-17 11:57:49 +03:00
Wu Zhiwen
394101d6ed
dnn(ocl4dnn): Fix relu fusion bug
...
Incorrect type of negative_slope result in this bug.
Also and OCL test for darknet to validate this patch.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2017-11-17 16:21:56 +08:00
Alexander Alekhin
3c6983a2bd
Merge pull request #10008 from Smorodov:master
2017-11-17 05:41:18 +00:00
Sayed Adel
56bda8917d
core:vsx Fix vec_packs in gcc-5
2017-11-16 21:54:56 +00:00
Alexander Alekhin
6936ec7dbd
Merge pull request #10094 from amroamroamro:mingw-pkgconfig-fix
2017-11-16 19:39:33 +00:00
Maksim Shabunin
e730048f69
Merge pull request #10078 from justdoitqd:master
2017-11-16 15:20:44 +00:00
Maksim Shabunin
751cee8e67
Merge pull request #9907 from seiko2plus:vsxFixesImproves
2017-11-16 15:20:16 +00:00
