platform/upstream/opencv.git
6 years agoFix functions‘ class attribution error
wxzs5 [Wed, 27 Dec 2017 03:57:17 +0000 (11:57 +0800)]
Fix functions‘ class attribution error

6 years agoMerge pull request #10419 from shortcipher3:master
Alexander Alekhin [Tue, 26 Dec 2017 14:26:58 +0000 (17:26 +0300)]
Merge pull request #10419 from shortcipher3:master

6 years agoMerge pull request #10418 from mypopydev:master
Alexander Alekhin [Tue, 26 Dec 2017 14:21:59 +0000 (14:21 +0000)]
Merge pull request #10418 from mypopydev:master

6 years agoMerge pull request #10404 from alalek:build_fix_msvs2010
Alexander Alekhin [Tue, 26 Dec 2017 05:51:16 +0000 (05:51 +0000)]
Merge pull request #10404 from alalek:build_fix_msvs2010

6 years agoopencl/cvtclr_dx: fix not compile-time constants issue.
Jun Zhao [Tue, 26 Dec 2017 02:25:36 +0000 (10:25 +0800)]
opencl/cvtclr_dx: fix not compile-time constants issue.

fix the "initializing global variables with values that are not
compile-time constants" issue in Intel SDK for OpenCL. The root cause
is when initializing global variables with value, the variable need is
compile-time constants.

Thanks Zheng, Yang <yang.zheng@intel.com>,
Chodor, Jaroslaw <jaroslaw.chodor@intel.com> give a help.

Signed-off-by: Liu,Kaixuan <kaixuan.liu@intel.com>
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
6 years agoJS examples - FFT didn't work for non-square images because rows/cols were switched...
Chris Hall [Tue, 26 Dec 2017 05:01:48 +0000 (22:01 -0700)]
JS examples - FFT didn't work for non-square images because rows/cols were switched, Histogram example misspelled point

6 years agobuild: fix MSVS2010 build error
Alexander Alekhin [Sat, 23 Dec 2017 00:06:34 +0000 (00:06 +0000)]
build: fix MSVS2010 build error

6 years agoMerge tag '3.4.0'
Alexander Alekhin [Fri, 22 Dec 2017 23:22:50 +0000 (23:22 +0000)]
Merge tag '3.4.0'

6 years agoOpenCV version++ upstream/3.4.0
Alexander Alekhin [Fri, 22 Dec 2017 19:46:21 +0000 (19:46 +0000)]
OpenCV version++

3.4.0

6 years agoMerge pull request #10398 from alalek:ml_simplify_simulated_annealing
Alexander Alekhin [Fri, 22 Dec 2017 19:43:59 +0000 (22:43 +0300)]
Merge pull request #10398 from alalek:ml_simplify_simulated_annealing

6 years agoml(ANN_MLP): ensure that train() call is always successful
Alexander Alekhin [Fri, 22 Dec 2017 18:50:04 +0000 (18:50 +0000)]
ml(ANN_MLP): ensure that train() call is always successful

6 years agoMerge pull request #10401 from terfendail:resize_linear_revert
Alexander Alekhin [Fri, 22 Dec 2017 16:18:50 +0000 (16:18 +0000)]
Merge pull request #10401 from terfendail:resize_linear_revert

6 years agoMerge pull request #10402 from dkurt:dnn_tf_quantized
Alexander Alekhin [Fri, 22 Dec 2017 15:58:56 +0000 (15:58 +0000)]
Merge pull request #10402 from dkurt:dnn_tf_quantized

6 years agoMerge pull request #10385 from pengli:dnn
Alexander Alekhin [Fri, 22 Dec 2017 15:48:40 +0000 (15:48 +0000)]
Merge pull request #10385 from pengli:dnn

6 years agoTensorFlow weights dequantization
Dmitry Kurtaev [Thu, 21 Dec 2017 14:15:48 +0000 (17:15 +0300)]
TensorFlow weights dequantization

6 years agoReverted calls to linear resize back to generic version for floating point matrices
Vitaly Tuzov [Fri, 22 Dec 2017 14:10:03 +0000 (17:10 +0300)]
Reverted calls to linear resize back to generic version for floating point matrices

