platform/upstream/opencv.git
7 years agocalib3d: export parameters of CALIB_CB_CLUSTERING
Pavel Rojtberg [Fri, 8 Sep 2017 14:35:23 +0000 (16:35 +0200)]
calib3d: export parameters of CALIB_CB_CLUSTERING

7 years agoMerge pull request #9743 from DensityCo:tbb-debug
Alexander Alekhin [Fri, 29 Sep 2017 14:17:55 +0000 (14:17 +0000)]
Merge pull request #9743 from DensityCo:tbb-debug

7 years agoMerge pull request #9740 from tomoaki0705:universalArithm
Alexander Alekhin [Fri, 29 Sep 2017 14:17:01 +0000 (14:17 +0000)]
Merge pull request #9740 from tomoaki0705:universalArithm

7 years agoMerge pull request #9726 from blendin:fix_oob
Alexander Alekhin [Fri, 29 Sep 2017 14:16:40 +0000 (14:16 +0000)]
Merge pull request #9726 from blendin:fix_oob

7 years agoMerge pull request #9741 from alalek:stitching_test_update
Alexander Alekhin [Fri, 29 Sep 2017 13:10:53 +0000 (13:10 +0000)]
Merge pull request #9741 from alalek:stitching_test_update

7 years agostitching(perf): update condition threshold
Alexander Alekhin [Thu, 28 Sep 2017 16:21:18 +0000 (19:21 +0300)]
stitching(perf): update condition threshold

7 years agotest: clarify fail messages
Alexander Alekhin [Thu, 28 Sep 2017 16:07:58 +0000 (19:07 +0300)]
test: clarify fail messages

7 years agouse universal intrinsic in arithm.cpp
Tomoaki Teshima [Thu, 28 Sep 2017 23:33:15 +0000 (08:33 +0900)]
use universal intrinsic in arithm.cpp
  * remove raw NEON/SSE2 implementation as much as possible
  * replace them to universal intrinsic in InRange/Compare/AddWeighted

7 years agoTBB Debug Release
bradford barr [Thu, 28 Sep 2017 21:31:41 +0000 (17:31 -0400)]
TBB Debug Release

OpenCV fails to detect tbb on a debug build if the platform has only installed
debug libraries.  This PR adds an additional check to the tbb detect logic for
systems that only install tbb debug and not both tbb debug and release.

7 years agoMerge pull request #9491 from dkurt:tf_lstm
Vadim Pisarevsky [Thu, 28 Sep 2017 21:04:06 +0000 (21:04 +0000)]
Merge pull request #9491 from dkurt:tf_lstm

7 years agoMerge pull request #9683 from terfendail:grects_weights
Vadim Pisarevsky [Thu, 28 Sep 2017 14:02:12 +0000 (14:02 +0000)]
Merge pull request #9683 from terfendail:grects_weights

7 years agoMerge pull request #9604 from alalek:ocl_kernel_profiling
Vadim Pisarevsky [Thu, 28 Sep 2017 13:48:34 +0000 (13:48 +0000)]
Merge pull request #9604 from alalek:ocl_kernel_profiling

7 years agoMerge pull request #9692 from alalek:dnn_perf_net
Vadim Pisarevsky [Thu, 28 Sep 2017 13:44:24 +0000 (13:44 +0000)]
Merge pull request #9692 from alalek:dnn_perf_net

7 years agoMerge pull request #9734 from dkurt:fix_deconv_layer_kernel_layout
Vadim Pisarevsky [Thu, 28 Sep 2017 11:42:57 +0000 (11:42 +0000)]
Merge pull request #9734 from dkurt:fix_deconv_layer_kernel_layout

7 years agoMerge pull request #9691 from dkurt:padding_layer_refactoring
Vadim Pisarevsky [Thu, 28 Sep 2017 11:34:28 +0000 (11:34 +0000)]
Merge pull request #9691 from dkurt:padding_layer_refactoring

7 years agoMerge pull request #9714 from tomoaki0705:universalBilateral
Tomoaki Teshima [Thu, 28 Sep 2017 09:30:22 +0000 (18:30 +0900)]
Merge pull request #9714 from tomoaki0705:universalBilateral

