Li Peng
608968aa83
Deconvolution ocl fix
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-23 18:31:30 +08:00
Li, Peng
5caf6244a3
Merge pull request #10922 from pengli:dnn
...
* ave pooling ocl fix
support the padded area control in ave pooling
Signed-off-by: Li Peng <peng.li@intel.com>
* warning fix: ununitialized field
2018-02-22 21:01:12 +03:00
Maksim Shabunin
eaaba6462e
Merge pull request #10919 from mshabunin:fix-static-9
2018-02-22 15:05:25 +00:00
Maksim Shabunin
92e9d4ec3a
Fixed several issues detected by static analysis
2018-02-22 17:11:33 +03:00
Maksim Shabunin
fbb2cabe77
Use fixed size types in AVIContainer structs
2018-02-22 17:11:25 +03:00
Maksim Shabunin
3fd2384b81
Fixed mingw compilation on Windows
2018-02-22 17:11:18 +03:00
Alexander Alekhin
e851a41d78
Merge pull request #10909 from alalek:ffmpeg_update
2018-02-22 14:05:37 +00:00
Vadim Pisarevsky
5e0f95b948
Merge pull request #9708 from dkurt:tf_face_detector
2018-02-22 12:04:26 +00:00
Alexander Alekhin
f7aa2e0d44
ffmpeg: update wrapper
...
FFmpeg: 3.3.4 -> 3.4.2
LibVPX: 1.6.1 -> 1.7.0
OpenH264: 1.6.0 -> 1.7.0
2018-02-22 15:04:06 +03:00
Vadim Pisarevsky
a11b7a8293
Merge pull request #10916 from alalek:videoio_sample_aspect_ratio
2018-02-22 12:03:39 +00:00
Alexander Alekhin
e6062532fa
Merge pull request #10918 from pengli:dnn
2018-02-22 10:30:00 +00:00
Li Peng
e7d35d51fa
Fix for opencv face detector ocl test
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-22 23:37:54 +08:00
Li Peng
c524f669c7
Fallback for "SAME" padMode in ocl convolution and pooling
...
It fixes tensorflow ocl testcase of MobileNetSSD and Inception_v2_SSD
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-22 21:17:59 +08:00
Alexander Alekhin
203ac0f818
Merge pull request #10914 from alalek:issue_10815
2018-02-21 18:26:15 +00:00
Dmitry Kurtaev
eab556e1e0
OpenCV face detection network in TensorFlow
2018-02-21 19:58:24 +03:00
Alexander Alekhin
9819ebc095
videoio: add missing CAP_PROP_SAR_NUM/DEN propepties into .hpp file
...
reuse av_guess_sample_aspect_ratio() if available in ffmpeg
2018-02-21 19:14:04 +03:00
Alexander Alekhin
fb6db3dcfc
Merge pull request #10915 from alalek:issue_10910
2018-02-21 15:55:03 +00:00
Alexander Alekhin
7601c21612
Merge pull request #10912 from alalek:fix_imgcodecs_hang
2018-02-21 13:39:35 +00:00
Alexander Alekhin
cb9b08eca1
createsamples: fix ROI in icvGetBackgroundImage()
2018-02-21 14:40:35 +03:00
Alexander Alekhin
48b8aa51cd
core: eliminate redundant cv::format() declarations
...
Existed includes sequence:
- utility.hpp -> core.hpp -> operations.hpp
2018-02-21 14:22:16 +03:00
Alexander Alekhin
6e8241b78d
imgcodecs: fix RBaseStream hang on truncated inputs
2018-02-21 13:17:18 +03:00
Vadim Pisarevsky
f61076a5d8
Merge pull request #10367 from savuor:multiwrite_tiff_renew
2018-02-20 23:13:55 +00:00
Alexander Alekhin
5f5fcef962
Merge pull request #10907 from alalek:cmake_ninja_fix
2018-02-20 18:54:43 +00:00
Namgoo Lee
12ce6b5c15
Merge pull request #10906 from nglee:dev_cudaFastMultiStreamSafety
...
cuda_fast : multi stream safety (#10906 )
* CUDA_Features2D/FAST Asynchronous test
* cuda_fast : multi stream safety
* Use parallel_for instead of OpenMP
2018-02-20 20:55:57 +03:00
Rostislav Vasilikhin
27b1f8f446
imwrite for multipage images implemented
2018-02-20 19:08:45 +03:00
Vadim Pisarevsky
c6e1e3acdc
Merge pull request #10892 from alalek:android_sdk_build_gradle
2018-02-20 14:59:32 +00:00
Vadim Pisarevsky
53661d55ae
Merge pull request #10406 from seiko2plus:coreUnvintrinCopy
2018-02-20 14:50:17 +00:00
Vadim Pisarevsky
120b7a61c3
Merge pull request #10745 from terfendail:tiff_fix
2018-02-20 14:47:13 +00:00
PalkoNazar
470d34ddbb
make tmpRow proper size before copyTo to avoid reallocated tmpCol ( #10860 )
...
* make tmpRow proper size before copyTo to avoid reallocated tmpCol
* do the transposition without creating temporary array; replace TAB with spaces.
* revert the previous commit
2018-02-20 16:55:25 +03:00
Vadim Pisarevsky
a0c2718adb
Merge pull request #10902 from alalek:port_10695
2018-02-20 13:26:59 +00:00
Vadim Pisarevsky
a836892edb
Merge pull request #10903 from alalek:ml_ann_test
2018-02-20 13:25:58 +00:00
Vadim Pisarevsky
25518a12f1
Merge pull request #10908 from alalek:fix_ffmpeg_uchar
2018-02-20 12:22:09 +00:00
Alexander Alekhin
2aa15ab3ff
ffmpeg: fix 'uchar' error
...
> cap_ffmpeg_impl.hpp:1710:11: error: 'uchar' does not name a type
2018-02-20 13:15:41 +03:00
Alexander Alekhin
807ec00b85
cmake: fix Ninja warning
...
about BYPRODUCTS bin/opencv-340.jar
2018-02-20 13:13:31 +03:00
Alexander Alekhin
53305d4a7e
Merge pull request #10891 from pengli:dnn
2018-02-20 08:59:07 +00:00
Li Peng
2863f950d6
ReLU6 layer ocl support
...
include relu6 ocl kernel and layer fusion support
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-20 15:11:09 +08:00
Alexander Alekhin
12d2bd4adb
ml: refactor ML_ANN test
2018-02-19 21:35:48 +03:00
Vitaly Tuzov
24ee7b5080
Fix for vertically flipped tiff files reading
2018-02-19 18:49:19 +03:00
mworchel
aab390c51d
Add mask support to SimpleBlobDetector
2018-02-19 17:54:27 +03:00
Dmitry Kurtaev
8b4871a28d
Use only absolute prior boxes explicit sizes. Remove scales attributes. ( #10874 )
...
* Use only absolute prior boxes explicit sizes. Remove scales attributes.
* Simplified PriorBox layer forward pass
2018-02-19 17:25:18 +03:00
Alexander Alekhin
cf31243c74
android: add build.grade into Android SDK
...
For using 'OpenCV for Android SDK' with Android Studio projects.
2018-02-19 17:19:26 +03:00
Vadim Pisarevsky
88b689bcf1
Merge pull request #10876 from alalek:android_static_libs
2018-02-19 14:16:06 +00:00
Vadim Pisarevsky
f589237e23
Merge pull request #10880 from StevenPuttemans:fix_10594
2018-02-19 14:13:43 +00:00
Vadim Pisarevsky
7da6e9086c
Merge pull request #10893 from alalek:fix_cpu_disable_flags
2018-02-19 14:11:11 +00:00
Vadim Pisarevsky
68043f4de9
Merge pull request #10896 from dkurt:tensorflow_tests_generator
2018-02-19 14:08:58 +00:00
Alexander Alekhin
c0eaff3608
Merge pull request #10900 from tomoaki0705:fixPerfVideoioGstreamer
2018-02-19 13:59:20 +00:00
Tomoaki Teshima
bcce25900b
read in gray scale mode when writing a gray scale video
2018-02-19 18:33:05 +09:00
Dmitry Kurtaev
34ba32ff27
Fix DNN flatten test
2018-02-18 12:45:43 +03:00
Alexander Alekhin
857007372d
Merge pull request #10895 from tomoaki0705:fixBuildVS2013sprintf
2018-02-18 07:45:01 +00:00
Tomoaki Teshima
6a661e1e28
fix test error on VS2013
2018-02-18 09:29:38 +09:00