mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-25 10:08:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,188 Commits 6 Branches 127 Tags 3 GiB
df38624e10
Commit Graph

24188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Alekhin
73316e10a0 java(test): fix test names 2018-01-12 19:14:00 +00:00
Alexander Alekhin
69cd9cc1a6 Merge pull request #10582 from mshabunin:fix-ocl-concurrent-cache-name 2018-01-12 18:43:08 +00:00
Maksim Shabunin
594a93316c Fixed concurrent OpenCL cache folder name generation 2018-01-12 19:03:16 +03:00
SarenT
c6d9ce8fd3 Merge pull request #10489 from SarenT:offset-mat_put 
Adding capability to parse subsections of a byte array in Java bindings (#10489)

* Adding capability to parse subsections of a byte array in Java bindings. (Because Java lacks pointers. Therefore, reading images within a subsection of a byte array is impossible by Java's nature and limitations. Because of this, many IO functions in Java require additional parameters offset and length to define, which section of an array to be read.)

* Corrected according to the review. Previous interfaces were restored, instead internal interfaces were modified to provide subsampling of java byte arrays.

* Adding tests and test related files.

* Adding missing files for the test.

* Simplified the test

* Check was corrected according to discussion. An OutOfRangeException will be thrown instead of returning.

* java: update MatOfByte implementation checks / tests
 2018-01-12 18:00:58 +03:00
Alexander Alekhin
9deaddcdff Merge pull request #10490 from alalek:cmake_android_refactor_copy_project_files 2018-01-12 12:23:37 +00:00
Alexander Alekhin
98b6e1d5fe Merge pull request #10515 from alalek:android_ndk16 2018-01-12 12:22:40 +00:00
Alexander Alekhin
57dc28fe99 Merge pull request #10504 from opentrack:fork 2018-01-11 18:47:27 +00:00
Stanislaw Halik
c8794c89c7 modules/videoio: fix PS3Eye camera property window 
v2: fix stray trailing whitespace

v3: only allow for up to one property window at the time

Opening multiple windows in the same process will just confuse
the camera filter or outright crash.

Suggested-by: @alalek

Also return whether a dialog was opened at the time.
 2018-01-11 16:37:02 +01:00
Alexander Alekhin
18edd917e3 Merge pull request #10391 from ElenaGvozdeva:HAL_minMaxIdx 2018-01-11 14:15:40 +00:00
Philipp Hasper
6032d86e23 Added getFontScaleFromHeight() 2018-01-11 14:00:27 +01:00
Dmitry Kurtaev
64a9e92390 Merge pull request #10466 from dkurt:reduce_umat_try_2 
* UMat blobs are wrapped

* Replace getUMat and getMat at OpenCLBackendWrapper
 2018-01-10 21:50:54 +03:00
Alexander Alekhin
b6075e11b8 Merge pull request #10549 from Sahloul:bug_fix/FLANN 2018-01-10 11:39:47 +00:00
Alexander Alekhin
c19764e557 Merge pull request #10568 from alalek:fix_10565 2018-01-10 11:35:25 +00:00
Alexander Alekhin
71768de939 Merge pull request #10567 from terfendail:createsample_fix 2018-01-10 10:22:19 +00:00
Alexander Alekhin
f943261847 Merge pull request #10566 from alalek:jasper_checks 2018-01-10 10:15:41 +00:00
Alexander Alekhin
7763b58a60 Merge pull request #10563 from alalek:issue_10540 2018-01-10 10:15:10 +00:00
Aaron Bray
6f8be3f693 Merge pull request #10497 from aaron-bray:msvc2017-findcuda 
* Update to properly find the compiler tools for MSVC 2017

* FindCUDA: Fix the MSVC 2017 compiler tool locations
 2018-01-10 12:32:34 +03:00
Alexander Alekhin
6113dc1b99 core: fix unresolved symbols from utils::fs 2018-01-09 19:29:50 +00:00
Alexander Alekhin
4d4f291553 Merge pull request #10513 from pengli:dnn 2018-01-09 19:24:28 +00:00
Vitaly Tuzov
29faf164b9 Fixed exception when ROI for generated sample is evaluated out of image borders 2018-01-09 20:30:39 +03:00
Alexander Alekhin
435a3e337b imgcodecs: add more Jasper checks for supported and tested cases 2018-01-09 19:06:03 +03:00
Alexander Alekhin
f92e880d3d Merge pull request #10544 from alalek:issue_10535 2018-01-09 15:32:42 +00:00
Alexander Alekhin
8a76fadaa3 imgcodecs: add overflow checks 2018-01-09 18:05:24 +03:00
Alexander Alekhin
be5247921d imgcodecs: remove assert() usage 2018-01-09 17:49:38 +03:00
Li Peng
e3b42bf93b batch_norm and blank layer ocl implementation 
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-01-09 21:58:46 +08:00
tobycollins
f34a0a874a Merge pull request #10522 from tobycollins:issue10519 2018-01-09 15:54:36 +03:00
Alessandro de Oliveira Faria (A.K.A.CABELO)
c71dc78cd4 Merge pull request #10502 from cabelo/save-dnn-yolo 
Save video file (#10502)
 2018-01-08 22:30:28 +03:00
Alexander Alekhin
f3dde79ed6 cmake: allow BUILD_FAT_JAVA_LIB for non-Android targets too 2018-01-08 19:24:39 +00:00
Alexander Alekhin
da0904df2d Merge pull request #10550 from dkurt:replace_psroi_pooling_tag 2018-01-08 19:19:00 +00:00
Alexander Alekhin
c08a0edea1 Merge pull request #10545 from alalek:dnn_blob_manager_runtime_option 2018-01-08 13:22:44 +00:00
Dmitry Kurtaev
27b55ea761 Replace Caffe's psroi_pooling_param tag from 10001 to 10002 2018-01-08 13:29:20 +03:00
Hamdi Sahloul
8943441115 resolves #10548 - FLANN::knnSearch garbage bug (when kNN is larger than the dataset size) 2018-01-08 18:58:55 +09:00
Alexander Alekhin
6674a024fc dnn: add OPENCV_DNN_DISABLE_MEMORY_OPTIMIZATIONS runtime option 
replaces REUSE_DNN_MEMORY compile-time option
 2018-01-07 18:38:14 +00:00
Alexander Alekhin
ee35263e48 Merge pull request #10537 from pnemonic78:master_false 2018-01-07 12:53:22 +00:00
Moshe
84596bff09 Bitwise "and false" 
Bitwise "and false" is always false.
 2018-01-07 10:12:53 +02:00
Alexander Alekhin
e3a6d74945 Merge pull request #10536 from Sahloul:bug_fix/BLOB 2018-01-07 06:50:49 +00:00
Alexander Alekhin
dd3c1d3b8c Merge pull request #10534 from ericrwx:videoio-psnr-typo-fix 2018-01-07 06:48:05 +00:00
Alexander Alekhin
3a5cd12dee Merge pull request #10527 from csukuangfj:local 2018-01-07 06:46:45 +00:00
Hamdi Sahloul
2d2499f610 BLOB - Support RGBA 2018-01-07 14:30:40 +09:00
Eric Wang
c11895f529 Fix typo in video_input_psnr_ssim 2018-01-06 16:15:43 -08:00
LaurentBerger
004a1cd64a Merge pull request #10529 from LaurentBerger:ExampleGoogleNet 
* Add a parameter labels to command line

* default value

* samples: caffe_googlenet.cpp minor refactoring
 2018-01-06 23:44:47 +03:00
Alexander Alekhin
d0b2e60edc Merge pull request #10514 from alalek:build_warnings 2018-01-05 20:54:01 +00:00
Alexander Alekhin
8e1f31f543
Merge pull request #10521 from DabatoIsCool:master 2018-01-05 23:56:07 +03:00
Fangjun Kuang
a2869109f0 Improve the documentation for cv::Affine3. 2018-01-05 19:35:38 +01:00
Alexander Alekhin
431b3b4323 cmake(android): refactor copying of Android samples project files 2018-01-05 17:32:27 +00:00
Alexander Alekhin
9966903ae1 cmake(android): fix non-idempotent INSTALL scripts 2018-01-05 17:19:37 +00:00
Arthur Williams
8a67858068 Fixed missing #include "../precomp.hpp" 2018-01-05 15:10:39 +00:00
Alexander Alekhin
f5862dacb6 Merge pull request #10432 from GlueCrow:bgfg_knn_fix 2018-01-05 14:16:17 +00:00
Li Peng
67f9406cbe add normalize_bbox layer ocl implementation 
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-01-05 19:38:36 +08:00
Li Peng
f99a135eda add eltwise layer ocl implementation 
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-01-05 19:38:30 +08:00