6 years agoMerge pull request #10397 from mshabunin:fix-incorrect-assert
Alexander Alekhin [Fri, 22 Dec 2017 14:07:02 +0000 (14:07 +0000)]
Merge pull request #10397 from mshabunin:fix-incorrect-assert

6 years agoadd one more convolution kernel tuning candidate
Li Peng [Fri, 22 Dec 2017 10:49:47 +0000 (18:49 +0800)]
add one more convolution kernel tuning candidate

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoml: simplify interfaces of SimulatedAnnealingSolver
Alexander Alekhin [Fri, 22 Dec 2017 12:33:23 +0000 (15:33 +0300)]
ml: simplify interfaces of SimulatedAnnealingSolver

6 years agoMerge pull request #10396 from berak:fix_superres_sample
Vadim Pisarevsky [Fri, 22 Dec 2017 13:35:36 +0000 (13:35 +0000)]
Merge pull request #10396 from berak:fix_superres_sample

6 years agoMerge pull request #10265 from dkurt:nms_for_region_layer
Vadim Pisarevsky [Fri, 22 Dec 2017 13:29:37 +0000 (13:29 +0000)]
Merge pull request #10265 from dkurt:nms_for_region_layer

6 years agoMerge pull request #10394 from alalek:cmake_fix_pch_pic_pie
Vadim Pisarevsky [Fri, 22 Dec 2017 13:26:31 +0000 (13:26 +0000)]
Merge pull request #10394 from alalek:cmake_fix_pch_pic_pie

6 years agoMerge pull request #10387 from terfendail:resize23_perftest
Vadim Pisarevsky [Fri, 22 Dec 2017 13:26:05 +0000 (13:26 +0000)]
Merge pull request #10387 from terfendail:resize23_perftest

6 years agoMerge pull request #10392 from terfendail:bitexact_fallback
Vadim Pisarevsky [Fri, 22 Dec 2017 13:23:55 +0000 (13:23 +0000)]
Merge pull request #10392 from terfendail:bitexact_fallback

6 years agoMerge pull request #10375 from tomoaki0705:buildWarningMSVC
Alexander Alekhin [Fri, 22 Dec 2017 13:17:11 +0000 (13:17 +0000)]
Merge pull request #10375 from tomoaki0705:buildWarningMSVC

6 years agoMerge pull request #10390 from alalek:ocl_option_buffer_rect
Alexander Alekhin [Fri, 22 Dec 2017 12:52:56 +0000 (12:52 +0000)]
Merge pull request #10390 from alalek:ocl_option_buffer_rect

6 years agoReplaced incorrect CV_Assert calls with CV_Error
Maksim Shabunin [Fri, 22 Dec 2017 12:20:13 +0000 (15:20 +0300)]
Replaced incorrect CV_Assert calls with CV_Error

6 years agosamples: check for valid input in gpu/super_resolution.cpp
berak [Fri, 22 Dec 2017 11:34:25 +0000 (12:34 +0100)]
samples: check for valid input in gpu/super_resolution.cpp

6 years agoAdded fallback to generic linear resize in case bit-exact resize of provided matrix...
Vitaly Tuzov [Fri, 22 Dec 2017 10:23:56 +0000 (13:23 +0300)]
Added fallback to generic linear resize in case bit-exact resize of provided matrix isn't supported

6 years agocmake: fix -fPIC/-fPIE handling in precompiled headers (PCH)
Alexander Alekhin [Fri, 22 Dec 2017 10:46:45 +0000 (13:46 +0300)]
cmake: fix -fPIC/-fPIE handling in precompiled headers (PCH)

6 years agoMerge pull request #10386 from terfendail:resizeexact_c3
Vadim Pisarevsky [Fri, 22 Dec 2017 10:54:49 +0000 (10:54 +0000)]
Merge pull request #10386 from terfendail:resizeexact_c3

6 years agoocl: workaround option to disable usage of buffer "Rect" operations
Alexander Alekhin [Fri, 22 Dec 2017 09:28:41 +0000 (12:28 +0300)]
ocl: workaround option to disable usage of buffer "Rect" operations

6 years agoMerge pull request #10389 from wxzs5:yangli
Alexander Alekhin [Fri, 22 Dec 2017 10:04:05 +0000 (10:04 +0000)]
Merge pull request #10389 from wxzs5:yangli