imgproc: use universal intrinsic as much as possible (#9714)

* use universal intrinsic as much as possible
  * make SSE3 part as common as possible with universal intrinsic implementation
  * put the reducing part out of the main loop

* follow the comment
  * fix the typo
  * use v_reduce_sum4

* follow the comment again
  * remove all CV_SSE3 part from smooth.cpp

7 years agoMerge pull request #9710 from savuor:ovx_harris_build_fix
Alexander Alekhin [Thu, 28 Sep 2017 09:27:09 +0000 (09:27 +0000)]
Merge pull request #9710 from savuor:ovx_harris_build_fix

7 years agoMerge pull request #9737 from huningxin:fix_9729
Alexander Alekhin [Thu, 28 Sep 2017 08:57:19 +0000 (08:57 +0000)]
Merge pull request #9737 from huningxin:fix_9729

7 years agoUse horizontal input/output images layout in OpenCV.js tutorials
Ningxin Hu [Wed, 27 Sep 2017 08:35:43 +0000 (16:35 +0800)]
Use horizontal input/output images layout in OpenCV.js tutorials

7 years agoSwap dimensions of deconvolution kernel
Dmitry Kurtaev [Wed, 27 Sep 2017 15:58:50 +0000 (18:58 +0300)]
Swap dimensions of deconvolution kernel

7 years agoMerge pull request #9735 from alalek:fix_docs
Alexander Alekhin [Wed, 27 Sep 2017 19:11:38 +0000 (22:11 +0300)]
Merge pull request #9735 from alalek:fix_docs

doc: fix documentation generation with JavaScript bindings

7 years agodoc: fix documentation generation with JavaScript bindings
Alexander Alekhin [Wed, 27 Sep 2017 16:24:24 +0000 (19:24 +0300)]
doc: fix documentation generation with JavaScript bindings

7 years agoMerge pull request #9730 from yanlend:patch-1
Alexander Alekhin [Wed, 27 Sep 2017 16:02:09 +0000 (16:02 +0000)]
Merge pull request #9730 from yanlend:patch-1

7 years agoMerge pull request #9716 from alalek:fix_ipp_build
Alexander Alekhin [Wed, 27 Sep 2017 16:00:28 +0000 (16:00 +0000)]
Merge pull request #9716 from alalek:fix_ipp_build

7 years agoMerge pull request #9717 from alalek:fix_fma
Alexander Alekhin [Wed, 27 Sep 2017 13:48:09 +0000 (13:48 +0000)]
Merge pull request #9717 from alalek:fix_fma

7 years agoMerge pull request #9728 from huningxin:fix_9727
Alexander Alekhin [Wed, 27 Sep 2017 12:05:55 +0000 (12:05 +0000)]
Merge pull request #9728 from huningxin:fix_9727

7 years agoMerge pull request #9725 from dericcrago:fixed_boundary_spelling_in_comments
Alexander Alekhin [Wed, 27 Sep 2017 12:04:23 +0000 (12:04 +0000)]
Merge pull request #9725 from dericcrago:fixed_boundary_spelling_in_comments

7 years agoFix bug: non-maximum suppression for hough circle
Peter Fischer [Wed, 27 Sep 2017 09:47:30 +0000 (11:47 +0200)]
Fix bug: non-maximum suppression for hough circle

The non-maximum suppression in the Hough accumulator incorrectly ignores maxima that extend over more than one cell, i.e. two neighboring cells both have the same accumulator value. This maximum is dropped completely instead of picking at least one of the entries. This frequently results in obvious circles being missed.

The behavior is now changed to be the same as for hough_lines.

See also https://github.com/opencv/opencv/issues/4440

7 years agoCheck files uploaded by user
Ningxin Hu [Wed, 27 Sep 2017 08:43:25 +0000 (16:43 +0800)]
Check files uploaded by user

7 years agoFix image uploading failure for OpenCV.js tutorials
Ningxin Hu [Wed, 27 Sep 2017 06:46:21 +0000 (14:46 +0800)]
Fix image uploading failure for OpenCV.js tutorials

7 years agoOnly accept images to upload for OpenCV.js tutorials
Ningxin Hu [Wed, 27 Sep 2017 06:45:33 +0000 (14:45 +0800)]
Only accept images to upload for OpenCV.js tutorials

7 years agoFix out of bounds write
blendin [Wed, 27 Sep 2017 06:04:01 +0000 (23:04 -0700)]
Fix out of bounds write

7 years agoFixed 'boundary' spelling
Deric Crago [Wed, 27 Sep 2017 03:42:48 +0000 (23:42 -0400)]
Fixed 'boundary' spelling

7 years agoMerge pull request #9707 from woodychow:fix_undistortrectifymap_avx2
Alexander Alekhin [Tue, 26 Sep 2017 16:42:47 +0000 (16:42 +0000)]
Merge pull request #9707 from woodychow:fix_undistortrectifymap_avx2

7 years agofix usage of CV_FMA3 macro
Alexander Alekhin [Tue, 26 Sep 2017 14:23:54 +0000 (17:23 +0300)]
fix usage of CV_FMA3 macro

7 years agocmake: fix typo
Alexander Alekhin [Tue, 26 Sep 2017 14:19:27 +0000 (17:19 +0300)]
cmake: fix typo

7 years agoMerge pull request #9709 from savuor:softfloat_r3d
Alexander Alekhin [Tue, 26 Sep 2017 11:16:41 +0000 (11:16 +0000)]
Merge pull request #9709 from savuor:softfloat_r3d

7 years agoLSTM layer for TensorFlow importer
Dmitry Kurtaev [Fri, 25 Aug 2017 11:45:03 +0000 (14:45 +0300)]
LSTM layer for TensorFlow importer

7 years agoMerge pull request #9713 from huningxin:fix_9712
Alexander Alekhin [Tue, 26 Sep 2017 09:03:34 +0000 (09:03 +0000)]
Merge pull request #9713 from huningxin:fix_9712

7 years agoImprove cascade file loading and error handling for js tutorials
Ningxin Hu [Tue, 26 Sep 2017 05:01:45 +0000 (13:01 +0800)]
Improve cascade file loading and error handling for js tutorials

7 years agoAdd haar cascade files as js_assets
Ningxin Hu [Tue, 26 Sep 2017 05:00:36 +0000 (13:00 +0800)]
Add haar cascade files as js_assets

7 years agoMinor optimization of initUndistortRectifyMapLine_AVX
woody.chow [Tue, 26 Sep 2017 00:12:22 +0000 (09:12 +0900)]
Minor optimization of initUndistortRectifyMapLine_AVX

7 years agoMerge pull request #9690 from tomoaki0705:universalSmooth
Alexander Alekhin [Mon, 25 Sep 2017 19:42:05 +0000 (19:42 +0000)]
Merge pull request #9690 from tomoaki0705:universalSmooth

7 years agoMerge pull request #8833 from terfendail:resizenn_perftest
Alexander Alekhin [Mon, 25 Sep 2017 16:42:07 +0000 (16:42 +0000)]
Merge pull request #8833 from terfendail:resizenn_perftest

7 years agoMerge pull request #9676 from jrobble:fix_caffe_swaprb
Alexander Alekhin [Mon, 25 Sep 2017 16:05:11 +0000 (16:05 +0000)]
Merge pull request #9676 from jrobble:fix_caffe_swaprb

7 years agoMerge pull request #9466 from huningxin:js
Congxiang Pan [Mon, 25 Sep 2017 13:52:07 +0000 (21:52 +0800)]
Merge pull request #9466 from huningxin:js

GSoC 2017: Improve and Extend the JavaScript Bindings for OpenCV (#9466)

* Initial support for build with emscripten

mkdir build_js
cd build_js
cmake -D CMAKE_TOOLCHAIN_FILE=/path/to/emsdk/emsdk-portable/emscripten/master/cmake/Modules/Platform/Emscripten.cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=/usr/local ..

* Add js module

The output is build/bin/opencv_js.js

* Fix opencv2/calib3d.hpp not found issue

* Add module name

Usage:
var cv = cv();

* Add total memory as 128MB and allow growth

* Add compilation flags for emscripten

* Use EMSCRIPTEN build target

* Disable js module for non emscripten build

* Bind the preload file path to root

Usage:
face_cascade.load('haarcascade_frontalface_default.xml');

* add test folder

* fix test files

* Copy js module test to bin

* Support to run tests on Node.js

Fix tests to import cv Module when runtime is node.
Add tests.js to use qunit to auto run tests.
Modify umd wrapper to support Module is not defined.

Usage:
node tests.js

* Support UMD and file system

Wrap the opencv_js.js to opencv.js by UMD wrapper

Use emscripten file system API to load files instead of generating data file or
embedding them. It supports both browser and node.js usages.

* Fix incorrect module name in tests

* Add package.json to add dependence of qunit

* Add js_tutorials folder and a intro page of opencv.js

Enable BUILD_DOCS in CMakeLists.txt.
Add new folder of js_tutorials in folder opencv/doc.
Imitate the tutorials of OpenCV-Python to create a intro page of opencv.js and a setup guide

* Import and use binding gen from opencvjs project

* Modify the embindgen.py to pass the build and test

* Add classes and functions white list

* Consolidate hdr_parser.py (#31)

Use hdr_parser.py of python module

Add js flag to support js binding generator.

* Use emscripten::vecFromJSArray for input vector param

Fix part of #23

* Fix test cases after #34

Fix #39

* Expose groupRectangles and CascadeClassifier.empty

* Add js highgui tutorials

add tutorials of imread&imshow and createTrackbar in doc/js_tutorials/js_gui folder
add interactive tutorial webpage for imread&imshow and createTrackbar in doc/js_tutorials/js_interactive_tutorials folder, and some images needed.
change doc/CMakeLists.txt to copy the interactive tutorial webpage and opencv.js to the tutorials' destination folder

* rm useless annotation in doc/CMakeLists.txt

* fix some nonstandard indentation and space

* add check if canvas is valid

* Expose BackgroundSubtractorMOG2

Fix #43

* Fix build of js doc

Limit copy_js_interactive_tutorials for doxygen build
Add dep to opencv.js

Fix #53

* Implement cv.imread & cv.imshow and insert interactive pages in tutorials (#55)

* add helper.js

* delete ALL in add target copy_js_interactive_tutorials to avoid dependence error

* Insert interactive pages in tutorials

insert the old interactive pages in markdown by using \htmlonly and \endhtmlonly command.
delete the useless interactive page
rename js_interactive_tutorials to js_assets to put some images needed in

* fix the depends of the target doxygen

add opencv.js to depends and delete the useless target of copy_js_assets

* change filename helper.js to helpers.js

* disable button or trankbar before opencv.js is ready

* Expose CV_64F

Fix #65

* improve cv.imshow to display different types as native imshow

* add utils.js to reuse functions and update tutorials

* Make doxygen depend on bin/opencv.js

* Fix memory issue of matFromArray

Fix #37

* Merge pull request from ganwenyao/tutorial_18

* Add notes for ganwenyao/tutorial_18

* Modifying for ganwenyao/tutorial_18

* Change Mat constructor with data to 5 parameters

* Mat supports constructor with Scalar

Fix #60

* update cv.imread cause the memory issue of matFromArray has been fixed

* fix canvas name and default input image

* Expose cv::Moments

Fix #85

* Add -Wno-missing-prototypes for emscripten build

* fix canvas name

* add tutorial of video input and output

* Expose enums as emscripten consts

Fix #72

* update the tutorial to use Mat constructor with Scalar and change lena.jpg

* Exclude cv::Mat for vecFromJSArray

Fix #82

* Add unit tests for cv.moments

* Fix the unit tests.

* add checkbox and stop button

* add adapter.js to make sure compatibility fo video tutorials

* Support default parameters with function overloading

* modify enums to constants

* Use https URL for MathJax.js

Fix #109

* Comment out the debug print in embindgen.py

* Expose RotatedRect

Fix #96

* replace enum with constants and improve onload function

* delete some useless paras cause #105 fixed this

* Modify const name

* Modify Contour Properties

* tutorials for imgprc2 and objdec

* Expose more functions for img proc tutorials

Fix #76

* Expose polylines for video analysis tutorial

Fix #121

* Expose constants for default parameters of img proc tutorials

Fix #122

* Fix wrong parameter types of Mat.copyTo

Fix #87

* Support default parameters of mat.convertTo

Fix #123

* Support default parameters for external constructors

Fix #131

* Revert "Expose polylines for video analysis tutorial"

This reverts commit 3ce7615652e510d30e3c0014706ac38c98883189.

Fix #121

* Support cv.minMaxLoc

Fix #127

* Expose cv.minEnclosingCircle

Fix #126

* Add video analysis tutorials

add three video tutorials, Meanshift and Camshift, Optical Flow Background Subtraction
add cup.mp4 and box.mp4 for demo in tutorials

* improve image processing tutorials

* repalce console.warn with throw to throw exception

* add try-catch to throw exception in code demo

* Change mat.size() return value to JS Array object

Fix #140

* add a note about different channels order between canvas and native opencv

* add a note about how to capture video from video files

* Binding cv.Scalar to JS array

Fix #147

* Add JS cv.Scalar object into helpers.js

* Update Install OpenCV-JavaScript tutorial page

Fix #44

* Update the OpenCV-JavaScript introduction page

Fix #44

* add cv.VideoCapture and read() function

* set the size of the hidden canvas same as the video

* Add Using OpenCV-JavaScript tutorial page

Fix #44

* fix some bad code style

* Update tutorials after 8/2 sync meeting

Changes include:
- Use OpenCV.js name instead of OpenCV-JavaScript
- Put using OpenCV.js ahead of build OpenCV.js
- Refine usage and introduction page
- Muted the video in tutorials

* Fix a typo in introduction page

* use cv.VideoCapture and its read() function to read video

* replace OpenCV-JavaScript with OpenCV.js

* Use onload of async script in js_usage tutorial

* add more info about mat.data

* Change Size to value_object

* Integrate Moh and Sajjad's editing into introduction page

* Change Point to value_object

* Change Rect to value_object with helper object

* Add helper objects for Point and Size

* Change RotatedRect to value_object with helpers

* Change MinMaxLoc and Circle to value_object

* Change TermCriteria to value_object

* Fix core_bindings.cpp for MinMaxLoc and Circle

* Remove unused types

* Change meanShift and CamShift to return Rect

* Change methods of RotatedRect to static

* Change mat.data from methods to property

Fix #75 and #77

* support img id and element in cv.imread

* Change mat.size to property and add mat.step

Fix #163

* Add matFromArray and matFromImageData as JS helpers

Fix #79, #78

* Lower camel case for Mat element getters

Fix #81

* Mat.getRoiRect and tests

Fix #86

* Support type for Mat.ptr

Fix #83

* Name changing of Mat element getters

'getUcharAt` -> 'ucharAt'

* fix code style and args names

* Fix helpers.js due to cv.Mat API update

* Fix opencv.js usage tutorial

* Fix a typo of js_setup

* Change Moments to value_object

* Add Range as value_object

Fix #171

* Support Mat.diag and Mat.isContinous

Fix #84 and #89

* Support Mat.setTo

Fix #88

* Apply edits to js_intro

* Apply edits to js_usage

* Apply edits to js_setup

* update tutorials to apply data type change

* Modify tutorials

* add core tutorials

* delete MatVector elements and delete useless set operation

* add tutorials_objdec_camera

* Add instructions for WebAssembly

* apply tech writer's feedbacks into tutorials

* Organize white list by modules

* Change size to method and bind to MatExpr.size()

Fix #177

* improve tutorials

* Modify core tutorials

* add params list and explanations for OpenCV.js functions

* remove face_profile from Face Detection in Video Capture

* Add demos link

* Change Gui to GUI

* Update js_intro based on Moh and Sajjad's edits

* Fixup for 3.3.0 rebase

* Update js_intro per Moh's suggestion

* Update contributors list per Moh's idea

* add adapter.js in video_display tutorial

* Change Mat.getRoiRect to Mat.roi

Fix #194

* Remove unnecessary files for test

Fix #192

* Licenses updated to UC BSD 3-Clause

* Apply OpenCV coding style for C++ files

* Add OpenCV license for python and js files

* Fix coding style issue in helpers.js

* Remove unused test_commons.js

* Fix coding style of test_imgproc.js

* Fix coding style of test_mat.js

* Fix space before semicolon

* Fix coding style of test_objdetect.js

* Fix coding style of tests.js

* Fix coding style of test_utils.js

* Fix coding style of test_video.js

* Fix failures of node.js tests

* Add eslint rule config and fix eslint errors

* Add eslint config for js/src and fix eslint errors

* Clean up the opencv.js dependencies

Fix #186

* Fix build issue for python generator

* Fix doxygen buildbot failure

* delete trailing whitespace, blank line at EOF and replace tab with space

* Fix tutorial_js_root reference issue for non opencv.js build

* replace the file with small size

* Initial commit of build_js.py

* Move the js build configurations to build script

* Add wasm build support

* Update OpenCV.js build tutorial by using script

* Fix global var issue in tests

* Add a README.md for build_js.py

* Copy the haar cascade files from data dir for tutorials

* Not use memory init file

* Disable debug print for modules/js/CMakeLists.txt

* Check files when build done

* Fix image name in js_gradients tutorial

* Fix image load issue in js_trackbar tutorial

* Find the opencv source directory via relative path by default

* Make the cmake args based on build_doc option

* Fix a typo in js_setup.markdown

* Fix make failure issue on config generated by build_js.py

* Eliminate js branch of hdr_parser.py

* Extract examples from js_basic_ops tutorial

* Fix coding style of utils.js

* Improve examples error handling

Handle:
1. opencv.js loading errors
2. script errors (Error)
3. cv::Exception

Fix #217

* Add enable_exception option into build_js.py

* Support print exception for exception catching disabled build

* Extract example from js_usage tutorial

* Avoid copying .eslintrc.json when building doc

Fix #223

* Revert to use onload as opencv.js ready event

* Use 4 spaces indention for js examples

* embed html in tutorials with iframe tag

* Revert to use onload as opencv.js ready event

* Extract examples from js_video_display tutorial

* Implement Utils object

* modify core imgprc and face_detection tutorials

* Fix examples of js_gui tutorials

* Fix coding style of utils.js

* Modify tutorials

* Extract example from js_face_detection_camera tutorial

* Disable new-cap check in eslint

* Extract examples from js_meanshift tutorial

* Extract examples from video tutorials

* Remove new-cap declaration and update grammer in comments

* Change textarea width to 100 to align with eslint config

* Fix printError issue when opencv.js loading fails

* Remove BUILD_opencv_js dependency for doc build

Fix #213

* Expose cv::getBuildInformation

* Dump opencv build info when opencv.js loaded for live examples

* Make the button to stand out in js live examples

Fix #235

* Style for disabled button

* Add js_imgproc_camera.html example

* Fix coding style of imgproc_camera example

* Add js_imgproc_camera tutorial

* Remove link to opencv.js demos

* doc: copy opencv.js on build, use absolute paths for assets

* doc: reuse existed file box.mp4

7 years agofixed build of OpenVX Harris
Rostislav Vasilikhin [Mon, 25 Sep 2017 12:58:09 +0000 (15:58 +0300)]
fixed build of OpenVX Harris

7 years agosoftfloat f64_sqrt bug fix
Rostislav Vasilikhin [Mon, 25 Sep 2017 12:52:56 +0000 (15:52 +0300)]
softfloat f64_sqrt bug fix

7 years agodnn(perf): update perf tests
Alexander Alekhin [Fri, 22 Sep 2017 12:15:57 +0000 (15:15 +0300)]
dnn(perf): update perf tests

7 years agoMerge pull request #9505 from cbalint13:cuda
Alexander Alekhin [Mon, 25 Sep 2017 11:05:41 +0000 (14:05 +0300)]
Merge pull request #9505 from cbalint13:cuda

Enable CUDA_NVCC_FLAGS at arch detect step.

7 years agoMerge pull request #9706 from alalek:imgcodecs_tiff_drop_legacy_code
Vadim Pisarevsky [Mon, 25 Sep 2017 10:18:37 +0000 (10:18 +0000)]
Merge pull request #9706 from alalek:imgcodecs_tiff_drop_legacy_code

7 years agoimgcodecs(tiff): drop legacy code
Alexander Alekhin [Sun, 24 Sep 2017 22:28:36 +0000 (22:28 +0000)]
imgcodecs(tiff): drop legacy code

Drop code under *undefined* HAVE_TIFF
(violates several policies, like a way to turn off tiff support)

7 years agoreplace raw SSE2/NEON implementation with universal intrinsic
Tomoaki Teshima [Fri, 22 Sep 2017 14:43:05 +0000 (23:43 +0900)]
replace raw SSE2/NEON implementation with universal intrinsic

7 years agoMerge pull request #9618 from vipinanand4:goodFeaturesToTrack_added_gradiantSize
vipinanand4 [Fri, 22 Sep 2017 14:04:43 +0000 (19:34 +0530)]
Merge pull request #9618 from vipinanand4:goodFeaturesToTrack_added_gradiantSize

Added gradiantSize param into goodFeaturesToTrack API (#9618)

* Added gradiantSize param into goodFeaturesToTrack API

Removed hardcode value 3 in goodFeaturesToTrack API, and
added new param 'gradinatSize' in this API so that user can
pass any gradiant size as 3, 5 or 7.

Signed-off-by: Vipin Anand <anand.vipin@gmail.com>
Signed-off-by: Nilaykumar Patel<nilay.nilpat@gmail.com>
Signed-off-by: Prashanth Voora <prashanthx85@gmail.com>
* fixed compilation error for java test

Signed-off-by: Vipin Anand <anand.vipin@gmail.com>
* Modifying code for previous binary compatibility and fixing other warnings

fixed ABI break issue

resolved merged conflict

compilation error fix

Signed-off-by: Vipin Anand <anand.vipin@gmail.com>
Signed-off-by: Patel, Nilaykumar K <nilay.nilpat@gmail.com>
7 years agoMerge pull request #9686 from sturkmen72:patch-1
Suleyman TURKMEN [Fri, 22 Sep 2017 14:02:12 +0000 (17:02 +0300)]
Merge pull request #9686 from sturkmen72:patch-1

Update planar_tracking.cpp (#9686)

7 years agoSet swapRB to false in Caffe tests and examples.
jrobble [Tue, 19 Sep 2017 06:07:33 +0000 (02:07 -0400)]
Set swapRB to false in Caffe tests and examples.

7 years agots: update perf test
Alexander Alekhin [Thu, 21 Sep 2017 15:50:54 +0000 (18:50 +0300)]
ts: update perf test

- use GTest tuple definitions instead of std::tr1
- use "const static" for cv::Size contants to reduce generated binary code
- PERF_TEST_P() violates TEST_P() original semantic. Added PERF_TEST_P_() macro

7 years agoMerge pull request #9147 from sovrasov:phase_corr_fix
Vadim Pisarevsky [Fri, 22 Sep 2017 10:32:14 +0000 (10:32 +0000)]
Merge pull request #9147 from sovrasov:phase_corr_fix

7 years agoRefactored Padding layer
Dmitry Kurtaev [Fri, 22 Sep 2017 09:12:03 +0000 (12:12 +0300)]
Refactored Padding layer

7 years agoAdded performance test for nearest neighbor resize
Vitaly Tuzov [Wed, 31 May 2017 15:44:35 +0000 (18:44 +0300)]
Added performance test for nearest neighbor resize

7 years agoMerge pull request #9649 from dkurt:dnn_reshape_transpose
Vadim Pisarevsky [Thu, 21 Sep 2017 19:25:58 +0000 (19:25 +0000)]
Merge pull request #9649 from dkurt:dnn_reshape_transpose

7 years agoMerge pull request #9678 from tomoaki0705:universalFastScore
Vadim Pisarevsky [Thu, 21 Sep 2017 19:12:30 +0000 (19:12 +0000)]
Merge pull request #9678 from tomoaki0705:universalFastScore

7 years agoMerge pull request #9681 from jodrescher:master
Alexander Alekhin [Thu, 21 Sep 2017 15:58:48 +0000 (15:58 +0000)]
Merge pull request #9681 from jodrescher:master

Update OpenCVDownload.cmake unpack option

7 years agoMerge pull request #9684 from RaymondKirk:patch-1
Alexander Alekhin [Thu, 21 Sep 2017 15:57:44 +0000 (15:57 +0000)]
Merge pull request #9684 from RaymondKirk:patch-1

Fix 'directory does not exist' in windows tutorial

7 years agoFix 'directory does not exist' in windows tutorial
Raymond Kirk [Thu, 21 Sep 2017 15:46:58 +0000 (16:46 +0100)]
Fix 'directory does not exist' in windows tutorial

7 years agoDisabling reset of 'weights' array for reject level mode of groupRectangles function.
Vitaly Tuzov [Thu, 21 Sep 2017 15:21:50 +0000 (18:21 +0300)]
Disabling reset of 'weights' array for reject level mode of groupRectangles function.

7 years agoRemove reorder_dims attribute of Reshape layer
Dmitry Kurtaev [Mon, 18 Sep 2017 10:04:43 +0000 (13:04 +0300)]
Remove reorder_dims attribute of Reshape layer

7 years agoUpdate OpenCVDownload.cmake unpack
jodrescher [Thu, 21 Sep 2017 12:00:43 +0000 (14:00 +0200)]
Update OpenCVDownload.cmake unpack

Added new "f" flag to the tar unpack, because without it doesn't complete, an compile fails

7 years agoBit-exact version of Luv2RGB_b (#9470)
Rostislav Vasilikhin [Thu, 21 Sep 2017 11:20:45 +0000 (14:20 +0300)]
Bit-exact version of Luv2RGB_b (#9470)

* lab_tetra squashed

* initial version is almost written

* unfinished work

* compilation fixed, to be debugged

* Lab test removed

* more fixes

* Luv2RGBinteger: channels order fixed

* Lab structs removed

* good trilinear interpolation added

* several fixes

* removed Luv2RGB interpolations, XYZ tables; 8-cell LUT added

* no_interpolate made 8-cell

* interpolations rewritten to 8-cell, minor fixes

* packed interpolation added for RGB2Luv

* tetra implemented

* removing unnecessary code

* LUT building merged

* changes ported to color.cpp

* minor fixes; try to suppress warnings

* fixed v range of Luv

* fixed incorrect src channel number

* minor fixes

* preliminary version of Luv2RGBinteger is done

* Luv2RGB_b is in progress

* XYZ color constants converted to softfloat

* Luv test: precision fixed

* Luv bit-exactness test added

* warnings fixed

* compilation fixed, error message fixed

* Luv check is limited to [0-2,0-2,0-2] by XYZ

* L->Y generation moved to LUT

* LUTs added for up and vp of Luv2RGB_b

* still works

* fixed-point is done, works at maxerr 2

* vectorized code is done, 2x slower than original

* perf improved by 10%

* extra comments removed

* code moved to color.cpp

* test_lab.cpp updated

* minor refactoring

* test added for Luv2RGB

* OCL Luv2RGB_b: XYZ are limited to [0, 2]; docs updated

* Luv2RGB_b rewritten to universal intrinsics

* test_lab.cpp moved to luv_tetra branch

7 years agoMerge pull request #9653 from dkurt:thresh_16u
Vadim Pisarevsky [Thu, 21 Sep 2017 10:57:46 +0000 (10:57 +0000)]
Merge pull request #9653 from dkurt:thresh_16u

7 years agoMerge pull request #9673 from dkurt:feature_dnn_tensorflow_defun
Vadim Pisarevsky [Thu, 21 Sep 2017 10:55:25 +0000 (10:55 +0000)]
Merge pull request #9673 from dkurt:feature_dnn_tensorflow_defun

7 years agoMerge pull request #9674 from alalek:cmake_cl2cpp_fix
Vadim Pisarevsky [Thu, 21 Sep 2017 10:54:39 +0000 (10:54 +0000)]
Merge pull request #9674 from alalek:cmake_cl2cpp_fix

7 years agouse universal intrinsic in FAST
Tomoaki Teshima [Thu, 21 Sep 2017 09:28:15 +0000 (18:28 +0900)]
use universal intrinsic in FAST

7 years agoMerge pull request #9669 from kraj:master
Alexander Alekhin [Wed, 20 Sep 2017 19:06:49 +0000 (19:06 +0000)]
Merge pull request #9669 from kraj:master

7 years agocmake: fix build process of OpenCL kernels
Alexander Alekhin [Wed, 20 Sep 2017 15:06:15 +0000 (18:06 +0300)]
cmake: fix build process of OpenCL kernels

7 years agoMerge pull request #9647 from alalek:cmake_ipp_absolute_path
Alexander Alekhin [Wed, 20 Sep 2017 12:56:33 +0000 (12:56 +0000)]
Merge pull request #9647 from alalek:cmake_ipp_absolute_path

7 years agoMerge pull request #8820 from woodychow:multithread_sift_findScaleSpaceExtrema
Vadim Pisarevsky [Wed, 20 Sep 2017 12:03:24 +0000 (12:03 +0000)]
Merge pull request #8820 from woodychow:multithread_sift_findScaleSpaceExtrema

7 years agoMerge pull request #9668 from Erotemic:msvc_version_warning
Alexander Alekhin [Wed, 20 Sep 2017 11:35:25 +0000 (11:35 +0000)]
Merge pull request #9668 from Erotemic:msvc_version_warning

7 years agoImport wrapped Dropout subgraphs from TensorFlow
Dmitry Kurtaev [Wed, 20 Sep 2017 10:30:25 +0000 (13:30 +0300)]
Import wrapped Dropout subgraphs from TensorFlow

7 years agoDo not enable asm with clang
Khem Raj [Wed, 20 Sep 2017 01:07:35 +0000 (18:07 -0700)]
Do not enable asm with clang

clang pretends to be gcc 4.2.0 which means we will
use inline asm for no reason, instead of builtins
on clang when possible.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 years agoAdded warning when MSVC_VERSION is not recognized
joncrall [Tue, 19 Sep 2017 22:00:25 +0000 (18:00 -0400)]
Added warning when MSVC_VERSION is not recognized

7 years agoocl: fix build
Alexander Alekhin [Mon, 11 Sep 2017 06:10:19 +0000 (06:10 +0000)]
ocl: fix build

7 years agoocl: Kernel::runProfiling()
Alexander Alekhin [Fri, 8 Sep 2017 16:42:59 +0000 (19:42 +0300)]
ocl: Kernel::runProfiling()

7 years agoocl: profiling queue
Alexander Alekhin [Fri, 8 Sep 2017 15:57:26 +0000 (18:57 +0300)]
ocl: profiling queue

7 years agoMerge pull request #9664 from tomoaki0705:fixBuildVS2013
Alexander Alekhin [Tue, 19 Sep 2017 12:25:18 +0000 (12:25 +0000)]
Merge pull request #9664 from tomoaki0705:fixBuildVS2013

7 years agoMerge pull request #9656 from bblanchon:RelWithDebInfo
Alexander Alekhin [Tue, 19 Sep 2017 11:12:58 +0000 (11:12 +0000)]
Merge pull request #9656 from bblanchon:RelWithDebInfo

7 years agoUsing environment variable to store capture options (#9292)
Adam Rankin [Tue, 19 Sep 2017 10:29:43 +0000 (06:29 -0400)]
Using environment variable to store capture options (#9292)

* Using environment variable to store options parsed by av_dict_parse_string(ENV{OPENCV_FFMPEG_CAPTURE_OPTIONS}, ";", "|")

* Adding missing mandatory flags parameter

* Guarding against missing function via LIBAVUTIL version

* Code review fixes

Copy/paste error due to coder mistake reverted
Proper version checking for LIBAVUTIL_BUILD

7 years agoMerge pull request #9657 from alalek:ocl_global_size_adjustment
Vadim Pisarevsky [Tue, 19 Sep 2017 10:19:45 +0000 (10:19 +0000)]
Merge pull request #9657 from alalek:ocl_global_size_adjustment

7 years agoMerge pull request #9654 from savuor:seamlessclone
Vadim Pisarevsky [Tue, 19 Sep 2017 10:16:37 +0000 (10:16 +0000)]
Merge pull request #9654 from savuor:seamlessclone

7 years agofix build on Visual Studio 2013 and earlier
Tomoaki Teshima [Tue, 19 Sep 2017 10:08:23 +0000 (19:08 +0900)]
fix build on Visual Studio 2013 and earlier

7 years agoocl: update kernel global size adjustment
Alexander Alekhin [Mon, 18 Sep 2017 16:04:46 +0000 (19:04 +0300)]
ocl: update kernel global size adjustment

Prevents 10000x1 => 10000x8 transformation after getContinuousSize() call

7 years agocmake: map RelWithDebInfo and MinSizeRel configuration to Release
Benoit Blanchon [Mon, 18 Sep 2017 15:47:49 +0000 (17:47 +0200)]
cmake: map RelWithDebInfo and MinSizeRel configuration to Release

7 years agoUpdate 16UC thresholding
Dmitry Kurtaev [Mon, 18 Sep 2017 12:42:44 +0000 (15:42 +0300)]
Update 16UC thresholding

7 years agoAdded support for thresholding CV_16U images.
Arvid Piehl Lauritsen Böttiger [Mon, 18 Sep 2017 12:33:14 +0000 (15:33 +0300)]
Added support for thresholding CV_16U images.

7 years agoMerge pull request #9624 from nilaykumarpatel:Feature2d_getDefaultName
Vadim Pisarevsky [Mon, 18 Sep 2017 10:34:35 +0000 (10:34 +0000)]
Merge pull request #9624 from nilaykumarpatel:Feature2d_getDefaultName

7 years agoMerge pull request #9444 from hrnr:akaze_tutorial
Vadim Pisarevsky [Mon, 18 Sep 2017 10:27:07 +0000 (10:27 +0000)]
Merge pull request #9444 from hrnr:akaze_tutorial

7 years agoMerge pull request #9305 from dkurt:public_dnn_importer_is_deprecated
Vadim Pisarevsky [Mon, 18 Sep 2017 09:35:35 +0000 (09:35 +0000)]
Merge pull request #9305 from dkurt:public_dnn_importer_is_deprecated

7 years agoMerge pull request #9310 from r2d3:svm_parallel
Vadim Pisarevsky [Mon, 18 Sep 2017 09:32:41 +0000 (09:32 +0000)]
Merge pull request #9310 from r2d3:svm_parallel

7 years agoMerge pull request #9517 from dkurt:tf_mobilenet
Vadim Pisarevsky [Mon, 18 Sep 2017 09:31:19 +0000 (09:31 +0000)]
Merge pull request #9517 from dkurt:tf_mobilenet

7 years agoMerge pull request #9551 from ChristofKaufmann:MultiChannelMask
Vadim Pisarevsky [Mon, 18 Sep 2017 09:28:34 +0000 (09:28 +0000)]
Merge pull request #9551 from ChristofKaufmann:MultiChannelMask