platform/upstream/opencv.git
5 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 11 Mar 2019 19:20:22 +0000 (19:20 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

5 years agoMerge pull request #14013 from alalek:imgproc_dispatch_filter
Alexander Alekhin [Mon, 11 Mar 2019 18:59:30 +0000 (18:59 +0000)]
Merge pull request #14013 from alalek:imgproc_dispatch_filter

5 years agoMerge pull request #14011 from komakai:debug-build
Giles Payne [Mon, 11 Mar 2019 14:16:42 +0000 (23:16 +0900)]
Merge pull request #14011 from komakai:debug-build

* Add Android SDK debug build flag

* Change LOG_TAG define for consistency with other modules

5 years agoimgproc: dispatch morph
Alexander Alekhin [Mon, 11 Mar 2019 12:37:17 +0000 (12:37 +0000)]
imgproc: dispatch morph

5 years agoimgproc: dispatch box_filter
Alexander Alekhin [Sat, 9 Mar 2019 20:19:05 +0000 (20:19 +0000)]
imgproc: dispatch box_filter

5 years agoimgproc: dispatch bilateral_filter
Alexander Alekhin [Sat, 9 Mar 2019 19:58:48 +0000 (19:58 +0000)]
imgproc: dispatch bilateral_filter

5 years agoimgproc: dispatch smooth
Alexander Alekhin [Sat, 9 Mar 2019 19:20:24 +0000 (19:20 +0000)]
imgproc: dispatch smooth

5 years agoimgproc: dispatch medianBlur
Alexander Alekhin [Sat, 9 Mar 2019 18:55:42 +0000 (18:55 +0000)]
imgproc: dispatch medianBlur

5 years agoimgproc: get rid of filter.avx2.cpp
Alexander Alekhin [Sat, 9 Mar 2019 12:57:48 +0000 (12:57 +0000)]
imgproc: get rid of filter.avx2.cpp

5 years agoimgproc: dispatch filter.cpp
Alexander Alekhin [Sat, 9 Mar 2019 12:21:23 +0000 (12:21 +0000)]
imgproc: dispatch filter.cpp

5 years agoimgproc: keep history of filters files
Alexander Alekhin [Mon, 11 Mar 2019 13:54:07 +0000 (13:54 +0000)]
imgproc: keep history of filters files

5 years agoimgproc: copy .dispatch.cpp
Alexander Alekhin [Sat, 9 Mar 2019 10:57:05 +0000 (10:57 +0000)]
imgproc: copy .dispatch.cpp

5 years agoimgproc: copy .simd.hpp
Alexander Alekhin [Sat, 9 Mar 2019 10:56:50 +0000 (10:56 +0000)]
imgproc: copy .simd.hpp

5 years agoMerge pull request #14022 from alalek:core_fix_neon_intrinsics
Alexander Alekhin [Mon, 11 Mar 2019 13:52:43 +0000 (13:52 +0000)]
Merge pull request #14022 from alalek:core_fix_neon_intrinsics

5 years agocore(intrin): NEON v_load_expand_q() support unaligned addr
Alexander Alekhin [Mon, 11 Mar 2019 12:01:40 +0000 (12:01 +0000)]
core(intrin): NEON v_load_expand_q() support unaligned addr

5 years agoMerge pull request #14015 from saskatchewancatch:issue-13921
Alexander Alekhin [Mon, 11 Mar 2019 10:08:05 +0000 (10:08 +0000)]
Merge pull request #14015 from saskatchewancatch:issue-13921

5 years agoMerge pull request #13847 from ghellwig:jpeg2000-compression-flag
Alexander Alekhin [Mon, 11 Mar 2019 10:03:18 +0000 (10:03 +0000)]
Merge pull request #13847 from ghellwig:jpeg2000-compression-flag

5 years agoAdd JPEG2000 compression flag.
Gregor Mittag [Sat, 16 Feb 2019 14:05:31 +0000 (15:05 +0100)]
Add JPEG2000 compression flag.

5 years agoMerge pull request #13956 from komakai:java-mat-class-improvements
Giles Payne [Sat, 9 Mar 2019 21:11:04 +0000 (06:11 +0900)]
Merge pull request #13956 from komakai:java-mat-class-improvements

* Expose more C++ functionality in the Java wrapper of the Mat class
In particular expose methods for handling Mat with more than 2 dimensions
* add constructors taking an array of dimension sizes
* add constructor taking an existing Mat and an array of Ranges
* add override of the create method taking an array of dimension sizes
* add overrides of the ones and zeros methods taking an array of dimension sizes
* add override of the submat method taking an array of ranges
* add overrides of put and get taking arrays of indices
* add wrapper for copySize method
* fix crash in the JNI wrapper of the reshape(int cn, int[] newshape) method
* add test for each method added to Mat.java

* Fix broken test

5 years agoissue-13921: Support setting compression setting for writing tiff images
Rajkiran Natarajan [Sat, 9 Mar 2019 20:48:21 +0000 (15:48 -0500)]
issue-13921: Support setting compression setting for writing tiff images

5 years agoMerge pull request #13997 from alalek:imgproc_dispatch_cvtcolor
Alexander Alekhin [Fri, 8 Mar 2019 16:18:44 +0000 (16:18 +0000)]
Merge pull request #13997 from alalek:imgproc_dispatch_cvtcolor

5 years agoMerge pull request #14000 from nglee:dev_FixCuda101BuildIssueMaster
Alexander Alekhin [Thu, 7 Mar 2019 20:19:50 +0000 (20:19 +0000)]
Merge pull request #14000 from nglee:dev_FixCuda101BuildIssueMaster

5 years agoMerge pull request #13999 from addyi:fixAndroidLintingErrors
Adrian Renner [Thu, 7 Mar 2019 20:18:22 +0000 (21:18 +0100)]
Merge pull request #13999 from addyi:fixAndroidLintingErrors

* fix android lint error in BaseLoaderCallback (LongLogTag)

Lint Error that was causde by the to long TAG:
BaseLoaderCallback.java:31:
Error: The logging tag can be at most 23 characters,
was 31 (OpenCVLoader/BaseLoaderCallback) [LongLogTag]
Log.e(TAG, "Package installation failed!");

* add requested "OCV" prefix for android logging

5 years agoMerge pull request #13875 from allnes:optimization_fuse
Alexander Alekhin [Thu, 7 Mar 2019 14:38:59 +0000 (14:38 +0000)]
Merge pull request #13875 from allnes:optimization_fuse

5 years agoMerge pull request #13937 from smirnov-alexey:gapi_change_standalone_cmake
Alexander Alekhin [Thu, 7 Mar 2019 14:38:14 +0000 (14:38 +0000)]
Merge pull request #13937 from smirnov-alexey:gapi_change_standalone_cmake

5 years agoCUDA 10.1 Build Issue Fix on Master Branch
Namgoo Lee [Thu, 7 Mar 2019 14:13:03 +0000 (23:13 +0900)]
CUDA 10.1 Build Issue Fix on Master Branch

5 years agoimgproc: dispatch color*
Alexander Alekhin [Thu, 7 Mar 2019 10:25:37 +0000 (13:25 +0300)]
imgproc: dispatch color*

Lab/XYZ modes have been postponed (color_lab.cpp):
- need to split code for tables initialization and for pixels processing first
- no significant performance improvements for switching between SSE42 / AVX2 code generation

5 years agocore: keep history of color*.cpp
Alexander Alekhin [Thu, 7 Mar 2019 12:36:49 +0000 (15:36 +0300)]
core: keep history of color*.cpp

5 years agoimgproc: clone color*.dispatch.cpp
Alexander Alekhin [Wed, 6 Mar 2019 15:00:43 +0000 (18:00 +0300)]
imgproc: clone color*.dispatch.cpp

5 years agoimgproc: clone color*.simd.hpp
Alexander Alekhin [Wed, 6 Mar 2019 14:59:27 +0000 (17:59 +0300)]
imgproc: clone color*.simd.hpp

5 years agoMerge pull request #13979 from alalek:issue_13772
Alexander Alekhin [Thu, 7 Mar 2019 09:53:25 +0000 (09:53 +0000)]
Merge pull request #13979 from alalek:issue_13772

5 years agoMerge pull request #13986 from alalek:perf_ignore_ovx
Alexander Alekhin [Thu, 7 Mar 2019 09:50:49 +0000 (09:50 +0000)]
Merge pull request #13986 from alalek:perf_ignore_ovx

5 years agoMerge pull request #13993 from liuyuns:issue_13963_thresh_nms_yolov3
Alexander Alekhin [Thu, 7 Mar 2019 07:55:34 +0000 (07:55 +0000)]
Merge pull request #13993 from liuyuns:issue_13963_thresh_nms_yolov3

5 years agoAdd ability to read thresh and nms_threshold from YOLO layer in YOLOV3 cfg file.
Easton Liu [Thu, 7 Mar 2019 01:55:48 +0000 (09:55 +0800)]
Add ability to read thresh and nms_threshold from YOLO layer in YOLOV3 cfg file.

Currently the thresh is hard-coded to be 0.2 and nms_threshold as 0.4.

5 years agoMerge pull request #13988 from raymanfx:gstreamer
Alexander Alekhin [Wed, 6 Mar 2019 20:47:03 +0000 (20:47 +0000)]
Merge pull request #13988 from raymanfx:gstreamer

5 years agovideoio: gst: Fix gst assertion on null msg
Christopher N. Hesse [Wed, 6 Mar 2019 16:14:59 +0000 (17:14 +0100)]
videoio: gst: Fix gst assertion on null msg

According to the gstreamer docs [1], the GstMessage pointer returned by
gst_bus_pop() is nullable, meaning NULL is a valid return value.

Previously, gst_is_missing_plugin_message would throw an assert when its
message object parameter would fail the GST_IS_MESSAGE macro check,
crashing the entire process (unless running in a try-catch block of course).

Instead of relying on valid messages, check if the message object itself is
valid before passing it to other gstreamer functions.

[1] https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBus.html#gst-bus-pop

Signed-off-by: Christopher N. Hesse <raymanfx@gmail.com>
5 years agoperf: ignore _ovx tests
Alexander Alekhin [Wed, 6 Mar 2019 12:52:23 +0000 (15:52 +0300)]
perf: ignore _ovx tests

5 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 5 Mar 2019 17:26:46 +0000 (17:26 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

5 years agoAdded optimization fuse
Alexander Nesterov [Fri, 8 Feb 2019 14:12:33 +0000 (13:12 -0100)]
Added optimization fuse

5 years agoMerge pull request #13880 from catree:add_hand_eye_calibration
Alexander Alekhin [Tue, 5 Mar 2019 16:02:38 +0000 (16:02 +0000)]
Merge pull request #13880 from catree:add_hand_eye_calibration

5 years agoMerge pull request #13980 from terfendail:bresize3_fix
Alexander Alekhin [Tue, 5 Mar 2019 15:59:21 +0000 (15:59 +0000)]
Merge pull request #13980 from terfendail:bresize3_fix

5 years agoMerge pull request #13962 from Christianwidjaya:master
Alexander Alekhin [Tue, 5 Mar 2019 15:00:55 +0000 (15:00 +0000)]
Merge pull request #13962 from Christianwidjaya:master

5 years agoMerge pull request #13953 from saskatchewancatch:patch-1
Alexander Alekhin [Tue, 5 Mar 2019 14:59:18 +0000 (14:59 +0000)]
Merge pull request #13953 from saskatchewancatch:patch-1

5 years agoMerge pull request #13974 from alalek:fix_build_warnings
Alexander Alekhin [Tue, 5 Mar 2019 14:57:50 +0000 (14:57 +0000)]
Merge pull request #13974 from alalek:fix_build_warnings

5 years agoFixed out of bound reading in LINEAR_EXACT resize for 8UC3
Vitaly Tuzov [Tue, 5 Mar 2019 14:21:21 +0000 (17:21 +0300)]
Fixed out of bound reading in LINEAR_EXACT resize for 8UC3

5 years agoAdd Hand-Eye calibration methods (Tsai, Park, Horaud, Andreff, Daniilidis).
catree [Wed, 20 Feb 2019 17:08:43 +0000 (18:08 +0100)]
Add Hand-Eye calibration methods (Tsai, Park, Horaud, Andreff, Daniilidis).

5 years agocore: fix condition in OutputArray::create(allowTransposed=True)
Alexander Alekhin [Tue, 5 Mar 2019 13:25:38 +0000 (16:25 +0300)]
core: fix condition in OutputArray::create(allowTransposed=True)

5 years agoMerge pull request #13967 from alalek:backport_android_build_py
Alexander Alekhin [Tue, 5 Mar 2019 12:46:08 +0000 (12:46 +0000)]
Merge pull request #13967 from alalek:backport_android_build_py

5 years agoMerge pull request #13945 from alalek:backport_bindings_generator
Alexander Alekhin [Tue, 5 Mar 2019 12:45:21 +0000 (12:45 +0000)]
Merge pull request #13945 from alalek:backport_bindings_generator

5 years agoMerge pull request #13970 from alalek:videoio_plugins_update
Alexander Alekhin [Tue, 5 Mar 2019 11:48:39 +0000 (11:48 +0000)]
Merge pull request #13970 from alalek:videoio_plugins_update

5 years agobuild: fix warnings
Alexander Alekhin [Tue, 5 Mar 2019 11:47:04 +0000 (14:47 +0300)]
build: fix warnings

5 years agoNeed -DBUILD_DOCS CMake flag to build docs
RAJKIRAN NATARAJAN [Sat, 2 Mar 2019 20:19:00 +0000 (15:19 -0500)]
Need -DBUILD_DOCS CMake flag to build docs

Must have that flag. Otherwise following "doxygen overview" tutorial won't work.

5 years agocmake: support MSVS 2019
Alexander Alekhin [Tue, 5 Mar 2019 10:38:47 +0000 (13:38 +0300)]
cmake: support MSVS 2019

5 years agoMerge pull request #13969 from alalek:issue_13929
Alexander Alekhin [Tue, 5 Mar 2019 10:28:59 +0000 (10:28 +0000)]
Merge pull request #13969 from alalek:issue_13929

5 years agovideoio: plugins, add strict checks
Alexander Alekhin [Tue, 5 Mar 2019 10:22:52 +0000 (13:22 +0300)]
videoio: plugins, add strict checks

5 years agovideoio: revert registry chages, update cap.cpp
Alexander Alekhin [Mon, 4 Mar 2019 21:37:09 +0000 (21:37 +0000)]
videoio: revert registry chages, update cap.cpp

5 years agovideoio: update plugin API
Alexander Alekhin [Sat, 2 Mar 2019 22:36:18 +0000 (22:36 +0000)]
videoio: update plugin API

5 years agovideoio: move backend.cpp -> backend_plugin.cpp
Alexander Alekhin [Mon, 4 Mar 2019 20:06:19 +0000 (20:06 +0000)]
videoio: move backend.cpp -> backend_plugin.cpp

5 years agoMerge pull request #13949 from alalek:videoio_plugins_target
Alexander Alekhin [Mon, 4 Mar 2019 19:25:11 +0000 (19:25 +0000)]
Merge pull request #13949 from alalek:videoio_plugins_target

5 years agoMerge pull request #13910 from x3lif:Issue_13908
x3lif [Mon, 4 Mar 2019 16:34:10 +0000 (17:34 +0100)]
Merge pull request #13910 from x3lif:Issue_13908

* Fix Issue 13908

Allocate the matrix _Jo only when the solver needs it (ie when solver.state == CvLevMarq::CALC_J)

* Fix calib3D unit test

Fix _Jo allocation when stddev is not empty

* Removing trailing whitespaces

* scope _dp* variables

* fix whitespaces

5 years agovideoio(v4l): fix build due missing defines
Alexander Alekhin [Mon, 4 Mar 2019 15:45:01 +0000 (18:45 +0300)]
videoio(v4l): fix build due missing defines

- V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT
- V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH

5 years agoModifies standalone G-API cmake for testing it properly
smirnov-alexey [Fri, 1 Mar 2019 08:28:49 +0000 (11:28 +0300)]
Modifies standalone G-API cmake for testing it properly

5 years agoandroid: backport build_sdk.py
Alexander Alekhin [Mon, 4 Mar 2019 12:23:14 +0000 (15:23 +0300)]
android: backport build_sdk.py

5 years agoMerge pull request #13939 from komakai:android-build-improvements
Giles Payne [Mon, 4 Mar 2019 12:19:29 +0000 (21:19 +0900)]
Merge pull request #13939 from komakai:android-build-improvements

* Android build improvements
* look for NDK in "ndk-bundle" directory under the SDK directory if location not specified
* look for cmake and ninja in "cmake" directory under the SDK directory if not found in the path
* disable use of ccache if not found in the path

* Redo build tool existence checks

5 years agoMerge pull request #13922 from smirnov-alexey:gapi_fix_nv12_asserts
Alexander Alekhin [Mon, 4 Mar 2019 11:36:53 +0000 (11:36 +0000)]
Merge pull request #13922 from smirnov-alexey:gapi_fix_nv12_asserts

5 years agoMerge pull request #13960 from nglee:dev_FixWindowsBuildIssue
Alexander Alekhin [Mon, 4 Mar 2019 11:18:20 +0000 (11:18 +0000)]
Merge pull request #13960 from nglee:dev_FixWindowsBuildIssue

5 years agoWindows Build Issue Fix
Namgoo Lee [Mon, 4 Mar 2019 00:52:50 +0000 (09:52 +0900)]
Windows Build Issue Fix

5 years agoMerge pull request #13958 from nglee:dev_FixCuda101BuildIssue
Alexander Alekhin [Sun, 3 Mar 2019 18:44:28 +0000 (18:44 +0000)]
Merge pull request #13958 from nglee:dev_FixCuda101BuildIssue

5 years agoCUDA 10.1 Build Issue Fix
Namgoo Lee [Sun, 3 Mar 2019 16:40:43 +0000 (16:40 +0000)]
CUDA 10.1 Build Issue Fix

5 years agoMerge pull request #13951 from alalek:dnn_fix_logging_verbose
Alexander Alekhin [Sat, 2 Mar 2019 20:09:07 +0000 (20:09 +0000)]
Merge pull request #13951 from alalek:dnn_fix_logging_verbose

5 years agoMerge pull request #13947 from JoeHowse:4.0.1-patches
JoeHowse [Sat, 2 Mar 2019 16:00:32 +0000 (12:00 -0400)]
Merge pull request #13947 from JoeHowse:4.0.1-patches

* core, stitching: revise syntax to support Visual C++ 2013

* stitching: revise syntax again to support Visual C++ 2013 and other compilers

* stitching: minor update to clarify changes

5 years agodnn: fix usage of CV_LOG_VERBOSE macro
Alexander Alekhin [Sat, 2 Mar 2019 14:49:21 +0000 (14:49 +0000)]
dnn: fix usage of CV_LOG_VERBOSE macro

5 years agocmake: +opencv_videoio_plugins virtual target
Alexander Alekhin [Sat, 2 Mar 2019 08:31:56 +0000 (08:31 +0000)]
cmake: +opencv_videoio_plugins virtual target

- support comma-separated list in VIDEOIO_PLUGIN_LIST
- opencv tests/samples depend on plugins virtual target

5 years agojava: avoid enum values with references on other enums
Alexander Alekhin [Fri, 1 Mar 2019 21:32:03 +0000 (21:32 +0000)]
java: avoid enum values with references on other enums

declaration order is not fixed

Error message:
Core.java:97: error: illegal forward reference
    Hamming_normType = NORM_HAMMING,

5 years agoMerge pull request #13942 from alalek:imgproc_lsd
Alexander Alekhin [Fri, 1 Mar 2019 21:16:29 +0000 (21:16 +0000)]
Merge pull request #13942 from alalek:imgproc_lsd

5 years agopython: support Python list for cv::Range
Alexander Alekhin [Fri, 1 Mar 2019 20:52:35 +0000 (20:52 +0000)]
python: support Python list for cv::Range

5 years agobindings: backport generator from OpenCV 4.x
Alexander Alekhin [Fri, 1 Mar 2019 15:45:33 +0000 (18:45 +0300)]
bindings: backport generator from OpenCV 4.x

- better handling of enum arguments
- less merge conflicts

5 years agoMerge pull request #13940 from alalek:fix_13914
Alexander Alekhin [Fri, 1 Mar 2019 19:32:36 +0000 (19:32 +0000)]
Merge pull request #13940 from alalek:fix_13914

5 years agoimgproc: removed LSD code due original code license conflict
Alexander Alekhin [Fri, 1 Mar 2019 13:18:49 +0000 (16:18 +0300)]
imgproc: removed LSD code due original code license conflict

5 years agoMerge pull request #13935 from seiko2plus:issue13934
Alexander Alekhin [Fri, 1 Mar 2019 10:52:41 +0000 (10:52 +0000)]
Merge pull request #13935 from seiko2plus:issue13934

5 years agoml: handle sigmoid NaN result (should be Inf)
Alexander Alekhin [Fri, 1 Mar 2019 10:47:45 +0000 (13:47 +0300)]
ml: handle sigmoid NaN result (should be Inf)

- added more debug checks

5 years agoRemove incorrect asserts in NV12 to RGB/BGR kernels
smirnov-alexey [Wed, 27 Feb 2019 11:21:11 +0000 (14:21 +0300)]
Remove incorrect asserts in NV12 to RGB/BGR kernels

5 years agocore:vsx Fix narrowing warning on vector splats
Sayed Adel [Fri, 1 Mar 2019 00:48:38 +0000 (00:48 +0000)]
core:vsx Fix narrowing warning on vector splats

5 years agoMerge pull request #13905 from terfendail:pyr_wintr2
Alexander Alekhin [Thu, 28 Feb 2019 14:53:42 +0000 (14:53 +0000)]
Merge pull request #13905 from terfendail:pyr_wintr2

5 years agoMerge pull request #13931 from berak:core_fix_mat_max_mult
Alexander Alekhin [Thu, 28 Feb 2019 14:29:31 +0000 (14:29 +0000)]
Merge pull request #13931 from berak:core_fix_mat_max_mult

5 years agocore: fix mat matx multiplication
berak [Thu, 28 Feb 2019 10:28:38 +0000 (11:28 +0100)]
core: fix mat matx multiplication

5 years agoMerge pull request #13925 from alalek:core_disable_io_perf_test
Alexander Alekhin [Thu, 28 Feb 2019 12:21:03 +0000 (12:21 +0000)]
Merge pull request #13925 from alalek:core_disable_io_perf_test

5 years agoHorizontal line processing for pyrDown() reworked using wide universal intrinsics.
Vitaly Tuzov [Thu, 11 Oct 2018 17:00:12 +0000 (20:00 +0300)]
Horizontal line processing for pyrDown() reworked using wide universal intrinsics.

5 years agoMerge pull request #13904 from cftang0827:dnn_tf_text_graph_common_bug
Alexander Alekhin [Wed, 27 Feb 2019 16:32:40 +0000 (16:32 +0000)]
Merge pull request #13904 from cftang0827:dnn_tf_text_graph_common_bug

5 years agocore: disable I/O perf test
Alexander Alekhin [Wed, 27 Feb 2019 15:04:00 +0000 (18:04 +0300)]
core: disable I/O perf test

- can be enable separately if needed
- not stable (due storage I/O processing)

5 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 26 Feb 2019 11:49:37 +0000 (14:49 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

5 years agoMerge pull request #13677 from mshabunin:video_plugins
Alexander Alekhin [Tue, 26 Feb 2019 11:36:25 +0000 (11:36 +0000)]
Merge pull request #13677 from mshabunin:video_plugins

5 years agoFramework for dynamic videoio backends, FFmpeg and GStreamer plugins
Maksim Shabunin [Mon, 14 Jan 2019 10:33:38 +0000 (13:33 +0300)]
Framework for dynamic videoio backends, FFmpeg and GStreamer plugins

5 years agoMerge pull request #13901 from reunanen:update_libjpeg-turbo
Alexander Alekhin [Tue, 26 Feb 2019 10:35:32 +0000 (10:35 +0000)]
Merge pull request #13901 from reunanen:update_libjpeg-turbo

5 years agoMerge pull request #13840 from jaewoosong:jaewoosong-patch-1
Alexander Alekhin [Tue, 26 Feb 2019 10:19:17 +0000 (10:19 +0000)]
Merge pull request #13840 from jaewoosong:jaewoosong-patch-1

5 years agoMerge pull request #13892 from dkurt:onnx_upsample_unsqueeze
Alexander Alekhin [Tue, 26 Feb 2019 10:17:06 +0000 (10:17 +0000)]
Merge pull request #13892 from dkurt:onnx_upsample_unsqueeze

5 years agoMerge pull request #13889 from mshabunin:enable-narrowing-warning
Maksim Shabunin [Tue, 26 Feb 2019 10:15:59 +0000 (13:15 +0300)]
Merge pull request #13889 from mshabunin:enable-narrowing-warning

* Enabled -Wnarrowing warning

* Fixed type narrowing issues

* Cast python constants

* Use long long for python constants

* Use int for python constants with fallback to long

* Update cv2.cpp

5 years ago3rdparty: update libjpeg-turbo/CMakeLists.txt
Alexander Alekhin [Mon, 25 Feb 2019 15:50:15 +0000 (18:50 +0300)]
3rdparty: update libjpeg-turbo/CMakeLists.txt

5 years agoUpdate libjpeg-turbo from 1.5.3 to 2.0.2
Juha Reunanen [Sat, 23 Feb 2019 16:30:49 +0000 (18:30 +0200)]
Update libjpeg-turbo from 1.5.3 to 2.0.2

5 years agoMerge pull request #13912 from alalek:cmake_workaround_trycompile_ios
Alexander Alekhin [Tue, 26 Feb 2019 09:28:36 +0000 (09:28 +0000)]
Merge pull request #13912 from alalek:cmake_workaround_trycompile_ios