6 years agoMerge pull request #10364 from dkurt:dnn_smooth_tf_data_layout
Vadim Pisarevsky [Fri, 22 Dec 2017 09:56:45 +0000 (09:56 +0000)]
Merge pull request #10364 from dkurt:dnn_smooth_tf_data_layout

6 years agoRemove redundant return variable
wxzs5 [Fri, 22 Dec 2017 09:13:57 +0000 (17:13 +0800)]
Remove redundant return variable

6 years agoDisabled universal intrinsic based implementation for bit-exact resize of 3-channel...
Vitaly Tuzov [Fri, 22 Dec 2017 07:08:30 +0000 (10:08 +0300)]
Disabled universal intrinsic based implementation for bit-exact resize of 3-channel images

6 years agoclean up the code
Tomoaki Teshima [Thu, 21 Dec 2017 23:42:21 +0000 (08:42 +0900)]
clean up the code
  * disable the warning in CMake, not int the code using pragma

6 years agoMerge pull request #10374 from tomoaki0705:removeGstreamerTest
Alexander Alekhin [Thu, 21 Dec 2017 19:02:13 +0000 (19:02 +0000)]
Merge pull request #10374 from tomoaki0705:removeGstreamerTest

6 years agoMerge pull request #10316 from terfendail:bitexact_c234
Vadim Pisarevsky [Thu, 21 Dec 2017 18:56:53 +0000 (18:56 +0000)]
Merge pull request #10316 from terfendail:bitexact_c234

6 years agoMerge pull request #10369 from alalek:issue_10351
Vadim Pisarevsky [Thu, 21 Dec 2017 18:48:38 +0000 (18:48 +0000)]
Merge pull request #10369 from alalek:issue_10351

6 years agoMerge pull request #10370 from pengli:dnn
Alexander Alekhin [Thu, 21 Dec 2017 15:36:23 +0000 (15:36 +0000)]
Merge pull request #10370 from pengli:dnn

6 years agoavoid the test which is too strict
Tomoaki Teshima [Thu, 21 Dec 2017 15:14:10 +0000 (00:14 +0900)]
avoid the test which is too strict
  * confirmed test failure on Jetson TX1 and TX2
  * show the performance but not bit exact result

6 years agocleanup unnecessary macros in convolution ocl kernel
Li Peng [Thu, 21 Dec 2017 14:01:44 +0000 (22:01 +0800)]
cleanup unnecessary macros in convolution ocl kernel

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agorefactor candidate generation of convolution auto-tuning
Li Peng [Tue, 19 Dec 2017 14:28:18 +0000 (22:28 +0800)]
refactor candidate generation of convolution auto-tuning

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoRefactor NMS procedure at RegionLayer
Dmitry Kurtaev [Fri, 8 Dec 2017 11:14:17 +0000 (14:14 +0300)]
Refactor NMS procedure at RegionLayer

6 years agoMerge pull request #10366 from alalek:ocl_fix_cvtcolor_read
Vadim Pisarevsky [Thu, 21 Dec 2017 08:33:58 +0000 (08:33 +0000)]
Merge pull request #10366 from alalek:ocl_fix_cvtcolor_read

6 years agoMerge pull request #10340 from alalek:log_level_option
Vadim Pisarevsky [Thu, 21 Dec 2017 08:33:18 +0000 (08:33 +0000)]
Merge pull request #10340 from alalek:log_level_option

6 years agoimgcodecs(pxm): fix memcpy size
Alexander Alekhin [Thu, 21 Dec 2017 01:10:24 +0000 (01:10 +0000)]
imgcodecs(pxm): fix memcpy size

6 years agoAdded performance tests for linear resize of 2 and 3-channel images
Vitaly Tuzov [Wed, 20 Dec 2017 15:11:21 +0000 (18:11 +0300)]
Added performance tests for linear resize of 2 and 3-channel images

6 years agoMerge pull request #10331 from arrybn:python_dnn_net
Vadim Pisarevsky [Wed, 20 Dec 2017 14:30:26 +0000 (14:30 +0000)]
Merge pull request #10331 from arrybn:python_dnn_net

