Skip to content

Merge 3.4#15931

Merged
alalek merged 18 commits intoopencv:masterfrom
alalek:merge-3.4
Nov 18, 2019
Merged

Merge 3.4#15931
alalek merged 18 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Nov 17, 2019

#15425 from cancerberoSgx:nodejs
#15503 from cancerberoSgx:js-test-puppeteer
#15855 from alalek:issue_9863
#15883 from cbachhuber:refactor-opencl-information
#15891 from alalek:issue_15886
#15896 from alalek:build_gcc_9
#15900 from komakai:fix-osx-build
#15905 from alalek:issue_15904
#15911 from l-bat:fix_reducel2
#15917 from ChipKerchner:demosaicingToHal2

Previous "Merge 3.4": #15890

buildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
#build_image:Custom=javascript
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#buildworker:Custom=linux-2
#build_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
#build_image:Custom=fedora:28
#build_image:Custom=ubuntu-cuda:16.04
#build_image:Custom=ubuntu-clang:18.04
buildworker:Custom=linux-1
build_image:Custom=fedora:31
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
build_image:Custom Mac=openvino-2019r3.0
build_image:Custom Win=openvino-2019r3.0
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

alalek and others added 17 commits November 11, 2019 20:19
Implement GArik's comments

Remove unnecessary c_str()

Fix brace position
JS - adds a tutorial about running opencv.js in Node.js
Js test puppeteer

* run_puppeteer.js / tests

* js run test section

* rollback html

* whitespace

* js: update OpenCV.js tests infrastructure

* js: exclude puppeteer from default 'npm install'

* js: update notes

* js: more fixes in run_puppeteer

* fix build folder
* imgproc: fix bit-exact GaussianBlur() / sepFilter2D()

- avoid kernels with bad approximation
- GaussiabBlur - apply error-diffusion approximation for kernel (8-bit fraction)

* java(test): update features2d ref data

* test: update test_facedetect
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Nov 18, 2019

👍

@alalek alalek merged commit fc41c18 into opencv:master Nov 18, 2019
@alalek alalek mentioned this pull request Nov 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants