Commit Graph

23742 Commits

Author SHA1 Message Date
Alexander Alekhin
176fe6e50e Merge pull request #11095 from jmartens:patch-2 2018-03-19 14:33:34 +00:00
Alexander Alekhin
6c051a55e5 cmake: don't add include <module>/src directory to avoid conflicts
during opencv_world builds
2018-03-19 11:14:15 +03:00
Namgoo Lee
90e1e41f5a test_buffer_pool: synchronize after async copy 2018-03-19 09:30:06 +09:00
Aleksandr Tischenko
22ecdd16ef Merge pull request #11101 from lamantine:fix_11100
* fixed bug #11100 Integer overflow in kmeans

* fixed integer overflow in other divUp-s in kmeans code
fixed warning about size_t to double conversion
2018-03-18 15:11:42 +03:00
Alexander Alekhin
2dac35a97d Merge pull request #11091 from berak:openpose_sample 2018-03-18 09:18:40 +00:00
Dmitry Kurtaev
069f9add80 Fix an issue https://github.com/opencv/opencv/issues/11102 2018-03-18 10:49:12 +03:00
Alexander Alekhin
74c2f8cecf Merge pull request #11046 from catree:update_calibration_images 2018-03-16 19:33:48 +00:00
Alexander Alekhin
70b6c1f29e Merge pull request #11069 from berak:fix_samples_beta 2018-03-16 19:30:20 +00:00
Alexander Alekhin
b6d3657f82 Merge pull request #11078 from atinfinity:pullreq/180315-fixed-openpose-sample 2018-03-16 19:29:57 +00:00
Jonathan Martens
1949412979
Update URL to Timing and Profiling in IPython
Apparently the blog has been updated and the URL has changed, it is still there though.
2018-03-16 19:37:08 +01:00
berak
4f597f6c06 dnn: add an openpose.cpp sample 2018-03-16 19:36:45 +01:00
Alexander Alekhin
47dea29e4e Merge pull request #11081 from alalek:cmake_fix_android_examples_dependencies 2018-03-16 16:32:49 +00:00
yuki takehara
41f8e788b2 Merge pull request #11083 from take1014:lsd_#9363
* Fix #9363

* Renamed the structure and added a new function to the LineSegmentDetectorImpl class as a static member