6 years agoMerge pull request #10354 from catree:add_python_sample_show_extrinsics
Vadim Pisarevsky [Wed, 20 Dec 2017 14:23:01 +0000 (14:23 +0000)]
Merge pull request #10354 from catree:add_python_sample_show_extrinsics

6 years agoCalcerror uses now weighted samples (#10346)
LaurentBerger [Wed, 20 Dec 2017 14:24:46 +0000 (15:24 +0100)]
Calcerror uses now weighted samples (#10346)

* Calcerror uses now sample weights

* catree comment in #10319

6 years agoimgproc(ocl): fix RGB2RGBA kernel out of range access
Alexander Alekhin [Wed, 20 Dec 2017 14:19:46 +0000 (14:19 +0000)]
imgproc(ocl): fix RGB2RGBA kernel out of range access

6 years agoMerge pull request #10356 from dkurt:dnn_rfcn
Vadim Pisarevsky [Wed, 20 Dec 2017 14:19:46 +0000 (14:19 +0000)]
Merge pull request #10356 from dkurt:dnn_rfcn

6 years agoMerge pull request #10360 from sturkmen72:update_links
Vadim Pisarevsky [Wed, 20 Dec 2017 14:19:17 +0000 (14:19 +0000)]
Merge pull request #10360 from sturkmen72:update_links

6 years agoMerge pull request #10358 from catree:add_tutorial_homography_panorama_stitching
Vadim Pisarevsky [Wed, 20 Dec 2017 14:18:41 +0000 (14:18 +0000)]
Merge pull request #10358 from catree:add_tutorial_homography_panorama_stitching

6 years agoAdded universal intrinsics based implementations for CV_8UC2, CV_8UC3, CV_8UC4 bit...
Vitaly Tuzov [Thu, 7 Dec 2017 17:27:58 +0000 (20:27 +0300)]
Added universal intrinsics based implementations for CV_8UC2, CV_8UC3, CV_8UC4 bit-exact resizes.

6 years agoManage TensorFlow's NHWC data layout is smoother
Dmitry Kurtaev [Wed, 20 Dec 2017 11:13:40 +0000 (14:13 +0300)]
Manage TensorFlow's NHWC data layout is smoother

6 years agoUpdate left_intrinsics.yml file with chessboard square_size=0.025 and with extrinsic...
catree [Tue, 19 Dec 2017 16:03:00 +0000 (17:03 +0100)]
Update left_intrinsics.yml file with chessboard square_size=0.025 and with extrinsic parameters. Add camera_calibration_show_extrinsics.py, a Python sample that allows to display the extrinsics saved during the camera calibration process (cpp-example-calibration).

6 years agoR-FCN models support
Dmitry Kurtaev [Tue, 19 Dec 2017 16:43:49 +0000 (19:43 +0300)]
R-FCN models support

6 years agoUpdate links
Suleyman TURKMEN [Tue, 19 Dec 2017 23:25:16 +0000 (02:25 +0300)]
Update links

6 years agocore(logger): add log level configuration option
Alexander Alekhin [Sun, 17 Dec 2017 22:28:33 +0000 (22:28 +0000)]
core(logger): add log level configuration option

6 years agoAdd Demo 5: Basic panorama stitching from a rotating camera in the homography tutorial.
catree [Tue, 19 Dec 2017 21:45:35 +0000 (22:45 +0100)]
Add Demo 5: Basic panorama stitching from a rotating camera in the homography tutorial.

6 years agoMerge pull request #10341 from pengli:dnn
Alexander Alekhin [Tue, 19 Dec 2017 14:04:55 +0000 (14:04 +0000)]
Merge pull request #10341 from pengli:dnn

6 years agoMerge pull request #10348 from ElenaGvozdeva:Canny_HAL
Alexander Alekhin [Tue, 19 Dec 2017 13:07:59 +0000 (13:07 +0000)]
Merge pull request #10348 from ElenaGvozdeva:Canny_HAL

6 years agoMerge pull request #10347 from dkurt:dnn_remove_deprecated_importer
Vadim Pisarevsky [Tue, 19 Dec 2017 11:03:06 +0000 (11:03 +0000)]
Merge pull request #10347 from dkurt:dnn_remove_deprecated_importer

6 years agoadd ocl accuracy test for tf mobilenet ssd
Li Peng [Tue, 19 Dec 2017 08:59:46 +0000 (16:59 +0800)]
add ocl accuracy test for tf mobilenet ssd

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoadd depthwise convolution kernel
Li Peng [Tue, 19 Dec 2017 09:59:13 +0000 (17:59 +0800)]
add depthwise convolution kernel

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoprior box layer ocl implementation
Li Peng [Tue, 5 Dec 2017 15:17:34 +0000 (23:17 +0800)]
prior box layer ocl implementation

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoHAL for canny
elenagvo [Thu, 30 Nov 2017 13:56:13 +0000 (16:56 +0300)]
HAL for canny

6 years agoMerge pull request #10344 from tomoaki0705:fixBuildLibtiff
Alexander Alekhin [Mon, 18 Dec 2017 17:00:45 +0000 (17:00 +0000)]
Merge pull request #10344 from tomoaki0705:fixBuildLibtiff

6 years agoRemove cv::dnn::Importer
Dmitry Kurtaev [Mon, 18 Dec 2017 14:22:57 +0000 (17:22 +0300)]
Remove cv::dnn::Importer

6 years agoChanged wrapping mode for cv::dnn::Net::forward
Alexander Rybnikov [Sat, 16 Dec 2017 09:21:12 +0000 (12:21 +0300)]
Changed wrapping mode for cv::dnn::Net::forward

6 years agofix compilation error on Visual Studio 2013 and earlier
Tomoaki Teshima [Mon, 18 Dec 2017 12:51:33 +0000 (21:51 +0900)]
fix compilation error on Visual Studio 2013 and earlier
  - fix compilation error about "inline"
  - fix linker error about "_TIFF_snprintf_f"

6 years agoMerge pull request #10343 from tomoaki0705:suppressWarningEncoding
Vadim Pisarevsky [Mon, 18 Dec 2017 10:53:24 +0000 (10:53 +0000)]
Merge pull request #10343 from tomoaki0705:suppressWarningEncoding

6 years agoUpdate samples (#10333)
Suleyman TURKMEN [Mon, 18 Dec 2017 10:44:11 +0000 (12:44 +0200)]
Update samples (#10333)

* Update samples

* Update calib3d.hpp

* Update calib3d.hpp

* Update calib3d.hpp

* Update calib3d.hpp

6 years agoMerge pull request #10339 from catree:add_doc_solvepnp_figure_desc
Vadim Pisarevsky [Mon, 18 Dec 2017 09:13:06 +0000 (09:13 +0000)]
Merge pull request #10339 from catree:add_doc_solvepnp_figure_desc

6 years agoMerge pull request #10337 from dkurt:fix_pooling_layer
Vadim Pisarevsky [Mon, 18 Dec 2017 09:11:54 +0000 (09:11 +0000)]
Merge pull request #10337 from dkurt:fix_pooling_layer

6 years agoMerge pull request #10338 from hrnr:fix-build
Alexander Alekhin [Mon, 18 Dec 2017 06:52:08 +0000 (06:52 +0000)]
Merge pull request #10338 from hrnr:fix-build

6 years agosuppress warning on Visual Studio
Tomoaki Teshima [Mon, 18 Dec 2017 06:32:06 +0000 (15:32 +0900)]
suppress warning on Visual Studio
  * remove non ASCII character from the comment

6 years agoAdd a figure and some formulas to illustrate the PnP pose estimation principle.
catree [Sun, 17 Dec 2017 20:38:22 +0000 (21:38 +0100)]
Add a figure and some formulas to illustrate the PnP pose estimation principle.

6 years agofix build with intrinsics enabled
Jiri Horner [Sun, 17 Dec 2017 19:23:15 +0000 (20:23 +0100)]
fix build with intrinsics enabled

* since #10231 opencv with instrumentation does not build

6 years agoFix default pooling layer type
Dmitry Kurtaev [Sun, 17 Dec 2017 11:36:38 +0000 (14:36 +0300)]
Fix default pooling layer type

6 years agoOpenCV version++
Alexander Alekhin [Fri, 15 Dec 2017 22:30:43 +0000 (01:30 +0300)]
OpenCV version++

OpenCV 3.4.0-rc

6 years agoexperimental version++
Alexander Alekhin [Fri, 15 Dec 2017 11:05:57 +0000 (14:05 +0300)]
experimental version++

6 years agoMerge pull request #10326 from alalek:cmake_fixes
Alexander Alekhin [Fri, 15 Dec 2017 22:26:00 +0000 (22:26 +0000)]
Merge pull request #10326 from alalek:cmake_fixes

6 years agocmake: fix opencv_world build with contrib
Alexander Alekhin [Fri, 15 Dec 2017 21:36:22 +0000 (21:36 +0000)]
cmake: fix opencv_world build with contrib

6 years agocmake: fix ocv_target_compile_definitions() for world builds
Alexander Alekhin [Fri, 15 Dec 2017 19:21:51 +0000 (22:21 +0300)]
cmake: fix ocv_target_compile_definitions() for world builds

fixes CUDA build

6 years agocmake: fix missed include in libtiff
Alexander Alekhin [Fri, 15 Dec 2017 20:28:09 +0000 (23:28 +0300)]
cmake: fix missed include in libtiff

6 years agoMerge pull request #10319 from catree:move_SimulatedAnnealingSolver_Impl_cpp
Alexander Alekhin [Fri, 15 Dec 2017 20:06:48 +0000 (23:06 +0300)]
Merge pull request #10319 from catree:move_SimulatedAnnealingSolver_Impl_cpp

Move SimulatedAnnealingSolver::Impl in cpp file

6 years agoMerge pull request #10258 from savuor:fix/kmeans_channels
Rostislav Vasilikhin [Fri, 15 Dec 2017 18:48:48 +0000 (21:48 +0300)]
Merge pull request #10258 from savuor:fix/kmeans_channels

* kmeans: number of channels in _centers fixed

* fixedType() is checked now

6 years agoml: fix SimulatedAnnealingSolver interface
Alexander Alekhin [Fri, 15 Dec 2017 14:40:08 +0000 (17:40 +0300)]
ml: fix SimulatedAnnealingSolver interface

6 years agoMerge pull request #10313 from alalek:rename_fix
Alexander Alekhin [Fri, 15 Dec 2017 18:40:22 +0000 (21:40 +0300)]
Merge pull request #10313 from alalek:rename_fix

Fix file names

6 years agoMerge pull request #10320 from mshabunin:static-analysis-1
Alexander Alekhin [Fri, 15 Dec 2017 16:53:34 +0000 (16:53 +0000)]
Merge pull request #10320 from mshabunin:static-analysis-1

6 years agoMerge pull request #10317 from alalek:cmake_pic_configure
Alexander Alekhin [Fri, 15 Dec 2017 16:12:12 +0000 (16:12 +0000)]
Merge pull request #10317 from alalek:cmake_pic_configure

6 years agoFixed 3 issues found by static analysis
Maksim Shabunin [Fri, 15 Dec 2017 14:28:38 +0000 (17:28 +0300)]
Fixed 3 issues found by static analysis

6 years agoMove SimulatedAnnealingSolver::Impl in cpp file. Fix some typos.
catree [Fri, 15 Dec 2017 13:09:59 +0000 (14:09 +0100)]
Move SimulatedAnnealingSolver::Impl in cpp file. Fix some typos.

6 years agocmake: update CMAKE_POSITION_INDEPENDENT_CODE
Alexander Alekhin [Fri, 15 Dec 2017 12:27:06 +0000 (15:27 +0300)]
cmake: update CMAKE_POSITION_INDEPENDENT_CODE

6 years agoMerge pull request #10306 from dkurt:faster_rcnn
Vadim Pisarevsky [Fri, 15 Dec 2017 12:23:53 +0000 (12:23 +0000)]
Merge pull request #10306 from dkurt:faster_rcnn

6 years agoMerge pull request #10287 from sturkmen72:update_createsamples_cpp
Suleyman TURKMEN [Fri, 15 Dec 2017 12:05:18 +0000 (14:05 +0200)]
Merge pull request #10287 from sturkmen72:update_createsamples_cpp

* update createsamples

adds command-line option -rngseed
replaces rand() -> theRNG()

* Update utility.cpp

* apps(createsamples): fix warpPerspective pixels access bug