Pavel Vlasov
e02195b3dc
Accidentally removed tegra checks were returned;
2015-06-24 14:55:45 +03:00
Pavel Vlasov
e57609836c
Warning fix;
2015-06-24 14:43:42 +03:00
Pavel Vlasov
101607a7d0
Imgproc_Hist_MinMaxVal.accuracy fix;
...
Some code style corrections;
2015-06-24 13:50:17 +03:00
Dmitry Budnikov
a5a21019b2
ipp_countNonZero build fix;
...
Removed IPP port for tiny arithm.cpp functions
Additional warnings fix on various platforms.
Build without OPENCL and GCC warnings fixed
Fixed warnings, trailing spaces and removed unused secure_cpy.
IPP code refactored.
IPP code path implemented as separate static functions to simplify future work with IPP code and make it more readable.
2015-06-18 12:47:07 +03:00
Zhigang Gong
3c85200989
Avoid negative index for a local buffer in Canny.cl.
...
int pix_per_thr = l_counter / LOCAL_TOTAL + ((lid < mod) ? 1 : 0);
The pix_per_thr * LOCAL_TOTAL may be larger than l_counter.
Thus the index of l_stack may be negative which may cause serious
problems. Let's skip the loop when we get negative index and we need
to add back the lcounter to keep its balance and avoid potential
negative counter.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
2015-05-26 08:48:05 +08:00
Vadim Pisarevsky
02eb8e7c70
Merge pull request #4052 from ilya-lavrenov:typo
2015-05-25 13:07:34 +00:00
Ilya Lavrenov
13cd052990
typo
2015-05-25 11:21:02 +03:00
Andreas Stührk
3ec0e0943c
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
...
Conflicts:
modules/highgui/src/grfmt_tiff.cpp
floodfill return value removed
2015-05-24 14:06:33 +02:00
Ilya Lavrenov
efa2baed83
TCP instead of UDP
...
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
2015-05-24 14:06:30 +02:00
Andreas Stührk
c9481b0fd7
Don't allocate lots of memory when reading TIFFs with infinite rows per strip.
...
Some TIFF images consist of only one strip. The magic value 2**32-1 for the
"rows per strip" tag reflects that fact, effectively meaning "infinite".
Conflicts:
modules/highgui/src/grfmt_tiff.cpp
modules/highgui/test/test_grfmt.cpp
fix whitespace
fix compile error
2015-05-24 14:06:20 +02:00
Niklas Frisk
8138e26163
Fixes #3910 , flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.
...
Conflicts:
modules/features2d/src/draw.cpp
2015-05-24 13:31:11 +02:00
Alexander Smorkalov
a04a0514b9
Turn off superres accuracy tests if video i/o is not supported.
2015-05-24 13:31:09 +02:00
Alexander Smorkalov
a9ae0c8e82
Test fisheye.rectify disabled for Tegra.
2015-05-24 13:31:08 +02:00
jormansa
3c2e12a744
bug fixed
...
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
2015-05-24 13:31:07 +02:00
StevenPuttemans
cb55d60f98
fixing GT and GE comparison symbol
...
Conflicts:
modules/gpu/doc/per_element_operations.rst
2015-05-24 13:31:06 +02:00
Alexander Smorkalov
6e1a595342
GCC 4.8 warning array subscript is above array bounds fixed.
...
tiff test fixed
2015-05-24 13:31:01 +02:00
Martijn Liem
7e6947a940
Bugfix for bug #3767
...
Fixed a memory leak in cap_dshow.cpp in videoInput::setVideoSettingCamera(). The leak was caused by not releasing an IBaseFilter object created in a call to getDevice(). Tho object is now properly released.
Conflicts:
modules/highgui/src/cap_dshow.cpp
2015-05-24 11:55:46 +02:00
Ruslan Baratov
9c8255feeb
Doc: fix definition of macro CV_MAKETYPE
...
At least this is how it's defined in core/types_c.h
Conflicts:
modules/core/doc/intro.rst
2015-05-23 19:09:34 +02:00
Leonid Beynenson
4f95e6c70b
Fixed bug in cv::detail::waveCorrect
...
The function makes wave correction of a stitched panorama.
Earlier it gave wrong results for panorama made from 1 frame.
2015-05-23 19:09:33 +02:00
Camille
55a5e6be2c
bug fix 3696
2015-05-23 19:09:31 +02:00
Mike Maraya
607d3b54ce
Fixes resizeWindow() on OS X (Bug #3200 )
2015-05-23 17:36:46 +02:00
Dikay900
7ca0557b40
typos in comments
2015-05-23 17:36:45 +02:00
Aleksandr Petrikov
25b4cface0
add NEON realization for StereoBM(findCorrespondence, prefilterXSobel)
...
Conflicts:
modules/calib3d/src/stereobm.cpp
Add CV_Assert (ndisp % 8 == 0) to NEON version
2015-05-23 17:36:44 +02:00
Ehren Metcalfe
e9bc9c47c2
Fix resource leak with iOS camera due to failure to remove AVCaptureSession input/outputs on stop (Bug #3389 )
...
Conflicts:
modules/highgui/src/cap_ios_abstract_camera.mm
2015-05-23 17:36:42 +02:00
aletheios
6a50a51b4e
Bugfix #3705 : params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2
2015-05-23 17:36:41 +02:00
Jüri Aedla
22c0238bf1
Android camera qcom HAL doesn't like it when no consumer usage bits are set. Set a usage bit for preview BufferQueue.
2015-05-23 17:36:39 +02:00
Alexander Smorkalov
acbc7362db
Bug #3611 Initializing static cv::Mat with cv::Mat::zeros causes segmentation fault fixed.
...
fix MatOpInitializer
2015-05-23 17:36:35 +02:00
Vadim Pisarevsky
a1a35ca5f7
Merge pull request #4010 from cr333:triangulation_fix_master
2015-05-23 10:17:39 +00:00
Vadim Pisarevsky
f5be8f6c77
Merge pull request #4047 from MSOpenTech:videoio-refactor-contrib
2015-05-23 09:02:11 +00:00
Vadim Pisarevsky
f32f0486e2
trying to eliminate warnings in Android build
2015-05-22 16:53:34 +03:00
Vadim Pisarevsky
d2aaa70e93
removed HAL calls from public OpenCV headers; put IPP calls back to hall:sqrt() and such (but they are disabled for now)
2015-05-22 16:04:10 +03:00
Maxim Kostin
4418ee6c77
Refactored internal helpers. Simplified structure. Updated comments. Updates #41
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-22 15:41:50 +03:00
Vadim Pisarevsky
ef8182e12a
Merge pull request #4025 from vpisarev:features2d_fixes
2015-05-21 19:16:27 +00:00
Vadim Pisarevsky
af47b6551f
another attempt to make the MSER test pass. removed possible randomization in parameters from run to run
2015-05-21 17:10:35 +03:00
Vadim Pisarevsky
4c67ae1a0b
fixed failure in Features2d_MSER.cases
2015-05-21 16:27:34 +03:00
Vadim Pisarevsky
021473e93e
Merge pull request #4040 from dobrypd:libgphoto2-connection
2015-05-21 13:19:22 +00:00
Vadim Pisarevsky
dab78c26b1
added reasonable test for MSER (including coverage for http://code.opencv.org/issues/4273 , http://code.opencv.org/issues/1723 and http://code.opencv.org/issues/756 ); also, added some "in-progress" info to the Features2d_Feature2d.no_crash test.
2015-05-21 15:03:17 +03:00
Vadim Pisarevsky
fede94e979
it's now true MSER algorithm that works well on binary images too
2015-05-21 05:44:14 +03:00
Piotr Dobrowolski
6d0407b65e
VideoCapture with digital camera and gPhoto2 library
2015-05-21 00:41:39 +02:00
Andrey Pavlenko
ab8afc3bcc
Revert of "Merge pull request #4006 from sgjava:opencv-steve" (reverted from commit 4743184078
)
2015-05-19 18:55:57 +03:00
Andrey Pavlenko
d67d32af48
Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit 52fa55a770
)
2015-05-19 13:30:18 +03:00
Vadim Pisarevsky
b5a7122855
added test to do smoke testing of ORB, KAZE, AKAZE and BRISK on images of different size
2015-05-18 21:16:53 +03:00
Vadim Pisarevsky
fc06a2384b
added test for batch detection/descriptor extraction ( http://code.opencv.org/issues/3943 )
2015-05-18 19:01:00 +03:00
Vadim Pisarevsky
432cf1152a
added read/write functions for vector<DMatch> + the test ( http://code.opencv.org/issues/4308 )
2015-05-18 18:59:37 +03:00
Vadim Pisarevsky
3136010e1a
Merge pull request #4023 from Dikay900:cleanup_cascadedetect
2015-05-18 14:08:22 +00:00
Vladislav Vinogradov
e22979f334
fix #4343 : cv::cuda::findMinMaxLoc incorrect output for single row matrix
2015-05-18 14:16:55 +03:00
Dikay900
a5242265d7
cleanup after last PR
2015-05-18 00:31:39 +02:00
Vadim Pisarevsky
8b791477df
Merge pull request #3971 from Dikay900:2_4_to_master_3
2015-05-17 00:28:30 +00:00
Vadim Pisarevsky
e0136e39f4
Merge pull request #4011 from cr333:parula
2015-05-16 19:11:32 +00:00
Vadim Pisarevsky
eb41a574b7
Merge pull request #4005 from MSOpenTech:videoio-contrib
2015-05-16 18:08:28 +00:00