* Added a new function to the LineSegmentDetectorImpl class as a static member
2018-03-16 19:31:55 +03:00
Vitaly Tuzov
7afaaef0eb Allow CV_32FC3 objPoints in cv::fisheye::stereoCalibrate 2018-03-16 13:05:40 +03:00
Alexander Alekhin
dd259503c1 Merge pull request #11073 from geordi:qt-window-pixel-values 2018-03-15 14:35:29 +00:00
catree
5a79b90ade Update chessboard pattern image to remove squares overlap. Update also asymmetric pattern image. 2018-03-15 13:22:56 +01:00
berak
182b52d23d fix some samples colliding with std::beta
also add comments explaining the change
2018-03-15 12:40:49 +01:00
Alexander Alekhin
85db11b70d Merge pull request #11080 from sonnyky:fix/cmake-for-openni 2018-03-15 11:18:31 +00:00
Alexander Alekhin
1e808a495d cmake: fix android examples dependencies
add_dependencies(${target}) doesn't control regeneration of .apk file,
because "${target}" is dummy target.
2018-03-15 14:17:02 +03:00
Rostislav Vasilikhin
64916d3d83 Merge pull request #10869 from savuor:color_cpp_split
color.cpp split (#10869)

* initial split is done

* files renamed (these names are excluded during compilation)

* IPP code moved to corresponding files

* splineBuild, splineInterpolate -> color_lab.cpp

* Lab, Luv: little refactored

* it compiles (didn't check work); Lab OCL code moved to color_lab.cpp

* cvtcolor.cl: Lab/Luv part moved to color_lab.cl

* cvtcolor.cl: color_rgb.cl extracted

* cvtcolor.cl: color_yuv.cl separated

* cvtcolor.cl: color_hsv.cl extracted

* cvtcolor.cl: extracted to color_lab.cl and color_rgb.cl

* helper functions moved to hpp file

* Lab, Luv: moved to color_lab.cpp

* CPU XYZ: to color_lab.cpp

* OCL XYZ: to color_lab.cpp

* warning fixed

* CvtHelper added

* CPU YUV: to color_yuv.cpp, helpers to color.hpp

* CPU HLS/HSV: to color_hsv.cpp

* CPU BGR2BGR: to color_rgb.cpp

* CPU RGB: to color_rgb.cpp

* extra arg removed

* CPU YUV: to color_yuv.cpp

* color code decoded

* OclHelper added, some funcs rewritten

* color_lab.cpp: refactored to use OclHelper

* OCL RGB: to color_rgb.cpp

* OCL HLS/HSV: to color_hsv.cpp

* OCL YUV: to color_yuv.cpp

* OCL YUV planes: to color_yuv.cpp

* OCL: color code reduced

* licence to demosaicing.cpp

* IPP func tables to color_rgb.cpp

* code cleanup

* HAVE_OPENCL ifdefs added

* helpers made more common

* fixed two plane YUV with separate mats

* fixed warning in gcc7.2.0

* precomp header fixed

* color space classification functions fixed

* helpers fixed

* rename: isSRGB -> is_sRGB
2018-03-15 14:10:40 +03:00
Alexander Alekhin
c727e8a4d0 Merge pull request #11075 from iluxave:master 2018-03-15 09:58:04 +00:00
Sonny Kurniawan
c11eaeec49 Help Cmake find OpenNI2 include path
When compiling with OpenNI2 flag active, CMake will not be able to find OpenNI.h due to the environment path not set in OpenCVFindOpenNI2.cmake. This PR rectifies this issue.
2018-03-15 18:39:07 +09:00
atinfinity
8a8523d4f3 fixed samples/dnn/openpose.py 2018-03-15 05:17:57 +09:00
Ilya A. Volynets-Evenbakh
9749afb116 Fix crash on exit in opencv_annotation
destroyWindow was called twice during completion of the
annotation procedure, resulting in a crash, and failure to write
an output file
2018-03-14 09:40:45 -07:00
Alexander Alekhin
d68466bb6a Merge pull request #10940 from dkurt:dnn_tf_graph_optim 2018-03-14 14:36:25 +00:00
Alexander Alekhin
ab110c0ad1 Merge pull request #10979 from dkurt:unite_dnn_samples 2018-03-14 14:33:49 +00:00
Alexander Alekhin
8781ee971c core: write log messages via __android_log_print (logcat) too 2018-03-14 17:24:29 +03:00
Alexander Alekhin
cc06935a10 Merge pull request #11065 from vasiliev-vb:BUGFIX_KAZE_orientation 2018-03-14 14:15:47 +00:00
miqlas
f3a9f13cb4 Merge pull request #10984 from extrowerk:advanced_haiku_patches
* Haiku supporting patches

* Revert uneeded changes

* Whitespace cleanup
2018-03-14 17:09:10 +03:00
Jan Gaura
eb3969e244 Better text contrast of pixel brightness values in Qt window
This offsets text brightness of pixel brightness values
by offsetting it by 127 to the curent pixel value.
The text is now readable even if pixels are black.
2018-03-14 13:27:11 +01:00
Alexander Alekhin
ee1ac1140d core: use explicit for cv::AutoBuffer
To avoid compilation of this code:
- buf = 0;

This code can be received after refactoring of 1D cv::Mat to cv::AutoBuffer.
- "cv_mat = 0" calls setTo().
- cv::AutoBuffer calls "allocate(0)" - this is wrong.
2018-03-14 14:17:52 +03:00
vasiliev-vb
94c8e59bbe
Fixed bug in KAZE features orientation.
Bug was added in f6ceeaa commit, different angle computation functions have different parameter order.
2018-03-13 15:09:36 +00:00
Alexander Alekhin
7e9578789b Merge pull request #11057 from tomoaki0705:fixClangComplexCalib3d 2018-03-13 13:43:21 +00:00
Ben John
2f0060e399 Merge pull request #10923 from Preventis:patch-ios
Fixed dynamic build script for iOS (#10923)

* Readded UIDeviceFamily (was removed in beec247)

* Added correct bitcode flag to python build script for iOS

* Missed the bitcodedisabled check

* Corrected the syntax in my proposed changes
2018-03-13 16:09:26 +03:00
Tomoaki Teshima
7fd53f6ca2 avoid clang weird behavior in calib3d
* add ifdef to apply on specific situation
2018-03-13 21:51:20 +09:00
Dmitry Kurtaev
538fd42363 Add test for Scalar arguments at CommandLineParser 2018-03-13 11:01:07 +03:00
yuki takehara
0792ef8789 Merge pull request #11049 from take1014:#10948
* Fix #10948

* Add test code

* Fixed build error

* Add value zero

* eigen: test cleanup
2018-03-12 21:49:10 +03:00
shimat
5bf7f09ac1 Merge pull request #11035 from shimat:refactoring_decolor
Refactor decolor (#11035)

* decolor: modernize deprecated headers (math.h -> cmath)

* refactor contrast_preserve.cpp

* refactor contrast_preserve.hpp (add static/const)

* refactor contrast_preserve.hpp (join assignment and declaration)

* refactor contrast_preserve.hpp (format)

* refactor test_decolor.cpp (indent)

* refactor contrast_preserve.hpp (const)

* contrast_preserve.hpp : optimize by minMaxLoc

* fix trailing-whitespace

* fix warning C4267 on VC++ x64
(conversion from 'size_t' to 'int', possible loss of data)

* use cvRound instead of round_num

* decrease indentation of test_decolor.cpp

* remove pow() to optimize

* remove redundant Mat initialization
2018-03-12 17:22:06 +03:00
Alexander Alekhin
2244f1722c Merge pull request #11052 from adamrankin:patch-1 2018-03-12 14:06:35 +00:00
Dmitry Kurtaev
ab20d2a3fc Update assertions in batch norm layer 2018-03-12 10:53:06 +03:00
Dmitry Kurtaev
69a8f110b6 Fuse subgraphs from Keras 2018-03-12 10:53:06 +03:00
Dmitry Kurtaev
9457bf10ab Fuse batch normalization and flatten TensorFlow subgraphs in runtime 2018-03-12 10:51:35 +03:00
Adam Rankin
d810c73396
Update precomp.hpp
Enabling build of visualization module when using VTK 9 (current HEAD of d5bbb9e99bbc6d11d2196c48bfd8f33508554551)
2018-03-11 22:28:18 -04:00
Alexander Alekhin
5b868ccd82 Merge pull request #10992 from dkurt:dnn_opencl_tests 2018-03-09 10:06:40 +00:00
Alexander Alekhin
687394fa07 Merge pull request #11030 from jchazalon:patch-1 2018-03-08 17:54:14 +00:00
Alexander Alekhin
5b6ee79cd6 Merge pull request #11033 from adamrankin:patch-1 2018-03-08 17:49:10 +00:00
Alexander Alekhin
8bb787cdf8 Merge pull request #11027 from tomoaki0705:fixImgprocPerfFailureVS2013 2018-03-08 14:28:14 +00:00
Dmitry Kurtaev
130546e1d9 Semantic segmentation sample. 2018-03-08 11:02:26 +03:00
Adam Rankin
f8061ba3c8
Enabling build of stitching when CUDA is available
Without proposed change, module throws build error regarding missing `opencv2/cudaimgproc.hpp`
2018-03-07 20:07:48 -05:00
jchazalon
bf5f7380cf
Update OpenCVDownload.cmake to fix log crash
This suppresses the interpretation of string literals by switching the ocv_download_log from a macro to a function.
This avoid crashes when the string to log contains escape characters.

More details about the problem this PR fixes are available at: https://github.com/opencv/opencv_contrib/issues/1131
2018-03-07 15:35:37 +01:00