Andrey Pavlenko
72ec9c159e
releasing native memory of temp Mat objects in generated Java code
2015-05-26 13:58:54 +03:00
Andrey Pavlenko
5b00d9da49
releasing native memory in Java converters
2015-05-26 13:58:35 +03:00
Andrey Pavlenko
c1c03e16f4
releasing native memory of temp Mat objects in generated Java code
2015-05-26 13:50:56 +03:00
Andrey Pavlenko
6006790c18
releasing native memory in Java converters
2015-05-26 13:10:54 +03:00
Vadim Pisarevsky
bb2e40b999
for some reason Calib3d_Homography.fromImages on ARM gives much smaller number of inliers than on x86/x64. Need to investigate more carefully, but let's decrease the tolerance threshold for now
2015-05-26 12:43:18 +03:00
Vadim Pisarevsky
ca1d8c1737
fixed another compile warning from MSVC
2015-05-26 10:29:13 +03:00
rajithr
ff6881efbf
Fix for a potential data race condition
2015-05-26 11:31:31 +05:30
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
e944533f01
fixed compile warnings; reenabled solvePnPRansac.concurrency test
2015-05-26 00:19:58 +03:00
Vadim Pisarevsky
85149f8686
hack solvePoly to finds roots of polynoms with zero higher-order coefficients. The roots are populated in this case, which is not valid, strictly speaking, but good enough for function like correctMatches. This solves http://code.opencv.org/issues/4330
2015-05-25 23:43:39 +03:00
Vadim Pisarevsky
a12ec66a04
fixed useExtrinsicGuess=true case with single-precision input ( http://code.opencv.org/issues/2734 )
2015-05-25 22:40:10 +03:00
Vadim Pisarevsky
9d90b0549c
fixed bug http://code.opencv.org/issues/3882
2015-05-25 22:03:25 +03:00
Vadim Pisarevsky
3bc5958c58
added tests for http://code.opencv.org/issues/4011 and http://code.opencv.org/issues/3057 ; fixed random subset generation in both methods to increase chance for a good subset
2015-05-25 21:46:05 +03: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
2466ca02bf
removed cameraMatrix modification in the currently disabled uPnP algorithm for SolvePnP problem ( http://code.opencv.org/issues/3985 )
2015-05-23 14:19:55 +03:00
Vadim Pisarevsky
7fd5b3a0c5
added another triangulation test case from http://code.opencv.org/issues/3461 ; fixed partial derivative on distortion coefficients, as http://code.opencv.org/issues/4101 suggests
2015-05-23 14:15:11 +03:00
Vadim Pisarevsky
74bb0beeb0
Merge pull request #4008 from cr333:triangulation_fix_2.4
2015-05-23 10:18:08 +00:00
Vadim Pisarevsky
a1a35ca5f7
Merge pull request #4010 from cr333:triangulation_fix_master
2015-05-23 10:17:39 +00:00
Vadim Pisarevsky
90a78585fb
reproduced test case from http://code.opencv.org/issues/4334
2015-05-23 13:16:32 +03: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
Maksim Shabunin
3863dc5b2b
Updated pkg-config generation, added sample makefile
2015-05-22 16:09:07 +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
acfbed8654
Merge pull request #4037 from Lectem:patch-1
2015-05-21 12:33:42 +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
Ilya Lavrenov
11d1909e6b
fixed warning
2015-05-21 11:49:06 +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
Lectem
3c6fe75149
fix mutex for uclibc
...
The uClibc doesn't have pthread_spin_* implemented on their 'old' linux threads.
Since it is on linux, we have to check if uclibc is using this implementation or not.
2015-05-20 12:18:28 +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
Vladislav Vinogradov
d58d277707
do not loose logs from nvidia tests
2015-05-19 17:28:43 +03:00
Vladislav Vinogradov
95eed59f2d
use fixed seed for RNG in gpu SolvePnPRansac test
2015-05-19 17:27:50 +03:00
Vladislav Vinogradov
62bc647731
use cv::theRNG() instead of ::rand() in gpu::solvePnPRansac
2015-05-19 17:27:23 +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
b9792fdc14
Merge pull request #3829 from ippei-i:2.4-flann-lsh-addable-index
2015-05-18 15:38:21 +00: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
Vadim Pisarevsky
a85bb091c8
Merge pull request #4018 from vpisarev:imgproc_video_fixes
2015-05-15 16:15:01 +00:00
Maxim Kostin
55f78f8a83
Added configuration changes enabling videoio WinRT support.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-15 16:29:06 +03:00
Maxim Kostin
d08cb6b357
Added WinRT support for videoio.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-15 16:28:47 +03:00
Maxim Kostin
d40eefd5a4
Moved old WinRT related wrappers from highgui to videoio fixing long broken logic.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-15 16:28:25 +03:00
Vadim Pisarevsky
4a9b244577
hopefully, fixed crash in sparse mat test
2015-05-15 16:15:10 +03:00
Vadim Pisarevsky
cc086b9452
Merge pull request #3979 from ruslo:fix.cxx11
2015-05-15 12:32:46 +00:00
Vadim Pisarevsky
66eb270cf7
significantly reduced sparse matrix footprint:
...
http://code.opencv.org/issues/2206 ,
http://code.opencv.org/issues/2924
2015-05-14 23:29:09 +03:00
Vadim Pisarevsky
354ed5c4d6
Merge pull request #4009 from mshabunin:fix-ann-moment
2015-05-14 18:25:16 +00:00
Vadim Pisarevsky
c52092e6f8
Merge pull request #3992 from nomarek:master
2015-05-14 18:24:09 +00:00
Vadim Pisarevsky
52fa55a770
Merge pull request #4014 from sgjava:opencv-sgjava
2015-05-14 18:23:28 +00:00
Vadim Pisarevsky
a87e1c2f90
Merge pull request #4012 from mshabunin:doc-fixes
2015-05-14 18:22:26 +00:00
Vadim Pisarevsky
7dd67f4997
use _mm_sad_epu8 instead of _mm_movemask_epi8 in countNonZero. Therefore, we do not need any popcount table and this solves http://code.opencv.org/issues/4333
2015-05-14 20:33:53 +03:00
Vadim Pisarevsky
3c769edea0
added extra check in CalibrateDebevec to make sure the points are within the image:
...
http://code.opencv.org/issues/4124
2015-05-14 19:54:48 +03:00
Vadim Pisarevsky
3c7f7de477
avoid possible problems with zero values in tone mapping algorithms ( http://code.opencv.org/issues/4020 )
2015-05-14 19:32:25 +03:00
Vadim Pisarevsky
ffabbfa778
added test to prove that remap does not leak memory ( http://code.opencv.org/issues/2502 ). disabled the test for now to save execution time.
2015-05-14 18:21:26 +03:00
Vadim Pisarevsky
ca90667723
fixed compile warnings on Linux and Windows
2015-05-14 16:42:51 +03:00
Vadim Pisarevsky
05d888316a
added test for http://code.opencv.org/issues/2957
2015-05-14 16:25:18 +03:00
Vadim Pisarevsky
b37aaa8303
significantly improved parallel non-local means by using granularity parameter in parallel_for_ loop. Because the algorithm deals with sliding sums, it's essential that each thread has enough work to do, otherwise the algorithm gets higher theoretical complexity and thus there is no speedup comparing to 1-thread code (at best).
2015-05-14 15:39:42 +03:00
Vadim Pisarevsky
feb5b6aa93
increased singularity epsilon in LU decomposition. This solved singular case from http://code.opencv.org/issues/3305 . Added the respective test.
2015-05-14 10:42:55 +03:00
Vadim Pisarevsky
2e7e754032
added support for n-channel (n>4) images in warpAffine/warpPerspective/remap: http://code.opencv.org/issues/4190
2015-05-14 08:06:46 +03:00
David Hirvonen
cab0ecdf19
Avoid clearing HaarEvaluator::tofs variable (introduced fb8478eb7b) in HaarEvaluator::setImage(...) since it won't be recomputed by HaarEvaluator::computeOptFeatures() for cases where the input image dimensions and requested search scales are the same as the previous. If none of the above change then it should be correct, and if they do change it will be computed correctly inside HaarEvaluator::computeOptFeatures() (in commit 952f9dbe62)
...
I'm guessing there is a unit test for this that needs to be called 2x with the same image and search parameters (or another image with the same size) to illustrate the problem.
2015-05-13 17:34:16 -04:00
Vadim Pisarevsky
d3b0cb878a
added test for http://code.opencv.org/issues/2736
2015-05-13 22:16:35 +03:00
Vadim Pisarevsky
71002e0e79
some fixes from http://code.opencv.org/issues/3733
2015-05-13 22:00:02 +03:00
sgjava
8b3b2a52f0
Removed finalize() and added n_delete to release()
2015-05-13 13:45:19 -04:00
sgjava
fe0ce9282a
Changed delete() modifier to public from protected
2015-05-13 13:44:53 -04:00
Marek Nogacki
25bcca2edb
fixed http://code.opencv.org/issues/4276 - set drawing thickness limit to 32767
2015-05-13 18:54:25 +02:00
Maksim Shabunin
a7160d9b12
Docs: fixed _dest type in cv::compare
2015-05-13 18:46:21 +03:00
Maksim Shabunin
e22c09c601
Documentation for CommandLineParser
2015-05-13 18:46:21 +03:00
Maksim Shabunin
61293a09ff
Fixed RGB-to-HLS conversion formula in documentation
2015-05-13 18:46:21 +03:00
Christian Richardt
6425ac3b13
Added color map similar to Matlab's new default color map 'parula'.
2015-05-13 17:34:14 +02:00
Christian Richardt
cbaf0ecaf6
Fixed triangulation bug http://code.opencv.org/issues/4334 .
2015-05-13 16:28:14 +02:00
Maksim Shabunin
b95769333c
Fixed ANN_MLP dw initialization when moment is not 0
2015-05-13 16:56:34 +03:00
Christian Richardt
242e64c08d
Fixed triangulation bug http://code.opencv.org/issues/4334 .
2015-05-13 15:47:00 +02:00
Vadim Pisarevsky
4743184078
Merge pull request #4006 from sgjava:opencv-steve
2015-05-13 11:36:15 +00:00
Martin Ueding
1e00a93f97
Fix spelling
2015-05-13 08:16:39 +02:00
sgjava
0f53526598
Added VideoWriter and changed finalize to delete
2015-05-12 14:18:39 -04:00
Vadim Pisarevsky
5de9d8e6e1
Merge pull request #3994 from mshabunin:fix-gtk-crash
2015-05-12 15:11:07 +00:00
Vadim Pisarevsky
d3ef3cff94
Merge pull request #3996 from Ashod:opengl_context_clip
2015-05-12 15:06:31 +00:00
Vadim Pisarevsky
568303ac7f
Merge pull request #3993 from vrabaud:master
2015-05-12 15:04:41 +00:00
Vadim Pisarevsky
939c1d2474
Merge pull request #4000 from sdika:HOGSignedGradient
2015-05-12 14:47:36 +00:00
Marvin Smith
ae933db526
Fixing the gdal include error that Macports seems to only mess up.
2015-05-11 20:27:50 -07:00
msandler
8e82bed459
updated cap_libv4l.cpp to support CV_CAP_PROP_POS_MSEC, CV_CAP_PROP_POS_FRAMES and CV_CAP_PROP_FPS
2015-05-11 03:25:48 -07:00
Michaël Sdika
ab40c2acf7
added the signedGradient varaible to the HOGDescriptor class.
...
when true, use signed gradient for the angular histogram computation.
default to false for backward compatibility.
2015-05-10 09:23:30 +02:00
Ashod Nakashian
7cd198623e
Prevent the parent from drawing over OpenGL context.
2015-05-09 12:23:09 -04:00
Nguyen Nguyen
58dd70e8dc
Revert support for audio
2015-05-08 12:06:03 -04:00
Nguyen Nguyen
53ff537f1c
temporary fixes
2015-05-08 11:33:11 -04:00
Maksim Shabunin
01c3d491e7
Fixed python crash when both cv2.imshow and gtk module are used
2015-05-07 16:44:45 +03:00
Vincent Rabaud
f052b0bc4d
get code to compile on Ubuntu Saucy
...
A define was forgotten for the codecs and there was a typo for
another.
2015-05-07 11:38:59 +00:00
Vadim Pisarevsky
a31b29308f
Merge pull request #3919 from cbalint13:brisk
2015-05-07 10:38:31 +00:00
laurentBerger
3a53e726dd
example BLOB_MSER and fixed bug in blobdetector
2015-05-07 11:52:06 +02:00
Marek Nogacki
d59a6b29d5
fixed http://code.opencv.org/issues/4276 - removed drawing thickness upper limit
2015-05-07 11:19:22 +02:00
Nguyen Nguyen
a5814871d9
Adding audio to opencv
2015-05-06 17:01:38 -04:00
Vadim Pisarevsky
f49544f310
Merge pull request #3987 from vpisarev:core_fixes_part_1
2015-05-06 15:49:18 +00:00
Vadim Pisarevsky
7a3c0cb70e
Merge pull request #3991 from mshabunin:python-underscore
2015-05-06 14:48:34 +00:00
Vladislav Vinogradov
f10537cdd6
fix tests compilation issue on Windows
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
9d294cbcf5
fix performance tests in tiny mode
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
f1bec940b1
fix accuracy tests in tiny mode
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
dd93d48be4
turn on stereob instantiates that required for tests
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
ad3123adfd
turn on some instantiates that required for other primitives
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
f939d80f4c
fixed seg faults
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
ee316758ca
reduce color instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
6d7a61cbdc
reduce copy_make_border instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
b44b1ab47b
reduce matrix_reductions instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
2e47a1a61b
reduce pyramids instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
72685cf01c
reduce resize instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
612888c066
reduce remap instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
e7b55f4982
reduce warp instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
3004f5fa30
reduce stereobm instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
9682d2afff
reduce element_operations instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
87d655325c
reduce add_weighted instantiates for tiny build
2015-05-06 17:13:59 +03:00
Vladislav Vinogradov
db25e44a17
reduce brute_force_matcher instantiates for tiny build
2015-05-06 17:13:59 +03:00
Vladislav Vinogradov
b7a9e672c5
reduce bilateral filter instantiates for tiny build
2015-05-06 17:13:59 +03:00
Vladislav Vinogradov
8e49ab1d3b
reduce filter2d instantiates for tiny build
2015-05-06 17:13:59 +03:00
Vladislav Vinogradov
00c36e88ef
reduce separable filter instantiates for tiny build
2015-05-06 17:13:59 +03:00
Maksim Shabunin
c137ba53a0
Wrap ANN_MLP class into Python
2015-05-06 15:21:23 +03:00
Vladislav Vinogradov
d87c30dc84
Bug #4315 : fix CUDA bitwise operations with mask
2015-05-06 13:28:08 +03:00
Vadim Pisarevsky
d280205245
fixed compile errors on ARM, as well as failures in OCL_Dft* regression tests
2015-05-06 10:00:10 +03:00
Vadim Pisarevsky
0ee8634b2f
fixed random failures in Core_DFT.complex_output2 test (the case of input_mat.cols == 1)
2015-05-05 20:31:30 +03:00
Nguyen Nguyen
9682430a69
Adding code to deal with audio output
2015-05-05 13:14:26 -04:00
Vadim Pisarevsky
73f760fdf0
some more compile warnings fixed
2015-05-05 18:03:40 +03:00
Vadim Pisarevsky
931a519969
fixed warning in mathfuncs
2015-05-05 17:49:36 +03:00
StevenPuttemans
0baaf0a60f
fixing old variables in documentation and transfering to the new interface
2015-05-05 15:05:39 +02:00
Vadim Pisarevsky
63a63e3eaa
extended MinProblemSolver::Function to 1) report the space dimensionality, 2) compute gradient if needed
2015-05-05 15:56:06 +03:00
cbalint13
2c6114f58d
Force newer build over buildbot.
2015-05-05 12:19:35 +03:00
Nguyen Nguyen
b69ffe6376
Fixed memory leak when recording video in iOS
2015-05-04 16:21:25 -04:00
cbalint13
8ba1ec22e4
Force buildbot to rebuild.
2015-05-04 19:54:08 +03:00
Nguyen Nguyen
1f72815637
Exporting videoFileString to outside world
2015-05-04 12:38:55 -04:00
Maksim Shabunin
90c3d7d361
Merge pull request #3969 from Dikay900:master_to_2_4
2015-05-04 10:13:45 +00:00
Vadim Pisarevsky
5b9182ba43
reenabled conjugate gradient solver test
2015-05-03 11:36:24 +03:00
Vadim Pisarevsky
5a31f6b4e1
ok, so probably the failure in downhill simplex has been finally solved
2015-05-03 11:31:49 +03:00
Vadim Pisarevsky
2ec92ba440
added test for http://code.opencv.org/issues/1918
2015-05-03 02:46:33 +03:00
Vadim Pisarevsky
01e351de37
refactored downhill simplex implementation a bit; hopefully, fixed the bug with random failures in the tests
2015-05-03 02:29:15 +03:00
Vadim Pisarevsky
a33d7928a4
Fixed getContinuousSize() to handle huge matrices properly. This should solve http://code.opencv.org/issues/3232
2015-05-02 22:12:12 +03:00
Vadim Pisarevsky
9c0b740b84
improved randShuffle as suggested by John Stark in http://code.opencv.org/issues/3730
2015-05-02 21:31:47 +03:00
Vadim Pisarevsky
96b5ec14d4
fixed bug with simplex initialization in Downhill solver (thanks to Toby Rule for the patch): http://code.opencv.org/issues/3990 .
...
re-enabled Downhill solver test, let's see how it goes
2015-05-02 20:59:57 +03:00
Vadim Pisarevsky
79ac0d05ce
added test checking http://code.opencv.org/issues/4050
2015-05-02 20:38:30 +03:00
cbalint13
f426778160
Force buildbot rebuild.
2015-05-02 11:25:22 +03:00
Ruslan Baratov
f148eaace9
Fix errors while compiling with c++11 flag
...
Fix errors in file cap_avfoundation.mm.
Compiled with Xcode 6.2, iOS SDK 8.2
Example:
cap_avfoundation.mm:543:54: error: cannot initialize a parameter of
type 'AVCaptureFocusMode' with an rvalue of type 'int'
if ([mCaptureDevice isFocusModeSupported:(int)value]){
^~~~~~~~~~
2015-05-01 21:29:20 +02:00
cbalint13
9b87c22e01
Fix bugs in non-max suppression routine.
2015-05-01 22:07:08 +03:00
Vadim Pisarevsky
9fbd1d68ad
refactored div & pow funcs; added tests for special cases in pow() function.
...
fixed http://code.opencv.org/issues/3935
possibly fixed http://code.opencv.org/issues/3594
2015-05-01 21:49:11 +03:00
cbalint13
bbdf21679f
Leave AGAST at thresold=10, cosmetic for perf tests.
2015-04-30 02:23:58 +03:00
cbalint13
e2f74309f7
Default AGAST threshold is 40 (as authors recomandation)
2015-04-29 23:54:16 +03:00
cbalint13
0ec5561b4e
Adjust AGAST perftest to be at parity (better) with FAST ones.
2015-04-29 23:42:57 +03:00
Vadim Pisarevsky
74e2b8cbcb
fixed invalid output of cv::dft when using DFT_ROWS + DFT_COMPLEX_OUTPUT ( http://code.opencv.org/issues/3428 )
2015-04-29 23:08:22 +03:00
Vadim Pisarevsky
7918267d02
fixed U non-orthogonality in SVD ( http://code.opencv.org/issues/3801 )
2015-04-29 16:09:58 +03:00
Vadim Pisarevsky
135fa85e8f
added vector<bool> support ( http://code.opencv.org/issues/3826 )
2015-04-29 15:36:45 +03:00
Vadim Pisarevsky
d8f360316d
fixed http://code.opencv.org/issues/3828 , added test. thanks to berak for the patch
2015-04-29 13:12:53 +03:00
lujia
b73894b271
bugfix_for_hog_detectMultiScale_with_weights
2015-04-29 11:46:26 +02:00
Vadim Pisarevsky
0746ec7035
fixed http://code.opencv.org/issues/4278
2015-04-29 11:58:49 +03:00
Vadim Pisarevsky
a8226814c5
fixed http://code.opencv.org/issues/4189
2015-04-29 11:47:12 +03:00
Andrey Pavlenko
5c12c92243
Merge pull request #3961 from apavlenko:2.4_fix_polylines_empty
2015-04-28 16:22:31 +00:00
AfterEight
f39d351d04
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)
...
Conflicts:
modules/highgui/src/cap_ximea.cpp
2015-04-28 18:07:39 +02:00
cbalint13
0039690f11
Merge branch 'master' of https://github.com/Itseez/opencv into brisk
2015-04-28 18:51:13 +03:00
Martin Ueding
9e29762838
Add example data types for calibrateCamera call
...
It took me a while to figure out what was meant with
OpenCV Error: Assertion failed (i < 0) in getMat
While searching for this error message I found [a list of error
messages](https://adventuresandwhathaveyou.wordpress.com/2014/03/14/opencv-error-messages-suck/ )
which also explained what the problem was: The data type for `rvecs` was
not a simple `cv::Mat` but a `std::vector<cv::Mat>`.
After I fixed that, I got the next error message:
OpenCV Error: Assertion failed (ni > 0 && ni == ni1) in
collectCalibrationData, file
/build/buildd/opencv-2.4.9+dfsg/modules/calib3d/src/calibration.cpp,
line 3193
The problem here was that my data type for the `objectPoints` was just
`vector<Vec3f>` and not `vector<vector<Vec3f>>`.
In order to save other people the time looking for this, I added
explicit examples of the needed data types into the documentation of the
function. I had to re-read the current version a couple of times until I
can read the needed levels of `vector<>`. Having this example would have
really helped me there.
Conflicts:
modules/calib3d/include/opencv2/calib3d.hpp
2015-04-28 17:24:37 +02:00
Vadim Pisarevsky
07e07655d4
Merge pull request #3967 from Belev:fix-typo
2015-04-28 14:47:05 +00:00
Vadim Pisarevsky
e60dcc9b3b
Merge pull request #3966 from Dikay900:master_diff_to_2_4_2
2015-04-28 11:00:57 +00:00
Vadim Pisarevsky
7245803405
Merge pull request #3954 from martin-ueding:master
2015-04-28 10:55:05 +00:00
Vadim Pisarevsky
da229cce9a
Merge pull request #3946 from zjulujia:bugfix_for_hog_detectMultiScale_with_weights
2015-04-28 10:54:45 +00:00
Vadim Pisarevsky
36af97d00c
Merge pull request #3959 from jet47:gpu-fixes
2015-04-28 10:49:06 +00:00
Vadim Pisarevsky
d705c651f2
Merge pull request #3960 from ilya-lavrenov:aarch64_test_fixes
2015-04-28 10:48:33 +00:00
Vadim Pisarevsky
ce7812fcb0
Merge pull request #3962 from apavlenko:fix_polylines_empty
2015-04-28 10:47:36 +00:00
Vadim Pisarevsky
08848c56b7
Merge pull request #3965 from Dikay900:2_4_diff_to_master_2
2015-04-28 10:47:05 +00:00
Belev
2200e0fb7e
Fix typo
...
Fixed difference in the given arguments to the ellipse function and the description after that
Fixed two more typos
Replaced unnecessary the with to
2015-04-28 13:10:08 +03:00
cbalint13
0ded2984b8
Merge remote-tracking branch 'upstream/master' into brisk
2015-04-28 06:48:52 +03:00
Maksim Shabunin
9efc57f24b
Increased perf_imgproc.moments max error
2015-04-27 17:05:55 +03:00
kalistratovag
20156d1eeb
Adding 1 to moments to avoid tests fails
2015-04-27 15:36:40 +03:00
Maksim Shabunin
1138a38dbe
Use explicit no-sse flags when SSE is off
...
Also:
- Silence clang warnings about unsupported command line arguments
- Add diagnostic print to calib3d test
- Fixed perf test relative error check
- Fix iOS build problem
2015-04-27 15:36:10 +03:00
Thomas Gabrowski
63dbeeaac5
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
...
Conflicts:
modules/contrib/include/opencv2/contrib/retina.hpp
2015-04-26 12:22:41 +02:00
Roman Donchenko
5455e38e15
cap_msmf.hpp: fix a warning about nNull being unused
...
The two functions featuring nNull are not particularly needed, so
I simply removed them.
Conflicts:
modules/highgui/src/cap_msmf.hpp
2015-04-25 18:54:54 +02:00
Mansour Moufid
b99f7a29df
Cast some image coordinates and sizes to double.
...
Conflicts:
modules/gpu/perf/perf_imgproc.cpp
Cast a long integer to double explicitly.
Conflicts:
modules/python/src2/cv2.cpp
Cast some matrix sizes to type int.
Change some vector mask types to unsigned.
Conflicts:
modules/core/src/arithm.cpp
2015-04-25 18:54:53 +02:00
Luis Díaz Más
b599774e30
Fix a bug that impede to set the trackbar pos using the Qt control panel
...
Conflicts:
modules/highgui/src/window_QT.cpp
2015-04-25 18:54:53 +02:00
Luis Díaz Más
e6f7e96ff4
Fixing the bug #4244 that I just reported in code.opencv.org
2015-04-25 18:54:52 +02:00
Craig Reynolds
b4c7c011b7
In cvAddText, construct QString from "text" using fromUtf8.
2015-04-25 18:54:51 +02:00
Boris Daskalov
3b5530fb67
Fix a bad free space check in icvGrowSeq.
...
A difference of two pointers was casted to unsigned which can lead to
overflow on 64-bit systems.
2015-04-25 18:54:51 +02:00
Pierre Moulon
901d4995e3
Fix a typo error
...
Fix a typo error
Conflicts:
modules/features2d/include/opencv2/features2d.hpp
2015-04-25 15:07:17 +02:00
Adi Shavit
aad95c7d8c
Added call to clone() to avoid unexpected change to external data.
...
- Fix both stitching_detailed.cpp sample and cv::Stitcher.
2015-04-25 14:54:35 +02:00
Simon Heinen
6decc2596d
squashed #3729
...
Update android+AsyncServiceHelper.java
Update android+AsyncServiceHelper.java
changed tabs in last commit to spaces
Update android+AsyncServiceHelper.java
small formatting fixes
2015-04-24 23:02:10 +02:00
Eric Sommerlade
41b920344d
added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html
...
Conflicts:
modules/imgcodecs/src/grfmt_tiff.cpp
2015-04-24 22:59:08 +02:00
Kevin Hughes
ac3ec0d96d
squashed #823
...
removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface
Conflicts:
modules/highgui/doc/reading_and_writing_images_and_video.rst
samples/cpp/starter_video.cpp
starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error
starter_video.cpp hid local functions
2015-04-24 21:58:14 +02:00
Andrey Pavlenko
d2409d12c6
porting polylines with empty vector<Point> from 2.4 to master
2015-04-24 17:11:51 +03:00
Andrey Pavlenko
40b762bceb
adding test for polylines() call with empty Point-s vector and fix for crash in this case
2015-04-24 16:40:14 +03:00
Ilya Lavrenov
89e3c508d8
fixed tests for aarch64
2015-04-24 13:56:20 +03:00
Vadim Pisarevsky
1e90b2f51d
Merge pull request #3957 from dhood:fm-8pt-bug
2015-04-23 17:16:25 +00:00
Vladislav Vinogradov
cbdddb473c
disable several heavy performance tests
2015-04-23 19:09:03 +03:00
Vladislav Vinogradov
b4c2891ef3
disable Video_PyrLKOpticalFlowDense performance test
...
sanity fails on Maxwell and CUDA 7.0 due to unknow reason
2015-04-23 19:08:40 +03:00
Vladislav Vinogradov
1325213303
use border extrapolation for central pixel in pyrDown
...
in case if image has odd dimension
2015-04-23 17:21:42 +03:00
Vladislav Vinogradov
fb15bdfb21
fix racecheck warning in scanRows kernel
2015-04-23 17:21:42 +03:00
Vladislav Vinogradov
9d2d173485
increase epsilon for solvePnPRansac function
2015-04-23 17:21:42 +03:00
Deanna Hood
eee210f3b5
Fix Bug #3441 , #4072 , #4173 : 8-point fundamental matrix calculation error
2015-04-23 10:09:48 -04:00
Deanna Hood
34bc3b8595
Don't relax error level for particular fundamental matrix calculation methods
2015-04-23 10:08:42 -04:00
Vadim Pisarevsky
d825b7ee9a
fixed mjpeg encoder so that libjpeg-based decoder does not complain on extra bytes in the end of stream
2015-04-23 14:40:44 +03:00
Martin Ueding
5ffb53f229
Add example data types for calibrateCamera call
...
It took me a while to figure out what was meant with
OpenCV Error: Assertion failed (i < 0) in getMat
While searching for this error message I found [a list of error
messages](https://adventuresandwhathaveyou.wordpress.com/2014/03/14/opencv-error-messages-suck/ )
which also explained what the problem was: The data type for `rvecs` was
not a simple `cv::Mat` but a `std::vector<cv::Mat>`.
After I fixed that, I got the next error message:
OpenCV Error: Assertion failed (ni > 0 && ni == ni1) in
collectCalibrationData, file
/build/buildd/opencv-2.4.9+dfsg/modules/calib3d/src/calibration.cpp,
line 3193
The problem here was that my data type for the `objectPoints` was just
`vector<Vec3f>` and not `vector<vector<Vec3f>>`.
In order to save other people the time looking for this, I added
explicit examples of the needed data types into the documentation of the
function. I had to re-read the current version a couple of times until I
can read the needed levels of `vector<>`. Having this example would have
really helped me there.
2015-04-23 13:30:14 +02:00
Ilya Lavrenov
ceec0eb33a
rmeoved unused functions
2015-04-23 12:48:50 +03:00
Vadim Pisarevsky
dcf177e372
Merge pull request #3952 from vpisarev:fix_libav_case
2015-04-23 06:25:25 +00:00
Vadim Pisarevsky
30912b49f3
fixed compile warnings; hopefully fixed test failures
2015-04-23 00:39:44 +03:00
Vadim Pisarevsky
882dc0a7f6
Merge pull request #3950 from paroj:fix-gftt_ocl
2015-04-22 19:08:15 +00:00
Vadim Pisarevsky
2b2e3ee93c
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
2015-04-22 21:57:29 +03:00
kalistratovag
08925330e0
mjpec_decoder initialize m_movi_start variable
2015-04-22 19:49:11 +03:00
Pavel Rojtberg
1ea41e7246
fix gftt opencv kernel when using mask
2015-04-22 16:13:50 +02:00
Ilya Lavrenov
02e29fc99c
suppress -Wclobbered warning
2015-04-22 16:42:03 +03:00
Vadim Pisarevsky
7dd19f6d97
Merge pull request #3939 from paroj:fmtfix
2015-04-22 12:15:17 +00:00
Vadim Pisarevsky
415a212d09
Merge pull request #3936 from dhood:fitEllipse-bug
2015-04-22 11:22:35 +00:00
Philipp Hasper
0b20ce696a
Fixed markdown: **Note** -> @note
2015-04-22 08:08:10 +02:00
Vadim Pisarevsky
a69b435c92
Merge pull request #3909 from Nuzhny007:master
2015-04-21 14:02:59 +00:00
Vadim Pisarevsky
063e4004ba
Merge pull request #3935 from vpisarev:extending_hal_part1
2015-04-21 14:02:02 +00:00
Vadim Pisarevsky
dce0405c4d
Merge pull request #3947 from tcavallari:patch-1
2015-04-21 14:01:22 +00:00
Vadim Pisarevsky
0f13208d81
Merge pull request #3929 from daeyun:findEssentialMat_doc
2015-04-21 12:20:02 +00:00
Vadim Pisarevsky
4c875dc393
Merge pull request #3932 from nisargthakkar:Bug4243
2015-04-21 12:18:37 +00:00
Vadim Pisarevsky
99d0fcf49d
Merge pull request #3938 from paroj:triangulatecpp
2015-04-21 12:02:26 +00:00
Vadim Pisarevsky
faf84e7100
Merge pull request #3937 from mshabunin:android-engine3
2015-04-21 11:47:26 +00:00
Pavel Rojtberg
78eac67a01
clean up cvTriangulatePoints by using C++ primitives directly.
...
- fixes the Calib3d_StereoCalibrate_C testcase.
update comment regarding cv::SVD::MODIFY_A
2015-04-21 11:29:26 +02:00
tcavallari
cca78e0601
Null Pointer check in vizimpl.cpp
...
Should fix #4191 (http://code.opencv.org/issues/4191 )
2015-04-21 10:08:17 +02:00
lujia
7ce116695d
bugfix_for_hog_detectMultiScale_with_weights
2015-04-21 02:32:27 -04:00
Nisarg Thakkar
0fd1203b3b
Fixed Doc Errors Bug#4282
2015-04-21 10:37:50 +05:30
Vadim Pisarevsky
b27467d9f9
Merge pull request #3931 from mshabunin:fix-svm-train
2015-04-20 20:00:36 +00:00
Vadim Pisarevsky
6916a1438f
fixed some newly introduced compile errors and warnings
2015-04-20 21:34:37 +03:00
Vadim Pisarevsky
ca9a2887fc
extended universal intrinsics: added 64-bit integers, improved shift operators, renamed "pack" operations; changed semantics of extended integer multiplication, added v_dotprod.
...
also, split intrinsics into separate files. C implementation is compiled only when none of SSE2 or NEON is available.
2015-04-20 20:27:03 +03:00
Deanna Hood
37f77e7397
Change condition on parallel ellipse case so can only calculate t if necessary
2015-04-18 13:51:32 -04:00
Deanna Hood
5a552b6d8d
Regression test for Bug #3989 : check fitEllipse with rotation angles of n*pi/2
2015-04-18 13:51:26 -04:00
Pavel Rojtberg
b02fc039cd
fix python and numpy output formatters
2015-04-17 17:42:24 +02:00
Maksim Shabunin
a362aca783
Rename manager package to OpenCV3 Manager
2015-04-17 16:59:52 +03:00
Maksim Shabunin
316d76bdb6
Rename OpenCV Engine to org.opencv.engine3 for release candidate
2015-04-17 16:00:33 +03:00
Vadim Pisarevsky
92f2ad0a11
trying to fix test failures (take 2)
2015-04-17 11:32:20 +03:00
Vadim Pisarevsky
17675b4cb8
trying to fix test failures
2015-04-17 10:51:49 +03:00
Vadim Pisarevsky
ce7590bd24
continuing fixing universal intrinsics
2015-04-17 08:32:06 +03:00
Vadim Pisarevsky
bfbf864a73
fixed some more compile warnings (2)
2015-04-17 00:13:08 +03:00
Vadim Pisarevsky
1fcc83b84b
fixed some more compile warnings
2015-04-16 23:52:23 +03:00
Vadim Pisarevsky
c7121e8772
fixed compile warnings
2015-04-16 23:42:00 +03:00
Vadim Pisarevsky
ee11a2d266
fully implemented SSE and NEON cases of intrin.hpp; extended the HAL with some basic math functions
2015-04-16 23:00:26 +03:00
Deanna Hood
103336c76e
Fix Bug #3989 : correctly identify ellipse with its axes parallel to x-y axes during semi-major axis calculation
2015-04-16 11:59:05 -04:00
Ahmatnurov Dinar
2358c79db2
move 3265 to 3.0;
2015-04-16 14:36:46 +03:00
Nisarg Thakkar
00094a8792
Fix for Bug4243. Made changes relating to non OpenCL devices
2015-04-16 00:22:08 +05:30
Nisarg Thakkar
a0bc0ab7cb
Fix for Bug4243
2015-04-15 23:49:01 +05:30
Maksim Shabunin
cb00c7036f
Fix cache error during SVM train
2015-04-15 15:46:07 +03:00
Vadim Pisarevsky
a2bba1b9e6
HAL extensions: added initial version of universal intrinsics (C implementation and SSE2, NEON - TBD). added empty files where some functionality from core and imgproc will be moved to
2015-04-15 00:36:27 +03:00
Ilya Lavrenov
17bedd72f0
workaround for stange internal compiler error when cross-compiling with 4.6
2015-04-14 16:55:11 +03:00
Daeyun Shin
4686b935c1
Fix typo in documentation. F = K^-T * E * K^-1
2015-04-14 07:44:32 -05:00
Vladislav Vinogradov
6a6619ec1e
increase epsilons for some sanity tests
2015-04-14 10:12:56 +03:00
Vladislav Vinogradov
d22516872c
fix BruteForceMatcher resource distribution
...
added launch bounds attributes for all CUDA kernels
2015-04-13 17:12:04 +03:00
Vladislav Vinogradov
17608f7ade
make NVIDIA tests verbose by default
2015-04-13 17:11:19 +03:00
Vladislav Vinogradov
81ebe28c24
fixed a bug in scanRows CUDA kernel (part of nppStIntegral)
...
uninitialized value
2015-04-13 17:09:59 +03:00
cbalint13
dee3a4b528
Add missing opencv_contrib PR #202 patch.
2015-04-11 17:43:28 +03:00
cbalint13
26997f32c6
Fix BRISK detector&descriptor using proper AGAST.
2015-04-11 12:09:13 +03:00
Vadim Pisarevsky
b639353193
Merge pull request #3912 from kalistratovag:mjpeg_dec
2015-04-10 16:18:37 +00:00
kalistratovag
740ae3581c
Initial commit of avi mjpeg decoder
...
std::streams removed
debug code removed
whitespaces removed
stdint.h added and trailing whitespaces removed
trailing whitespaces removed
warnings on windows fix
warnings on windows fix pt 2
Refactoring performed: AviMjpegStream class introduced. CAP_PROP_FRAME_WIDTH and CAP_PROP_FRAME_HEIGHT properties support added.
Windows warnings & uninitialized variable fix
Windows warning fix
Win32 warning fix
2015-04-10 14:16:43 +03:00
Maksim Shabunin
97c78838a4
Fixed windows build and one warning
2015-04-10 11:37:16 +03:00
Vadim Pisarevsky
369a3d1426
Merge pull request #3907 from yxiong:python-dependencies
2015-04-10 05:34:14 +00:00
Maksim Shabunin
e7c02f376f
Fixed world build with HAL
2015-04-08 19:56:17 +03:00
Сергей Нужный
4a65f3cee2
Squashed commit of the following:
...
commit 5c379aa1b8e8008003646967https://github.com/Nuzhny007/opencv
commit e800800bec3646967deb0c24ccf538225da0226e225da0226e3646967deb0c24ccf538225da0226e225da0226e
2015-04-08 12:51:57 +03:00
Vadim Pisarevsky
5b3f89df0a
Merge pull request #3911 from vpisarev:core_tweaks
2015-04-07 19:03:48 +00:00
Vadim Pisarevsky
259e41da73
reverted "typedef _InputArray InputArray", fixed warning from doxygen
2015-04-07 19:34:51 +03:00
Maksim Shabunin
35b2139929
Basic HAL module
2015-04-07 18:16:22 +03:00
Vadim Pisarevsky
052593c760
1. Input/OutputArray optimizations;
...
2. Algorithm::load/save added (moved from StatModel)
3. copyrights updated; added copyright/licensing info for ffmpeg
4. some warnings from Xcode 6.x are fixed
2015-04-07 16:44:26 +03:00
Vadim Pisarevsky
f7792f0be2
Merge pull request #3908 from jet47:gpu-wrap-border-mode
2015-04-07 11:44:51 +00:00
Vladislav Vinogradov
27302c367c
fix GPU WARP border mode in CUDA 7.0 and Maxwell architecture
2015-04-07 13:04:31 +03:00
Ying Xiong
2d8b4fea9f
Add #ifdef's such that python wrapper builds independent of other components
2015-04-06 19:57:10 -04:00
Vadim Pisarevsky
ac22c524fc
Merge pull request #3903 from SeninAndrew:master
2015-04-05 18:01:18 +00:00
Vadim Pisarevsky
08c84e0c34
Merge pull request #3729 from bitstars:AsyncServiceHelper.java-Android-5-hotfix
2015-04-05 17:57:53 +00:00
Ashod Nakashian
f75f2ffd48
Jpeg2k color to greyscale conversion on non-Windows is done post decoding because system libjasper segfaults when decoding color images as greyscale.
2015-04-03 21:01:45 -04:00
Ashod Nakashian
6fd2fdc2e6
Jasper unit-tests and removed a superfluous assertion.
2015-04-03 21:01:43 -04:00
Andrew Senin
8c55d7be5e
Ximea camera fix (see issue #4235 )
2015-04-03 22:50:05 +03:00
Andrew Senin
58f20a3b7f
Ximea camera fix (see issue #4235 )
2015-04-03 22:49:50 +03:00
Andrey Pavlenko
ed9f933d41
fixing confusing variable naming in a sample code
2015-04-03 14:03:09 +03:00
Andrey Pavlenko
eeae81e903
fixing confusing variable naming in a sample code
2015-04-03 13:54:49 +03:00
Vadim Pisarevsky
f01b2413c3
Merge pull request #3770 from jet47:gpu-hog-tests
2015-04-03 10:32:59 +00:00
Vadim Pisarevsky
559dfa297d
Merge pull request #3813 from hahne:iss1915
2015-04-03 10:16:30 +00:00
Vadim Pisarevsky
a035d39158
Merge pull request #3892 from MSOpenTech:imgcodecs-contrib
2015-04-02 11:53:55 +00:00
Vadim Pisarevsky
246b7abe7e
Merge pull request #3869 from Dikay900:remove_unused_variable
2015-04-02 11:48:43 +00:00
Vadim Pisarevsky
38ce0fe954
Merge pull request #3897 from sanchom:bugfix_4030
2015-04-02 11:44:32 +00:00
ippei ito
b8c00854fe
instead of "using namespace cv" put all the tests into cv:: namespace.
2015-04-02 19:58:19 +09:00
Simon Heinen
d2dc7f4c27
Update android+AsyncServiceHelper.java
...
small formatting fixes
2015-04-02 09:05:56 +02:00
Simon Heinen
0df9dc8fb9
Update android+AsyncServiceHelper.java
...
changed tabs in last commit to spaces
2015-04-02 08:42:19 +02:00
Sancho McCann
6593422c05
Bugfix: #4030 SVM auto-training.
2015-04-01 20:44:51 +00:00
Dikay900
952f9dbe62
initialize tiltedOffset variable at correct location
...
do not use this variable if it is not an tilted feature
2015-04-01 20:32:30 +02:00
Evgeny Agafonchikov
ae090fe10d
Functionality for relocation of tests
...
This allows to start run.py with --move_tests parameter to place tests
to another location and keep them runnable from there
2015-04-01 11:50:05 +03:00
Evgeny Agafonchikov
1f04f9d63b
Fixing help messages
...
--help message and starting run.py w/o parameters generate different messages
E. g. w/ and w/o build_path in the end
build_path is required, removing square brackets
2015-03-31 17:58:25 +03:00
Maxim Kostin
412a2aa4ab
Added support for 'imgcodecs' module:
...
- Resolved GET_ENV and input type incompatibility
- Made libjpeg compile for WINRT. So does imgcodecs module.
- Updated .gitignore (log, tlog)
2015-03-31 16:31:37 +03:00
Vadim Pisarevsky
864b4e3b26
Merge pull request #3873 from Dmitry-Me:reduceVariableScope10
2015-03-30 17:20:39 +00:00
Alexander Alekhin
d326c77007
fix build (related to PR #3814 )
2015-03-30 16:32:00 +03:00
Vadim Pisarevsky
fa9c9e791b
Merge pull request #3876 from vpisarev:mjpeg_codec
2015-03-30 09:27:10 +00:00
Vadim Pisarevsky
602d2c33c0
added video writer quality, which user may change dynamically in the case of motion jpeg; enabled NEON intrinsics in the encoder
2015-03-27 15:15:59 +03:00
Maksim Shabunin
56b02331f7
Commented unused constants in the RHO algorithm
2015-03-27 14:36:27 +03:00
Maksim Shabunin
fab2a947ca
Fix build for VC10
2015-03-27 12:15:26 +03:00
Vadim Pisarevsky
77cbddf715
Merge pull request #3847 from mshabunin:android-build
2015-03-26 16:56:49 +00:00
Vadim Pisarevsky
1381564a84
Merge pull request #3880 from vpisarev:fix_emd
2015-03-26 16:40:17 +00:00
Vadim Pisarevsky
b123870871
Merge pull request #3868 from Dikay900:fix_cudalegacy_without_cudaimgproc
2015-03-26 13:35:12 +00:00
Vadim Pisarevsky
b91313a84e
initialize the output flow in EMD (thanks to Daniel DeMenthon for the bug report)
2015-03-26 16:26:41 +03:00
Vadim Pisarevsky
eff302a231
Merge pull request #3875 from alalek:fix_build
2015-03-26 13:09:01 +00:00
Vadim Pisarevsky
8d1232cc7a
fixed warnings; transpose qtab to make it compatible with neon branch
2015-03-26 15:59:49 +03:00
Maksim Shabunin
e94dfcee0d
Add python test for inheritance structure generation
2015-03-26 11:43:49 +03:00
Maksim Shabunin
82adf7955f
Fix python submodules inheritance detection
2015-03-26 11:22:56 +03:00
Vadim Pisarevsky
3df6b6fdcf
added self-contained motion jpeg encoder (filename should end with .avi; fourcc should be "MJPG"
2015-03-26 00:39:29 +03:00
Alexander Alekhin
32da602bf7
fix build (related to PR #3814 )
2015-03-25 19:12:36 +03:00
Prof. Dr. Rudolf Haussmann
a9d4e05346
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: highgui/include/opencv2/highgui/highgui_c.h
modified: highgui/src/cap_dshow.cpp
modified: java/generator/gen_java.py
The correction of the orthographic error in the enumeration constant
CAP_PROP_MONOCROME has been undone.
2015-03-25 15:45:20 +01:00
Dmitry-Me
75a65542ba
Reduce variables scope
2015-03-25 17:17:06 +03:00
Vadim Pisarevsky
97bdc92d1b
Merge pull request #3870 from Dmitry-Me:reduceVariableScope9
2015-03-25 13:32:33 +00:00
Dikay900
3465cef689
disable cuda::OpticalFlowNeedleMap if configured without cudaimgproc
...
disable cuda::FastOpticalFlowBM if configured without cudaarithm
2015-03-25 13:47:53 +01:00
Prof. Dr. Rudolf Haussmann
e5e6367223
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-25 13:38:49 +01:00
Vadim Pisarevsky
0545aeb11b
Merge pull request #3670 from obilaniu:master
2015-03-25 10:10:05 +00:00
Vadim Pisarevsky
bd7c78ffd5
Merge pull request #3866 from tdsmith:python-linkage
2015-03-25 09:51:20 +00:00
ippei ito
65b0ecfec5
Test accuracy for PR#3829.Fix WOrder warning on gcc
2015-03-25 18:24:52 +09:00
Dmitry-Me
6318409a5d
Reduce variable scope
2015-03-25 10:35:11 +03:00
ippei ito
d1902a1276
Test accuracy for PR#3829.Fix warning on gcc, comment out INIT_RANDOM_SEED for same result each ran.
2015-03-25 05:28:29 +09:00
ippei ito
56cae1b293
Test accuracy for PR#3829.Fix Some Error, Modify SLA.
2015-03-25 03:11:44 +09:00
ippei ito
7c740b6a31
Test accuracy for Pull Request # 3829
2015-03-25 02:38:01 +09:00
Vadim Pisarevsky
5501cfd809
Merge pull request #3814 from erikrk:denoising-16bit-master
2015-03-24 15:23:58 +00:00
Vadim Pisarevsky
3c51fdffac
Merge pull request #3849 from Dikay900:fix_tilted_features_crash
2015-03-24 15:19:13 +00:00
Vadim Pisarevsky
f7f10a7d2c
Merge pull request #3854 from Dmitry-Me:reduceVariableScope8
2015-03-24 15:13:34 +00:00
Vadim Pisarevsky
d7cb99254e
Merge pull request #3858 from MSOpenTech:fix-ml-test
2015-03-24 15:09:53 +00:00
Vadim Pisarevsky
70ff448067
Merge pull request #3859 from NewProggie:fix-doc-typo
2015-03-24 15:08:03 +00:00
Vadim Pisarevsky
54deb5ed5a
Merge pull request #3860 from theodr:document_hconcat_vconcat
2015-03-24 15:07:34 +00:00
theodore
02c3d8d792
documentation for the hconcat and vconcat functions
2015-03-24 13:59:09 +01:00
Tim D. Smith
b9b743bbe3
Don't explicitly link Python on OS X
...
Explicitly linking to a Python framework on OS X prevents modules from
being built against one Python (i.e. system python) and imported from
another (i.e. Homebrew python); the interpreter segfaults if there's a
linkage to a foreign Python. Building the module with `-undefined
dynamic_lookup` instead of an explicit link allows the symbols to be
resolved at load time from a compatible python.
2015-03-23 23:36:46 -07:00
Tim D. Smith
d057828ee3
Don't explicitly link Python on OS X
...
Explicitly linking to a Python framework on OS X prevents modules from
being built against one python (i.e. system python) and imported from
another (i.e. Homebrew python); the interpreter segfaults if there's a
linkage to a foreign python. Building the module with `-undefined
dynamic_lookup` instead of an explicit link allows the symbols to be
resolved at load time from a compatible python.
2015-03-23 23:13:48 -07:00
Erik Karlsson
01d3df0d00
Added normType parameter to fastNlMeansDenoisingMulti
2015-03-24 02:01:31 +01:00
Erik Karlsson
70a64ebe72
Added test cases
2015-03-24 01:16:17 +01:00
Erik Karlsson
5f8d688664
Added parameter normType to fastNlMeansDenoising
2015-03-24 00:47:11 +01:00
Erik Karlsson
9fff7896c5
Removed fastNlMeansDenoisingColored[Multi]Abs
2015-03-23 23:23:35 +01:00
Yan Wang
433c3da7cf
Optimize the performance of cascade OpenCL kernel.
...
1. Use built-in mad() instead of += and *.
2. For stump stages, if weight.z == 0, avoid unnecessary calculation
because some features only have 2 rectangles..
It could improve
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/*
about 10% mean values.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-03-23 17:47:40 +08:00
Vadim Pisarevsky
5a0c7a1330
Merge pull request #3853 from alalek:ocl_fix_bufferpool_cleanup
2015-03-23 08:10:22 +00:00
Vadim Pisarevsky
7ab7322915
Merge pull request #3848 from yxiong:fix-4125
2015-03-23 08:04:41 +00:00
Vadim Pisarevsky
c9bb18b9f7
Merge pull request #3850 from piponazo:2.4
2015-03-23 08:03:49 +00:00
Vadim Pisarevsky
daa99514fa
Merge pull request #3846 from mshabunin:fix-headers
2015-03-23 08:01:25 +00:00
Kai Wolf
f815bbab24
Fix typo in types_c.h
2015-03-22 10:55:54 +01:00
Evgeny Agafonchikov
91bd7df8c1
Fixing invalid opencv_test_ml calls
2015-03-20 17:49:03 +03:00
Dikay900
fb8478eb7b
add resetting the offset variable after setting a new image
2015-03-20 13:26:13 +01:00
Dmitry-Me
ce167e233b
Reduce variable scope
2015-03-20 13:27:08 +03:00
Alexander Alekhin
b5529aef9c
ocl/bufferpool: fix cleanup
2015-03-20 13:21:10 +03:00
Vadim Pisarevsky
297e2b6f1a
Merge pull request #3834 from asmorkalov:retina_docs_fix
2015-03-20 10:14:29 +00:00
Vadim Pisarevsky
8616cd875b
Merge pull request #3836 from Dmitry-Me:uninitializedMember
2015-03-20 10:03:11 +00:00
Vadim Pisarevsky
226b4e3ed5
Merge pull request #3839 from hyperscience:fix-free-space-check-in-grow-seq
2015-03-20 09:37:49 +00:00
Vadim Pisarevsky
072a4b5497
Merge pull request #3851 from ellbur:findTransformECC-initialize-bug
2015-03-20 09:34:04 +00:00
Owen Healy
86fb9f8409
Modify findTransformECC to support a mask of pixels to consider
...
Tests of the mask are also included.
This is useful for registering a non-square image against a non-square
template.
This also needs to relax a sanity check as per
https://github.com/Itseez/opencv/pull/3851
2015-03-19 22:16:32 -04:00
Owen Healy
ff48387a8a
Fix bug of uninitialized matrix in findTransformECC
...
The matrix templateZM needs to be initialized because otherwise
uninitialized values leak into the correlation in:
const double correlation = templateZM.dot(imageWarped)
In the worst case this will lead the correlation to be NaN ruining the
whole routine. The subtraction does not initialize templateZM due to the
mask.
Unfortunately, the uninitialized values (by altering the correlation)
have the side effect of dragging out the computation a little longer
giving a slightly better error bound. This means that fixing this bug
breaks perf_ecc where
SANITY_CHECK(warpMat, 1e-3);
is just a little too tight and happens to work due to the uninitialized
values. Since this is a performance not a accuracy test I think it is OK
to just relax the error bound a little bit (the tight error bound being
after all the result of a bug).
2015-03-19 20:50:49 -04:00
Prof. Dr. Rudolf Haussmann
756c1a22d9
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-20 01:44:29 +01:00
Prof. Dr. Rudolf Haussmann
a7bf1d53d8
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: modules/highgui/include/opencv2/highgui/highgui_c.h
modified: modules/highgui/src/cap_dshow.cpp
modified: modules/highgui/src/cap_pvapi.cpp
modified: modules/java/generator/gen_java.py
Änderungen in der PvAPI hinzugefügt.
2015-03-20 01:42:16 +01:00
Luis Díaz Más
7711cd284b
Fix a bug that impede to set the trackbar pos using the Qt control panel
2015-03-19 21:25:10 +01:00
Dikay900
80069f384a
resolve crash of haarclassifier when using a tilted feature
2015-03-19 20:47:33 +01:00
Ying Xiong
decbdd1abb
Fix compiler error on std::swap (CUDA7.0/clang/OSX)
2015-03-19 14:23:44 -04:00
Boris Daskalov
8755ffbf31
Fix a bad free space check in icvGrowSeq.
...
A difference of two pointers was casted to unsigned which can lead to
overflow on 64-bit systems.
2015-03-19 17:32:32 +02:00
Vadim Pisarevsky
9683f93a76
Merge pull request #3840 from MSOpenTech:concurrency-contrib
2015-03-19 15:11:01 +00:00
Vadim Pisarevsky
9997e6d337
Merge pull request #3823 from lupustr3:pvlasov/implementation_detector_update
2015-03-19 12:47:22 +00:00
Maksim Shabunin
9f08310307
Disabled TrainData::getNormCatValues wrapping due to pointer in parameters
2015-03-19 15:45:34 +03:00
Maksim Shabunin
231685133e
OpenCV Manager: support 3.0.0 library
2015-03-19 15:27:14 +03:00
Vadim Pisarevsky
69344f175b
Merge pull request #3843 from piponazo:BugFix4244
2015-03-19 12:15:41 +00:00
Maksim Shabunin
5709ec85d7
Disabled missing python method for static ml function
2015-03-19 15:11:49 +03:00
Maksim Shabunin
5247eacc3c
Add python and java support for ml module
2015-03-19 13:22:30 +03:00
Luis Díaz Más
d14a1de947
Fixing the bug #4244 that I just reported in code.opencv.org
2015-03-18 20:07:08 +01:00
Maksim Shabunin
d5b954c2d4
Moved property implementation macros to private header
2015-03-18 17:33:12 +03:00
Maksim Shabunin
7335a40a61
Replaced CV_PURE_PROPERTY macros with corresponding code
2015-03-18 17:23:42 +03:00
Maxim Kostin
d1a8171011
Added WinRT concurrency support.
2015-03-18 15:13:08 +03:00
Olexa Bilaniuk
8a1d8c8470
Merge remote-tracking branch 'refs/remotes/upstream/master'
2015-03-18 02:21:36 -04:00
Olexa Bilaniuk
6d27d488bf
Bugfix in n* optimization.
...
Similar to the problem in LevMarq, arg.inl was being used instead of
best.inl. This opened us up to a potential segfault.
2015-03-18 02:21:16 -04:00
Alexander Smorkalov
514b3b520c
Documentation update after iOS warnings fix in contrib/retina header.
2015-03-17 19:25:05 +03:00
Philipp Hasper
e0efda7145
Fixed persistent.hpp documentation
...
Small error - object fs does not exist in this code example
2015-03-17 15:28:37 +01:00
Dmitry-Me
0c5faa6d24
Fix uninitialized members, fix log output typo
2015-03-17 14:47:00 +03:00
Vadim Pisarevsky
903f10c237
Merge pull request #3804 from polarfuchs99:master
2015-03-17 11:12:49 +00:00
Vadim Pisarevsky
0f4d57d59e
Merge pull request #3833 from sgrayb:houghline_bugfix
2015-03-17 10:37:10 +00:00
Vadim Pisarevsky
b708969326
Merge pull request #3832 from Dmitry-Me:fixNullPointerDereference3
2015-03-17 10:36:52 +00:00
Vadim Pisarevsky
8cf45ce0af
Merge pull request #3828 from vpisarev:fix_win32_perf_calib3d_solvepnp_failure
2015-03-17 10:34:53 +00:00
Dmitry-Me
52a8d37f11
Fix potential null pointer dereference
2015-03-16 18:36:12 +03:00
Vadim Pisarevsky
ca19ae8b5a
in solvePnPRansac call the solvePnP in the end with all the inliers to get more precise estimate
2015-03-16 16:56:26 +03:00
Vadim Pisarevsky
5c352c9146
temporarily use EPNP in SolvePnP instead of UPNP or DLS algorithms, since the latter two are not quite stable
2015-03-16 12:46:24 +03:00
Vadim Pisarevsky
3c54c50c5a
Merge pull request #3802 from sanuj:master
2015-03-16 09:25:41 +00:00
Vadim Pisarevsky
c6e9280373
Merge pull request #3816 from ilya-lavrenov:il/cvround
2015-03-16 09:09:55 +00:00
Vadim Pisarevsky
f9b2444735
Merge pull request #3826 from mshabunin:fix-install-paths
2015-03-16 09:08:54 +00:00
Vadim Pisarevsky
259a54a6dd
Merge pull request #3830 from NaerChang:issue.3710
2015-03-16 09:05:42 +00:00
Naer Chang
cdc9bc397d
Revert "issue 3710"
...
Trying to fix whitespace issue.
This reverts commit dcc2512f58
2015-03-14 18:32:46 -04:00
Olexa Bilaniuk
ac1099deb8
Merge remote-tracking branch 'refs/remotes/upstream/master'
2015-03-14 12:41:56 -04:00
Olexa Bilaniuk
7e3cc44738
More docs on variable accesses.
...
Listed accesses for more functions.
2015-03-14 12:41:25 -04:00
Dmitry-Me
8ed4bae4dd
Reduce variable scope, make formatting consistent with surrounding code
2015-03-14 12:50:42 +03:00
Naer Chang
dcc2512f58
issue 3710
...
added a check to prevent illegal access to operator[] when vector is empty
2015-03-14 02:56:29 -04:00
ippei ito
7d665a4754
Fix warn conversion from 'size_t' to 'int'. add comment for doxygen
2015-03-14 09:35:53 +09:00
Scott Graybill
3d2c0ed97f
Removed check on limits. A common use of HoughLines would be to restrict theta to be between a small negative number and a small positive number, e.g. -pi/16 to pi/16. This wasn't possible with the previous checks.
2015-03-13 17:04:13 -07:00
ippei ito
f7d52c774e
Fix compile error on linux change cv::InputArray& to cv::InputArray
2015-03-14 06:58:34 +09:00
ippei ito
8efdfd9dfc
Fix unused-parameter Warning
2015-03-14 06:07:55 +09:00
ippei ito
cd42e38013
FlannBasedMatcher(LshIndex) in the feature2d optimization for continuance additional train()
...
Current implementation of miniflann is releasing the trained index, and
rebuilding the index from the beginning.
But, some indexing algorithms like the LSH are able to add the indexing
data after that.
This branch is implementation of that optimization for LshIndex
FlannBasedMatcher in the feature2d.
2015-03-14 04:38:07 +09:00
Vadim Pisarevsky
1760078f67
trying to make solvePnPSmallPoints pass
2015-03-13 20:11:33 +03:00
Vadim Pisarevsky
7e07220440
made the solvepnp a bit more modest; test 5-point configuration instead of 4-point in some cases; reduce the noise in 4-point configurations in other cases
2015-03-13 18:04:23 +03:00
Vadim Pisarevsky
04f16965d5
Merge pull request #3780 from StevenPuttemans:fix_locale_master
2015-03-13 13:16:09 +00:00
Vadim Pisarevsky
133bd56436
Merge pull request #3769 from adamgreig:fix-py3-submodules
2015-03-13 13:15:51 +00:00
Maksim Shabunin
632afe6ae3
Fixed mangled install layout on unix machines
2015-03-13 14:18:37 +03:00
Pavel Vlasov
085409340e
Implementation collector update;
...
Moved out of TLS to properly collect data from different threads;
Concurrent access guards were added to collection functions;
2015-03-12 17:58:03 +03:00
Vadim Pisarevsky
06703c9d56
Merge pull request #3817 from SpecLad:forward-ports
2015-03-12 12:15:24 +00:00
ippei ito
518fd59a10
fixed whitespace error
2015-03-12 01:09:15 +09:00
ippei ito
49b38fe793
Fixed compile error build with VisualStudio2013 on windows.
...
REG_NONE defined in ml.hpp conflicts with defined in Winnt.h
2015-03-12 00:32:17 +09:00
Ilya Lavrenov
6f8b3fc633
cvRound
2015-03-11 16:14:39 +03:00
Adam Greig
211a131351
Fix Python3 binding's submodules
...
Previously the Python3 cv2 package ends up with no submodules (bgsegm, face,
etc) in it, which makes a lot of functionality unusable. By not writing over
our root reference we ensure the new submodules are added to the correct cv2
module.
2015-03-10 22:07:53 +00:00
Roman Donchenko
34ad2e0fa4
Fix a memory leak in CvCapture_FFMPEG::close
...
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
(cherry picked from commit 77578d415f
2015-03-10 12:48:46 +03:00
Roman Donchenko
6274e1fc5f
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
...
... before any exceptions occur.
(cherry picked from commit 08da247a87
2015-03-10 12:38:45 +03:00
Roman Donchenko
6b8ebf3e94
Fix memory leaks appearing when cvOpenFileStorage throws
...
(cherry picked from commit 16ce114e0c
2015-03-10 12:38:45 +03:00
Erik Karlsson
82c54104d6
Fix warnings on Win x64
2015-03-10 01:39:43 +01:00
Erik Karlsson
812edb5fdc
Fixed bug, maxDist() should reurn int, not double
2015-03-10 01:34:02 +01:00
Erik Karlsson
8aa0783995
Changed parameter type of fastNlMeansDenoising[Multi][Abs] from std::vector<float> to const std::vector<float>&
2015-03-09 23:47:49 +01:00
Vadim Pisarevsky
baf191fab2
Merge pull request #3771 from mshabunin:arm-round
2015-03-09 21:49:15 +00:00
Vadim Pisarevsky
3ee03a860d
Merge pull request #3803 from Dmitry-Me:doubleUsedAsBoolean
2015-03-09 21:47:09 +00:00
Vadim Pisarevsky
368213290f
Merge pull request #3806 from enpe:master
2015-03-09 21:44:33 +00:00
Vadim Pisarevsky
64bd77cf4d
Merge pull request #3794 from vpisarev:ubuntu_x86_fixes
2015-03-09 21:34:17 +00:00
Erik Karlsson
5a7118a88b
Merging in master
2015-03-09 22:00:58 +01:00
Erik Karlsson
b471f9ee26
Fixed call to tegra::fastNlMeansDenoising
2015-03-09 18:52:25 +01:00
hahne
1af4521239
fix for issue 1915
2015-03-09 16:19:47 +01:00
Erik Karlsson
4b5753daea
Corrected documentation
2015-03-09 16:11:18 +01:00
Erik Karlsson
a594a0677a
Cleanup
2015-03-09 16:00:24 +01:00
Erik Karlsson
c44488629a
Changed parameters of fastNlMeansDenoising[Multi][Abs] from float * to std::vector<float>
2015-03-09 15:52:16 +01:00
Nils Plath
ee55e4595c
- Fixed compile error that appeared with Clang 5.1 on Mac 10.8.5:
...
modules/videoio/src/cap_gstreamer.cpp:577:31: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
filename = "v4lsrc ! "COLOR_ELEM" ! appsink";
^
modules/videoio/src/cap_gstreamer.cpp:585:32: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
filename = "v4l2src ! "COLOR_ELEM" ! appsink";
2015-03-08 00:23:38 +01:00
Prof. Dr. Rudolf Haussmann
5e3d986ad8
Merge remote-tracking branch 'upstream/master'
2015-03-07 13:10:41 +01:00
Prof. Dr. Rudolf Haussmann
9f1eb70dbc
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: modules/java/generator/gen_java.py
modified: modules/videoio/include/opencv2/videoio.hpp
modified: modules/videoio/include/opencv2/videoio/videoio_c.h
modified: modules/videoio/src/cap_dshow.cpp
modified: modules/videoio/src/cap_pvapi.cpp
Following changes have been made:
1. Some minor bugs have been removed.
2. In the PvAPI module the option CAP_PROP_MONOCROME has been removed because
this option does not make sense and causes an error if a color camera is used.
3. Instead the new option CAP_PROP_PVAPI_PIXELFORMAT has been added which allows
to activate the different pixel formats (color modes) of an AVT camera.
4. Since there were two identical defines
CAP_PROP_MONOCROME = 19
CAP_PROP_MONOCHROME = 19
which were also used in the other module DSHOW, the first one with an orthographic
error has been removed in favor of the second one.
2015-03-07 12:53:32 +01:00
Erik Karlsson
21160137d4
Addition of test cases
2015-03-06 20:44:31 +01:00
Erik Karlsson
cc8d94c6fc
Addition of per-channel h-values for fastNlMeansDenoising[Multi][Abs]
2015-03-06 20:43:55 +01:00
Erik Karlsson
324fa26848
Refactoring of OpenCL implementation
2015-03-06 19:07:13 +01:00
Olexa Bilaniuk
9c432f4f75
Silence Windows warnings.
2015-03-06 12:16:38 -05:00
Olexa Bilaniuk
d6534912d8
Merge remote-tracking branch 'refs/remotes/upstream/master'
2015-03-06 09:25:01 -05:00
Olexa Bilaniuk
2113636d29
Made seed a constant.
2015-03-06 09:24:45 -05:00
Olexa Bilaniuk
fcdbacdbb0
Corrected initialization of smart pointer.
2015-03-06 09:15:00 -05:00
Erik Karlsson
41ffcc27dd
Added support for h = 0.0
2015-03-06 15:06:11 +01:00
Dmitry-Me
135701feac
Double used as boolean for no reason
2015-03-06 17:04:54 +03:00
sanuj
441cd22343
Add documentation for solvePnP in calib3d
2015-03-06 19:18:22 +05:30
Erik Karlsson
1e82a67cc4
Additional refactoring
2015-03-06 14:28:43 +01:00
Maksim Shabunin
ee2d7a1f39
Fixed warnings for iOS
2015-03-06 16:16:57 +03:00
Maksim Shabunin
451972f3cf
Added ARM implementation in cvRound function
...
- note: uses VFPv3 instructions
- also added overloaded cvRound variants with float and int parameters
- thanks to Marina Kolpakova from Itseez for idea
- thanks to developers from #llvm IRC channel for help with inline asm
2015-03-06 16:14:37 +03:00
StevenPuttemans
cef2cf2852
fixing locale settings - making it universal
2015-03-06 13:13:53 +01:00
Vadim Pisarevsky
5d8a1bf813
explained reason why IPP is disabled on 32-bit Linux. disable IPP's minMaxLoc_32f on 32-bit OSes only
2015-03-06 15:02:22 +03:00
Vadim Pisarevsky
361eb633f6
Merge pull request #3795 from samyak-268:sqr-filter-doc
2015-03-06 10:22:56 +00:00
Vadim Pisarevsky
fd7a76fe5d
Merge pull request #3796 from enpe:master
2015-03-06 10:21:57 +00:00
Vadim Pisarevsky
092f599aac
Merge pull request #3797 from Dmitry-Me:reduceVariableScope6
2015-03-06 10:20:45 +00:00
Vadim Pisarevsky
8c69266cbf
Merge pull request #3786 from jviney:fix_background_subtractor_knn_width_step
2015-03-06 10:17:43 +00:00
Dmitry-Me
2fb4178f7c
Reduce variable scope
2015-03-06 10:17:37 +03:00
Nils Plath
32d56c6b43
Fixed: wrong conversion of float-based Mat input inside the AKAZE.
2015-03-05 23:55:07 +01:00
Samyak Datta
20efcff166
Added doxygen comments for sqrBoxFilter() method
2015-03-06 03:50:51 +05:30
Erik Karlsson
c41efe4e30
Refactoring in preparation for per-channel h-values
2015-03-05 17:50:52 +01:00
Vadim Pisarevsky
7a52c3d9f1
1) make sure Python 2.7 is detected on Ubuntu (including libs) when it's there.
...
2) disable IPP on 32-bit Linux when OpenCV is built as shared libs. Otherwise we get linker errors
3) disable IPP's minMaxIdx 32-bit floating-point flavor in a hope that it fixes some test failures
2015-03-05 18:58:54 +03:00
Erik Karlsson
18be52c05b
Changed LUTs from IT to int
2015-03-05 13:55:06 +01:00
Erik Karlsson
305cff36e2
Changed from IT to int for distance calculation
2015-03-05 13:36:42 +01:00
Vadim Pisarevsky
aa113c5a85
Merge pull request #3787 from Dmitry-Me:fixNullPointerDereference2
2015-03-05 12:19:02 +00:00
Dmitry-Me
d164d51380
Fix potential null pointer dereference
2015-03-05 10:31:51 +03:00
Vadim Pisarevsky
f9b8ce1d25
Merge pull request #3784 from ilya-lavrenov:nvidia_android
2015-03-05 06:43:03 +00:00
Jonathan Viney
4f24dc0959
Fix KNN background subtraction not honoring width step.
2015-03-05 12:46:07 +13:00
Vadim Pisarevsky
0b99f6bcd6
Merge pull request #3777 from ilya-lavrenov:nvidia_cvtcolor_eps
2015-03-04 13:53:41 +00:00
Ilya Lavrenov
cf4c79ebdd
disabled some kernels for Android && NVidia
2015-03-04 14:46:49 +03:00
Vadim Pisarevsky
e4bc592c46
Merge pull request #3583 from oresths:tbb_canny
2015-03-04 10:49:27 +00:00
Vadim Pisarevsky
ebac739a35
Merge pull request #3781 from Dmitry-Me:dangerousStringManipulation
2015-03-04 10:45:25 +00:00
Olexa Bilaniuk
52e67c1a29
Whitespace & Doc fixes on lower half of rho.cpp.
...
Spaced methods & functions more consistently, and started documenting
which members does each method access directly or through its callers
within RHO_HEST_REFC.
2015-03-04 05:04:52 -05:00
Dmitry-Me
f8c454733b
Remove dangerous string manipulation, merge declaration with assignment
2015-03-04 10:35:06 +03:00
Olexa Bilaniuk
27fd810b6f
Silenced build warnings on Windows.
2015-03-04 02:09:59 -05:00
Olexa Bilaniuk
736b42b372
Refactorings and renamings.
...
- Deleted "RefC" from names of external-interface functions.
- Renamed rhorefc.[cpp|hpp] to rho.[cpp|hpp]
- Introduced RHO_HEST base class, from which RHO_HEST_REFC inherits.
- rhoInit() currently only returns a Ptr<RHO_HEST_REFC>, but in the
future it will be allowed to return pointers to other derived classes,
depending on the values returned by cv::checkHardwareSupport().
2015-03-04 01:43:13 -05:00
Olexa Bilaniuk
3a4d9a77b2
Merge remote-tracking branch 'refs/remotes/upstream/master'
2015-03-03 23:15:05 -05:00
Olexa Bilaniuk
408f93340a
External interface converted to use OpenCV Ptr<> smart pointer.
2015-03-03 23:12:33 -05:00
Olexa Bilaniuk
f592321771
Internal buffers converted to use OpenCV dynamic memory allocation.
2015-03-03 22:57:40 -05:00
Vadim Pisarevsky
4bb496409c
Merge pull request #3779 from Dmitry-Me:uniformComputationOfVariableSize
2015-03-03 18:51:56 +00:00
Vadim Pisarevsky
4701b22e14
Merge pull request #3607 from soyersoyer:yuyv_pixfmt
2015-03-03 18:15:50 +00:00
Olexa Bilaniuk
bb01231990
Substituted the NaN check with OpenCV's implementation.
2015-03-03 13:06:36 -05:00
Olexa Bilaniuk
e7d5e57264
Merge remote-tracking branch 'refs/remotes/upstream/master'
2015-03-03 11:56:03 -05:00
Olexa Bilaniuk
16f36a5fda
Replaced division by reciprocal + multiply in a few places.
2015-03-03 11:55:36 -05:00
Olexa Bilaniuk
e1abc416cf
Changed seeding in initialization.
...
The call to rand()/random() is now a call to (unsigned)cv::theRNG().
2015-03-03 11:48:41 -05:00
Olexa Bilaniuk
0f6ea38eac
Added OPENCV_ prefix to #include guard.
2015-03-03 11:42:04 -05:00
Olexa Bilaniuk
a2affe70d9
Deleted last remnants of restrict keyword.
2015-03-03 11:40:44 -05:00
Vadim Pisarevsky
dcff28b778
Merge pull request #3717 from Dmitry-Me:removeUnneededIndirections
2015-03-03 16:15:25 +00:00
Dmitry-Me
c587bae997
Uniform computation of variable size
2015-03-03 16:11:07 +03:00
Olexa Bilaniuk
b229d6b7ac
Moved constants to cv:: namespace.
2015-03-03 08:05:52 -05:00
Vadim Pisarevsky
6820292256
Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib
2015-03-03 12:52:03 +00:00
Vadim Pisarevsky
d3b74cdcb2
Merge pull request #3773 from ilya-lavrenov:warning
2015-03-03 12:33:17 +00:00
Ilya Lavrenov
26eebb3ee3
increased EPS for cvtColor for NVIDIA
2015-03-03 15:26:51 +03:00
Dmitry-Me
1b7066fc95
Reduce variable scope, only compute values that are used later
2015-03-03 11:04:22 +03:00
Erik Karlsson
69eae13ff3
Changed pointers from sample_t * to uchar *. Rescaling psz accordingly.
2015-03-03 03:02:44 +01:00
Erik Karlsson
d56d04e41b
Updated documentation
2015-03-03 01:34:29 +01:00
Erik Karlsson
ac6771f975
Added test cases
2015-03-03 01:20:33 +01:00
Erik Karlsson
ae08884854
Added support for 4-component input for fastNlMeansDenoising[Multi][Abs]
2015-03-03 01:19:34 +01:00
Olexa Bilaniuk
ed2a23768e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2015-03-02 17:55:34 -05:00
Erik Karlsson
87760d13fb
Cleanup and addition of 4-component support for ocl_fastNlMeansDenoising
2015-03-02 22:33:14 +01:00
Vadim Pisarevsky
7c7a63bebc
Merge pull request #3772 from Dmitry-Me:reduceVariableScope4
2015-03-02 19:52:18 +00:00
Maxim Kostin
22a30af353
Fixing buildbot job:
...
- explicitly turning OCL off since WinRT does not support it
- fixing macro definitions in core/ocl.cpp
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:45 +03:00
Maxim Kostin
cdd23440c9
Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1
...
- Substituted HAVE_WINRT with WINRT
- Fixed compilation issues in ocl.cpp and parallel.cpp
- Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore
- Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp
- Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c;
- Added ole32.lib for core module (for WindowsStore 8.0 builds)
- Made OpenCV_ARCH aware of ARM
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:43 +03:00
Maksim Shabunin
37c74e38f4
Python support
2015-03-02 18:13:00 +03:00
Maksim Shabunin
457123027e
Modified java wrapping mechanism
2015-03-02 18:12:30 +03:00
Erik Karlsson
50bb14a0a8
Avoiding unnecessary copy by creating borders in place after RGB -> RGBA conversion
2015-03-02 15:48:00 +01:00
Ilya Lavrenov
ffc453ebfd
fixed [-Wsign-compare] warning
2015-03-02 16:41:06 +03:00
Dmitry-Me
4e582b131b
Reduce veriables scope, move declaration to first use
2015-03-02 16:27:48 +03:00
Vadim Pisarevsky
5850a9b8c3
Merge pull request #3744 from es0m:remotes/upstream/2.4.10.x-prep
2015-03-02 11:38:25 +00:00
Vadim Pisarevsky
ac8045b9c6
Merge pull request #3754 from eliteraspberries:unsigned-mask
2015-03-02 11:34:43 +00:00
Vadim Pisarevsky
417f1e51a4
Merge pull request #3755 from eliteraspberries:mat-size-sign
2015-03-02 11:34:09 +00:00
Vadim Pisarevsky
e43a14ccd2
Merge pull request #3750 from Dmitry-Me:reduceVariableScope3
2015-03-02 10:55:37 +00:00
Vadim Pisarevsky
de0997ab32
Merge pull request #3749 from alalek:fix_android_camera_master
2015-03-02 10:55:16 +00:00
Vadim Pisarevsky
0172bd6beb
Merge pull request #3756 from eliteraspberries:cast-double
2015-03-02 10:52:28 +00:00
Vadim Pisarevsky
8e37a693e5
Merge pull request #3758 from ilya-lavrenov:aarch64
2015-03-02 10:50:31 +00:00
Vadim Pisarevsky
845d3edb67
Merge pull request #3757 from ilya-lavrenov:popcnp
2015-03-02 10:50:08 +00:00
Vadim Pisarevsky
e02d6e2c8f
Merge pull request #3766 from StevenPuttemans:add_GPU_old_models
2015-03-02 10:49:38 +00:00
Vadim Pisarevsky
f3f2f8ba97
Merge pull request #3764 from jet47:runtime-disable-optimizations
2015-03-02 10:35:18 +00:00
Vadim Pisarevsky
7458dfc082
Merge pull request #3765 from jet47:gpu-hog-fix
2015-03-02 10:34:51 +00:00
Vladislav Vinogradov
c849492dfa
fix tests for gpu HOG
...
initialize HOG after CUDA device switch
2015-03-02 11:02:47 +03:00
Erik Karlsson
73663dcdd1
Added support for 16-bit input
2015-03-02 03:29:17 +01:00
Erik Karlsson
3bde9e9365
Added test cases
2015-03-01 22:22:09 +01:00
Erik Karlsson
a9ff335a89
Added OpenCL support for FastNlMeansDenoisingAbs
2015-03-01 22:21:36 +01:00
Erik Karlsson
9f7cac8c59
Addtion of test cases for CV_8UC3
2015-03-01 21:01:57 +01:00
Erik Karlsson
0fdb95e195
Refactoring and addition of CV_8UC3 to ocl_fastNlMeansDenoising
2015-03-01 20:59:34 +01:00
Vladislav Vinogradov
4f5d30a865
fix GpuMat::setTo implementation
...
previous implementation was not thread/stream safe, since it used constant
memory
new implementation doesn't use any global objects, so it is thread/stream safe
2015-02-27 16:28:06 +03:00
StevenPuttemans
aea328e326
fixing CUDA cascade classifiers function and needed models
2015-02-27 14:20:27 +01:00
StevenPuttemans
2c0ef660bf
Add GPU models in seperate folder, only old models are supported and they were replaced to make the CPU interface work.
...
This solves the undesired consequence of breaking the GPU interface.
2015-02-27 14:15:30 +01:00
Vladislav Vinogradov
21bbed7baf
fix gpu HOG implementation:
...
move hog::set_up_constants from constructor to compute method
if user changed CUDA device between constructor and computation,
some variables were uninitialized
2015-02-27 14:28:12 +03:00
Vladislav Vinogradov
4254e35f6a
merge new setUseOptimizations function with existed setUseOptimized
2015-02-27 14:24:51 +03:00
Vladislav Vinogradov
4800a34be3
do not dump OpenCL info if it is disabled
2015-02-27 12:52:44 +03:00
Vladislav Vinogradov
c10f1851cb
rename setOptimizations -> setUseOptimizations
2015-02-27 12:52:28 +03:00
Vladislav Vinogradov
cda6fed41f
move tegra namespace out of cv to prevent conflicts
2015-02-27 12:52:11 +03:00
Olexa Bilaniuk
5748cea80d
Removed unnecessary precision in damped Cholesky decomposition.
...
Cholesky decomposition is stable; It is not necessary to carry it out
internally at double precision if the result will be truncated to single
precision when stored.
2015-02-26 21:47:29 -05:00
Vladislav Vinogradov
d696fac8b8
move cuda tests from core to cudaarithm
2015-02-26 19:49:12 +03:00
Ilya Lavrenov
c5a80193a8
aarch64 support
2015-02-26 19:43:32 +03:00
Vladislav Vinogradov
57b8640a76
disable all optimizations for CUDA tests
2015-02-26 19:36:13 +03:00
Vladislav Vinogradov
12180bd7b1
add generic method to disable/enable all optimizations (IPP, OpenCL, Tegra)
2015-02-26 19:36:04 +03:00
Vladislav Vinogradov
44e41baffe
use new functions before all tegra:: calls
2015-02-26 19:34:58 +03:00
Vladislav Vinogradov
f8484e3266
add fucntion to control tegra optimizations in run-time
2015-02-26 19:34:20 +03:00
Olexa Bilaniuk
59d6279d4b
Merge remote-tracking branch 'refs/remotes/upstream/master'
2015-02-25 20:26:42 -05:00
Ilya Lavrenov
b963d84b41
fixed bug #4215
2015-02-25 21:57:17 +03:00
Alexander Smorkalov
f73a97b53b
Merge pull request #3751 from jet47:gpu-bmoptflow-test-epsilon
2015-02-25 11:54:44 +00:00
Vladislav Vinogradov
c147ab1e85
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
2015-02-25 13:16:36 +03:00
Dmitry-Me
2311504c44
Reduce variables scope
2015-02-25 10:38:44 +03:00
Mansour Moufid
7d4cbbd7aa
Cast a long integer to double explicitly.
2015-02-24 17:04:28 -05:00
Mansour Moufid
b7be49426d
Cast some image coordinates and sizes to double.
2015-02-24 12:21:34 -05:00
Alexander Alekhin
52effe9e72
Android: fix JavaCameraView implementation
...
1) Fixed deadlock if camera is started and stopped immediately
2) Invalid pattern usage of Object.wait(). Refer to "spurious wakeup": http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait
3) Fixed buffer usage:
a) fix eliminates processing of zero NV12 (green in RGB) first frame
b) latest ready frame is delivered for processing (not previous)
2015-02-24 18:52:54 +03:00
Vadim Pisarevsky
bdb088dcca
Merge pull request #3712 from jet47:fix-cuda-build-on-windows
2015-02-24 15:39:01 +00:00
Vadim Pisarevsky
b64b82a1ef
Merge pull request #3734 from Dmitry-Me:reduceVariableScope2
2015-02-24 15:38:19 +00:00
Vadim Pisarevsky
0016f6d73d
Merge pull request #3736 from nisargthakkar:Bug3634_master
2015-02-24 15:38:02 +00:00
Vadim Pisarevsky
5dc569866e
Merge pull request #3743 from StevenPuttemans:fix_3887_master
2015-02-24 15:37:13 +00:00
Maksim Shabunin
1fe1ebf20c
Merge pull request #3728 from StevenPuttemans:fix_3714_master
2015-02-24 10:09:22 +00:00
Maksim Shabunin
d56dd0e091
Merge pull request #3727 from StevenPuttemans:fix_3714_2.4
2015-02-24 10:08:43 +00:00
Maksim Shabunin
baabd95f30
Merge pull request #3740 from StevenPuttemans:fix_3028_2.4
2015-02-24 10:06:20 +00:00
Maksim Shabunin
02488215e6
Merge pull request #3741 from StevenPuttemans:fix_3028_master
2015-02-24 10:05:16 +00:00
Mansour Moufid
42b1c6440c
Cast some matrix sizes to type int.
2015-02-23 23:19:33 -05:00
Mansour Moufid
35a89b1541
Change some vector mask types to unsigned.
2015-02-23 23:10:57 -05:00
Eric Sommerlade
998a909705
fixed whitespace issues
2015-02-23 08:15:34 -07:00
StevenPuttemans
6902fa6b1c
fix formula getGaussianKernel in docs
2015-02-23 15:23:02 +01:00
StevenPuttemans
7401b02022
fix ellipse fitting notice
2015-02-23 15:05:55 +01:00
StevenPuttemans
720fd144ef
add fit ellipse technique notice
2015-02-23 14:59:40 +01:00
Eric Sommerlade
a07d7a70a0
added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html
2015-02-23 06:12:42 -07:00
Olexa Bilaniuk
eb7a7884f6
Merge remote-tracking branch 'refs/remotes/upstream/master'
2015-02-21 12:32:25 -05:00
Olexa Bilaniuk
f454929d9c
PRNG changes: xorshift128+ algorithm, and seeding API.
...
- Switched to the extremely fast, while simple and high-quality,
xorshift128+ PRNG algorithm by Sebastiano Vigna in "Further scramblings
of Marsaglia's xorshift generators. CoRR, abs/1402.6246, 2014" (2^128-1
period, passes BigCrush tests). Performance improved by 10% over
random().
- Added an API to allow seeding with a specified seed, rather than using
rand() or random(). This allows deterministic, reproducible results in
tests using our algorithm (although findHomography() does not yet
support passing an entropy source on its own end).
2015-02-21 12:31:55 -05:00
Nisarg Thakkar
b8f65d0252
Same as Bug #3309 . Pushing to master
2015-02-21 09:20:00 +05:30
Andrey Pavlenko
c059f7ddcd
Merge pull request #3726 from asmorkalov:ocv_version_inc4
2015-02-20 16:11:58 +00:00
Dmitry-Me
53566f2ec0
Reduce variable scope, fix indenting
2015-02-20 17:46:48 +03:00
Olexa Bilaniuk
0ea009f611
Merge remote-tracking branch 'refs/remotes/upstream/master'
2015-02-20 08:26:04 -05:00
Ilya Lavrenov
5f7a994ad1
fixed internal compiler error
2015-02-20 15:46:22 +03:00
Vadim Pisarevsky
85fd599939
Merge pull request #3588 from vpradeep07:feature/deterministic_pnpransac
2015-02-20 12:32:35 +00:00
StevenPuttemans
350dccf84a
fix error 3714
2015-02-20 13:30:40 +01:00
Vadim Pisarevsky
99ae48f0b4
Merge pull request #3707 from alalek:fix_android_camera
2015-02-20 12:27:13 +00:00
Alexander Smorkalov
96e5300fdd
OpenCV and OpenCV Manager version++
2015-02-20 15:17:11 +03:00
Simon Heinen
5d97dd0ea5
Update android+AsyncServiceHelper.java
2015-02-20 12:54:54 +01:00
StevenPuttemans
4f621de849
fix bug 3714 2.4 branch
2015-02-20 12:39:31 +01:00
Vadim Pisarevsky
7b270f4c69
Merge pull request #3679 from mshabunin:remove-algorithm-factory
2015-02-19 18:43:58 +00:00
Vadim Pisarevsky
65e4df751c
Merge pull request #3705 from SpecLad:unused-nNull
2015-02-19 18:40:22 +00:00
theodore
cfccdc9b0c
documenting findnonzero() function
2015-02-19 17:57:52 +01:00
theodore
453f384bd7
adding documentation for the findnonzero() function
2015-02-19 17:38:44 +01:00
Dmitry-Me
98a8045aaf
Reduce variable scope
2015-02-19 13:10:02 +01:00
Olexa Bilaniuk
f148f23382
Merge remote-tracking branch 'refs/remotes/upstream/master'
2015-02-18 21:04:39 -05:00
Alexander Alekhin
4e8aac5308
Merge pull request #3683 from SeninAndrew:2.4
2015-02-18 17:15:10 +00:00
Dmitry-Me
c4c3e4fe83
Remove unneeded indirections
2015-02-18 18:25:17 +03:00
Erik Karlsson
8e7aff4486
Changed fastNlMeansDenoising and fastNlMeansDenoisingMulti back to sum of sq distances. Moved sq sum of abs distances to fastNlMeansDenoisingAbs and fastNlMeansDenoisingMultiAbs
2015-02-18 14:59:52 +01:00
Vadim Pisarevsky
6ff2f395e6
Merge pull request #3702 from Dmitry-Me:reduceVariableScope
2015-02-18 13:55:58 +00:00
Vadim Pisarevsky
b64e106bb1
Merge pull request #3703 from BKNio:fixing_bad_alloc
2015-02-18 13:50:14 +00:00
Vadim Pisarevsky
1d356b6a48
Merge pull request #3714 from uqtimes:fixUIImageToMat
2015-02-18 13:49:14 +00:00
Vadim Pisarevsky
87f86b31fa
Merge pull request #3715 from mshabunin:enable-stl
2015-02-18 12:12:14 +00:00
Maksim Shabunin
553020c448
Enabled STL usage within the library
2015-02-18 12:36:50 +03:00
UQ Times
1944443d10
iOS: fix crash from overrelease in UIImageToMat
...
- previous pull request: https://github.com/Itseez/opencv/pull/3340
2015-02-18 13:30:08 +09:00
Erik Karlsson
e647b7c7e8
Calculating almost_dist2weight at full size to avoid bounds checking
2015-02-17 23:08:36 +01:00
Erik Karlsson
baf266c29e
Changed from sum of squared differences to sum of abs differences
2015-02-17 21:30:52 +01:00
Vladislav Vinogradov
671b59aa9d
fix windows build with CUDA
...
rename cv::cuda::internal namespace
to cv::cuda::device to prevent conflicts
with cv::internal
2015-02-17 21:50:39 +03:00
Vijay Pradeep
4ce31c7c1a
Merge remote-tracking branch 'itseez/2.4' into feature/deterministic_pnpransac
2015-02-17 10:16:44 -08:00
Vijay Pradeep
49bc100e51
Removing rng_seed arg in order to maintain ABI compatibility. Hardcoding seed
2015-02-17 09:19:36 -08:00
Maksim Shabunin
79e8f0680c
Updated ml module interfaces and documentation
2015-02-17 11:46:14 +03:00
Alexander Alekhin
dc21a0a6b5
Android: fix JavaCameraView implementation
...
1) Fixed deadlock if camera is started and stopped immediately
2) Invalid pattern usage of Object.wait(). Refer to "spurious wakeup": http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait
3) Fixed buffer usage:
a) fix eliminates processing of zero NV12 (green in RGB) first frame
b) latest ready frame is delivered for processing (not previous)
2015-02-17 01:28:43 +03:00
exeltior
b51805e245
Update mser.cpp
...
Need to initialize boolean variable pass2Only, otherwise the result is not predictable
2015-02-16 18:17:41 +01:00
Roman Donchenko
d218f28070
cap_msmf.hpp: fix a warning about nNull being unused
...
The two functions featuring nNull are not particularly needed, so
I simply removed them.
2015-02-16 19:31:51 +03:00
Vadim Pisarevsky
d1a15097fe
Merge pull request #3664 from wangyan42164:ocl_cascasde_barrier
2015-02-16 15:42:26 +00:00
Ahmatnurov Dinar
21ee113af3
fixig std::bad_alloc
...
if points0 is empty checkVector(2) return -1, it causes the exception
2015-02-16 17:15:54 +03:00
Dmitry-Me
103687871d
Reduce variable scope
2015-02-16 15:39:52 +03:00
Maksim Shabunin
da383e65e2
Remove deprecated methods from cv::Algorithm
2015-02-16 15:28:54 +03:00
Vadim Pisarevsky
d509ecd19a
Merge pull request #3666 from mshabunin:meta-module
2015-02-16 11:43:30 +00:00
Vadim Pisarevsky
6a3a6416d7
Merge pull request #3698 from SpecLad:avcodec-free-frame
2015-02-16 11:33:00 +00:00
Vadim Pisarevsky
edab3916aa
Merge pull request #3696 from Dmitry-Me:shouldPassByReference
2015-02-16 11:29:22 +00:00
Vladislav Vinogradov
a932d8aba1
use full qualified name for all internal namespaces to prevent ambiguous symbol errors
2015-02-16 11:31:21 +03:00
Olexa Bilaniuk
5d79b1092f
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
2015-02-13 08:12:11 -05:00
Olexa Bilaniuk
e5696bc5e6
Whitespace change reverts to minimize delta w.r.t master.
2015-02-13 08:07:15 -05:00
Erik Karlsson
c339720af9
Preparation for 16-bit colored denoising. Currently not working due to cvtColor not supportint 16-bit Lab conversion.
2015-02-13 13:38:37 +01:00
Roman Donchenko
77578d415f
Fix a memory leak in CvCapture_FFMPEG::close
...
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
2015-02-13 15:12:52 +03:00
Hamid Bazargani
e22678018b
Fix sacCalcJacobianErrors arguments. (curr.inl replaced with best.inl)
...
Fix the issue given NULL inlMask
2015-02-13 00:30:18 -05:00
Hamid Bazargani
42176f8eb1
Fix sacCalcJacobianErrors arguments. (curr.inl replaced with best.inl)
...
Fix the issue given NULL inlMask
2015-02-13 00:09:37 -05:00
ASUS
9a555063e8
Fix sacCalcJacobianErrors arguments. (curr.inl replaced with best.inl)
...
Fix the issue given NULL inlMask
2015-02-12 23:34:48 -05:00
Erik Karlsson
584372bbf2
Fixed bounds checking
2015-02-13 04:33:29 +01:00
ASUS
6b04351ce1
Merge branch 'accuracy' of https://github.com/obilaniu/opencv into accuracy
...
Conflicts:
modules/calib3d/src/rhorefc.cpp
2015-02-12 21:27:08 -05:00
ASUS
6dbf13d7b5
saveBestModel() is modified. accuracy test is passed.
2015-02-12 21:22:52 -05:00
Thomas Gabrowski
ff4c42d182
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
2015-02-13 00:51:03 +00:00
Erik Karlsson
d588c717da
Using WEIGHT_THRESHOLD to limit table size. Still problematic with 16-bit and big h-values.
2015-02-13 00:11:30 +01:00
Erik Karlsson
42db9e7153
Basic 16-bit implmentation of fastNlMeansDenoising. Table-based exponetiation leads to high memory footprint and loss of precision in 16-bit mode.
2015-02-12 22:14:01 +01:00
Erik Karlsson
49e93747b1
Added saturate_cast from int64 and uint64
2015-02-12 22:05:05 +01:00
Olexa Bilaniuk
ff2509af56
Fixed printouts in testcase to blame the correct method for a failure.
...
Previously, certain test failures by the method RHO would result in an
error blaming RANSAC instead. The fix involves a parameter change to
several functions in test_homography.cpp.
2015-02-12 14:42:37 -05:00
Erik Karlsson
8368fb9ea8
Additional refactoring preparing for 16-bit implementation
2015-02-12 18:45:09 +01:00
Dmitry-Me
c3f8fc41b7
Parameters should have been passed by reference
2015-02-12 17:32:43 +03:00
Erik Karlsson
e178294b49
Refactoring in preparation for 16-bit implementation of fastNlMeansDenoising
2015-02-12 15:23:28 +01:00
Maksim Shabunin
a5a510da4b
Support for compound modules, support for contrib_world
2015-02-10 18:30:05 +03:00
Vadim Pisarevsky
5466e321b8
Merge pull request #3687 from Dmitry-Me:fixPossibleNullPtrDeref
2015-02-10 12:17:11 +00:00
Andrew Senin
b9a6edfe3d
Fixing XIMEA parameters mapping (issue #4176 )
2015-02-09 15:15:23 +03:00
Dmitry-Me
ea48fcfc9f
Fix possible null pointer dereference
2015-02-09 12:38:02 +03:00
Olexa Bilaniuk
ccd33a721e
Fixed build failures related to designSPRTTest().
2015-02-07 01:19:40 -05:00
Olexa Bilaniuk
7e273396c1
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
2015-02-07 01:08:10 -05:00
Olexa Bilaniuk
adac8c04bb
Converted to C++ style, + bugfixes.
...
The code has been refactored in response to feedback on Pull Request
Also, outputZeroH() now also zeroes the inlier set, much like
outputModel().
2015-02-07 00:56:58 -05:00
Andrew Senin
8c7b3b91fa
Fixing XIMEA parameters mapping (issue #4176 )
2015-02-07 00:50:23 +03:00
Vadim Pisarevsky
6c8681a472
Merge pull request #3656 from SeninAndrew:master
2015-02-06 11:49:27 +00:00
Vadim Pisarevsky
1e47c6cc56
Merge pull request #3612 from guoyejun:fix_face_detect
2015-02-05 07:50:13 +00:00
Vadim Pisarevsky
cd1ca7b08b
Merge pull request #3667 from AfterEight:cap_ximea_setResolution_bugfix
2015-02-05 07:48:43 +00:00
Vadim Pisarevsky
3f86e7b75a
Merge pull request #3668 from mshabunin:fix-ann-memory-access
2015-02-05 07:33:49 +00:00
Olexa Bilaniuk
87c2b8197a
Bug fixes in mask output.
...
Previously, the output mask of inliers could remain completely
uninitialized. This fix is the first part of a solution.
2015-02-05 02:18:41 -05:00
Olexa Bilaniuk
b90800f0c7
Corrected typo in comment.
...
The inverted JtJ does not multiply itself, but rather Jte. Correct this
in the comment.
2015-02-04 12:12:14 -05:00
Vadim Pisarevsky
5253265342
Merge pull request #3671 from jet47:disable-gpu-match-template-tests
2015-02-04 13:17:26 +00:00
Alexander Alekhin
2054123890
coreTlsData -> getCoreTlsData()
2015-02-04 13:03:27 +03:00
Vladislav Vinogradov
7bb8c50080
disable gpu::matchTemplate tests
2015-02-04 11:21:17 +03:00
Olexa Bilaniuk
2609e77af7
Silence spurious loss-of-data warnings from Windows.
...
Added explicit casts to silence warnings in fundam.cpp and rhorefc.cpp.
2015-02-04 02:26:01 -05:00
Olexa Bilaniuk
ce0570b777
Splitting vectorized code into separate branch.
...
Deleted SSE code from master branch.
Slight cleanups in fundam.cpp were made as a consequence.
2015-02-03 23:33:52 -05:00
Olexa Bilaniuk
69b146412a
Edited Doxygen documentation in the module calib3d.
...
Added a mention within calib3d.hpp that the flag RHO is available as an
option on calls to findHomography().
2015-02-03 22:55:40 -05:00
Olexa Bilaniuk
8907e6feac
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
2015-02-03 22:50:45 -05:00
Maksim Shabunin
c85197da55
Fixed allocated vector size in ML ANN algorithm
...
- updated return value of points_classifier sample
2015-02-03 18:16:20 +03:00
AfterEight
e938563de5
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)
2015-02-02 15:04:29 +01:00
Vadim Pisarevsky
4c52dfc956
Merge pull request #3657 from BelBES:sb/tegra_optimization_fix
2015-02-02 10:18:59 +00:00
Vadim Pisarevsky
71a333dd78
Merge pull request #3644 from mshabunin:ml-docs
2015-02-02 10:08:40 +00:00
Vadim Pisarevsky
72194b2115
Merge pull request #3651 from mshabunin:shape-test
2015-02-02 10:07:01 +00:00
Yan Wang
99aaf4030a
Remove unnecessary barrier in runHaarClassifier().
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-02-02 16:55:11 +08:00
sergei
0d72420480
HAVE_TEGRA_OPTIMIZATION was fixed
2015-01-30 11:57:35 +03:00
Andrew Senin
52535b356c
Fix for assert in compute when subimage is used (see issue #4149 )
2015-01-29 21:39:07 +04:00
Vadim Pisarevsky
7e1068919b
Merge pull request #3587 from vpradeep07:fix/pnpransac_race_cond
2015-01-29 12:12:18 +00:00
Alexander Alekhin
f282fd0ebf
ocl: print missing error message only if OPENCV_OPENCL_RUNTIME is used
2015-01-29 13:16:31 +03:00
Vadim Pisarevsky
97aa8d3341
Merge pull request #3603 from alalek:ocl_svm
2015-01-29 05:35:46 +00:00
Vadim Pisarevsky
bdebf4cea7
Merge pull request #3637 from wangyan42164:LBP_mad24_opt
2015-01-28 18:51:52 +00:00
Vadim Pisarevsky
f3311f9e2a
Merge pull request #3638 from jet47:remove-cuda-module
2015-01-28 18:51:32 +00:00
Maksim Shabunin
cf0a29ce4d
Fixed win64 compile warning
2015-01-28 18:11:53 +03:00
Maksim Shabunin
10639c9526
Shape module tests refactored
...
- common operations moved to separate class
- debug console messages removed
- test results are stored in memory instead of file
2015-01-28 17:01:37 +03:00
Alexander Karsakov
c481e06e87
Fixed getPolicy() method to make it thread-safe.
...
(cherry picked from commit 8910508b83
2015-01-27 19:20:35 +03:00
Maksim Shabunin
53c9460454
Reorganized ML module documentation
...
- fixed one BiB record
- moved algorithms overview to separate page
- added docs for some enumerations
- fixed some small documentation errors
2015-01-23 23:43:06 +03:00
Alexander Alekhin
0a07d780e0
ocl: OpenCL SVM support
2015-01-23 20:37:45 +03:00
Alexander Alekhin
58ad952b1a
UMat: added USAGE_ALLOCATE_SHARED_MEMORY
2015-01-23 18:44:12 +03:00
Ilya Lavrenov
dcb0c68ed3
fix for -m32
2015-01-23 17:26:48 +03:00
Vladislav Vinogradov
c9e07bbc95
exclude compactPoints and calcWobbleSuppressionMaps from compilation
...
if they are not needed
2015-01-22 16:36:16 +03:00
Vladislav Vinogradov
6ebc95470b
fix videostab compilation without CUDA
2015-01-22 15:02:22 +03:00
Vladislav Vinogradov
2660eee961
restore CUDA module introduction
...
put it into core documentation
2015-01-22 15:02:21 +03:00
Vladislav Vinogradov
a0691289f9
fix cudalegacy sanity test
2015-01-22 15:02:21 +03:00
Vladislav Vinogradov
124ac15f1e
remove cuda module
2015-01-22 15:02:21 +03:00
Vladislav Vinogradov
ce0e595a4f
move the rest cuda functions to cuda legacy
2015-01-22 15:02:21 +03:00
Vladislav Vinogradov
f1e1785386
move vstab related CUDA routines to vstab module
2015-01-22 15:02:20 +03:00
Vladislav Vinogradov
b416e8715d
move labeling routines from cuda to cudalegacy
2015-01-22 15:02:20 +03:00
Vadim Pisarevsky
3f1fb281be
Merge pull request #3635 from jet47:cuda-optflow-refactoring
2015-01-22 09:45:19 +00:00
Vadim Pisarevsky
9c81338cb9
Merge pull request #3505 from karelknoest:lsd_subpixel
2015-01-22 09:44:29 +00:00
Vadim Pisarevsky
f93be25cc8
Merge pull request #3629 from nstiurca:matx-fix
2015-01-22 09:43:33 +00:00
Yan Wang
df697f6520
Optimize runLBPClassifierStumpSimple by built-in mad24.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-01-22 16:36:16 +08:00
Vadim Pisarevsky
4949f70860
Merge pull request #3633 from mshabunin:fix-gdal-warning
2015-01-21 13:07:53 +00:00
Vladislav Vinogradov
62f8240b00
fix videostab module compilation
2015-01-21 15:50:21 +03:00
Vladislav Vinogradov
03ae1e5aae
fix superres module compilation
2015-01-21 15:50:21 +03:00
Vladislav Vinogradov
2dc3b0f7f9
fix cudaoptflow tests build
2015-01-21 15:50:21 +03:00
Vladislav Vinogradov
381216aa54
refactor cudaoptflow public API:
...
* use opaque algorithm interfaces
* add stream support
2015-01-21 15:50:21 +03:00
Vladislav Vinogradov
19c6bbe7d9
move obsolete algorithms from cudaoptflow to cudalegacy
2015-01-21 15:50:21 +03:00
Vladislav Vinogradov
c4b2058d23
simplify TVL1 accuracy test to reduce run time
2015-01-21 15:50:21 +03:00
Vladislav Vinogradov
71c391cd8d
remove unused memory transfer from TVL1 CUDA implementation
...
it caused runtime failures
2015-01-21 15:50:21 +03:00
Maksim Shabunin
036b13ee05
Fixed GDAL loader check
2015-01-21 14:01:21 +03:00
Vadim Pisarevsky
cc1090cf3b
Merge pull request #3521 from ana-GT:registration_openni2
2015-01-21 10:48:23 +00:00
Vadim Pisarevsky
bd4580a242
Merge pull request #3589 from JBosch:master
2015-01-21 10:46:53 +00:00
Vadim Pisarevsky
03fc3d1ceb
Merge pull request #3591 from ilya-lavrenov:sse_avx
2015-01-21 10:46:23 +00:00
Vadim Pisarevsky
b49fa7d384
Merge pull request #3625 from wangyan42164:ocl_cascade_deadlock
2015-01-21 10:43:50 +00:00
Vadim Pisarevsky
479cac2a14
Merge pull request #3626 from jet47:cuda-bgsegm-refactoring
2015-01-21 10:40:47 +00:00
Maksim Shabunin
1a15596f21
Fixed build warning in GDAL support module
2015-01-21 12:53:50 +03:00
Nicu Știurcă
8722faa167
fix whitespace
2015-01-20 23:58:05 -05:00
Nicu Știurcă
7a3ca99894
fix _OutputArray::assign() for _OutputArrays of type MATX when data types differ
2015-01-20 23:49:04 -05:00
Olexa Bilaniuk
045f8294bb
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
2015-01-20 13:11:09 -05:00
Ilya Lavrenov
e9a6c5db21
sqsum
2015-01-20 21:10:06 +03:00
karelknoest
b5bd2fd880
Improved documentation and method comment to clarify that LineSegmentDetector::detect method accepts both Vec4i and Vec4f as return vector.
2015-01-20 17:05:57 +01:00
karelknoest
1ded2de2dd
Let LineSegmentDetector output line segment coordinates in float precision, as supported by the LSD algorithm.
2015-01-20 17:05:38 +01:00
Vadim Pisarevsky
95ecdc3af9
Merge pull request #3600 from jet47:cuda-objdetect-module
2015-01-20 13:29:32 +00:00
Vadim Pisarevsky
21a9a17478
Merge pull request #3568 from ilya-lavrenov:neon_runtime
2015-01-20 12:47:51 +00:00
Vadim Pisarevsky
e501c61c04
Merge pull request #3611 from jet47:fix-gpumat-setto
2015-01-20 12:37:45 +00:00
Vadim Pisarevsky
9a6a046caf
Merge pull request #3613 from asmorkalov:aarch64_tiff
2015-01-20 12:36:38 +00:00
Vadim Pisarevsky
f647054c8c
Merge pull request #3616 from marvins:gdal-fixes
2015-01-20 12:31:14 +00:00
Yan Wang
f5b21e8141
Avoid deadlock becasue some work item couldn't reach barrier in loop
...
and unsynchronized.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-01-20 13:45:33 +08:00
Nicu Știurcă
e97d18ba81
implement _OutputArray::assign() for _OutputArrays of type MATX
2015-01-19 16:20:10 -05:00
Vadim Pisarevsky
5e92a777ef
Merge pull request #3569 from ilya-lavrenov:sse_mul
2015-01-19 13:42:36 +00:00
Vadim Pisarevsky
07c9a88d9c
Merge pull request #3621 from asmorkalov:ts_master_comapat_header
2015-01-19 12:33:58 +00:00
Vladislav Vinogradov
dae188d14f
move obsolete algorithms from cudabgsegm to cudalegacy:
...
* GMG
* FGD
2015-01-19 14:17:00 +03:00
Vadim Pisarevsky
17b1152fa3
Merge pull request #3544 from jet47:cuda-warping-refactoring
2015-01-19 11:10:48 +00:00
Vadim Pisarevsky
5cc4aa0e93
Merge pull request #3554 from wangyan42164:match_template_mask
2015-01-19 11:03:44 +00:00
Vadim Pisarevsky
dc27a13426
Merge pull request #3570 from a-wi:Win32_UI_commctrl_defs_v3
2015-01-19 10:54:26 +00:00
Vadim Pisarevsky
fe2a7d23a5
Merge pull request #3606 from jet47:warnings-fix
2015-01-19 10:49:53 +00:00
Vadim Pisarevsky
bcfcc779f6
Merge pull request #3605 from jet47:cuda-photo-refactoring
2015-01-19 10:48:44 +00:00
Vadim Pisarevsky
3a84444488
Merge pull request #3596 from jet47:cuda-features2d-refactoring
2015-01-19 10:48:18 +00:00
Vadim Pisarevsky
b6023eab9c
Merge pull request #3594 from asmorkalov:opencv4tegra_support
2015-01-19 10:47:49 +00:00
Alexander Smorkalov
9e9327e2f8
Added OpenCV 3.0 compat header for TS module.
2015-01-18 21:32:19 +03:00
Alexander Smorkalov
cc97c57fd4
Accuracy fix for blenaders in stitching module.
2015-01-18 20:45:57 +03:00
Marvin Smith
9a0e038a48
Fixed compile warning from redefined macro.
2015-01-17 20:37:51 -08:00
Marvin Smith
91fbe00caa
Updated gdal tutorial to include comments.
2015-01-17 19:28:58 -08:00
Marvin Smith
9a1a9d9aff
Updating CMake to get GDAL working again on OS X.
2015-01-17 16:59:56 -08:00
Craig Reynolds
72d90ba8d2
In cvAddText, construct QString from "text" using fromUtf8.
2015-01-16 14:57:11 -08:00
Alexander Smorkalov
d277a1ba75
TIFF support hack for aarch64 reverted.
2015-01-17 01:25:58 +03:00
Yan Wang
46ed461e22
Add template match with mask.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-01-16 11:09:26 +08:00
Guo Yejun
595ec6b852
correct the size of buf which holds integral sum/sumsq
...
layer_dy is not initialized correctly, it results in a small height
of the buffer, and so memory write is out of range in cv::integral.
2015-01-16 10:51:39 +08:00
Vladislav Vinogradov
f676bfb3d7
fix GpuMat::setTo method in case if mask is empty:
...
it might be called from _OutputArray::setTo
2015-01-15 19:33:27 +03:00
Vladislav Vinogradov
a524a677e4
disable warnings caused by CUDA headers
2015-01-15 17:20:35 +03:00
Vladislav Vinogradov
c120001178
fix -Wsign-compare warnings
2015-01-15 17:17:35 +03:00
Vladislav Vinogradov
14e15fb4f7
fix documentation warnings
2015-01-15 17:15:59 +03:00
soyer
d84d3a519b
Allow YUYV capture via libv4l
2015-01-15 15:10:15 +01:00
Vladislav Vinogradov
f48befc6f0
refactor CUDA part of photo module
2015-01-15 16:46:48 +03:00
Vadim Pisarevsky
df57d038b8
Merge pull request #3572 from berak:python_samples_30
2015-01-15 13:17:26 +00:00
Vadim Pisarevsky
713aa5c5b9
Merge pull request #3557 from ilya-lavrenov:sse_add_weighted
2015-01-15 13:14:06 +00:00
Vadim Pisarevsky
61f111143a
Merge pull request #3599 from a-wi:DShow_COM_interfaces_v3
2015-01-15 13:12:51 +00:00
Vadim Pisarevsky
16b56e71d9
Merge pull request #3561 from jet47:cuda-arithm-refactoring
2015-01-15 11:44:35 +00:00
Vadim Pisarevsky
c58373dbea
Merge pull request #3574 from mikeizbicki:patch-1
2015-01-15 11:36:51 +00:00
Vadim Pisarevsky
1c9668b371
Merge pull request #3584 from nisargthakkar:UMatDimsZeroAfterRelease
2015-01-15 11:27:11 +00:00
Vadim Pisarevsky
bd6ad79759
Merge pull request #3595 from timsat:error_messages
2015-01-15 11:24:53 +00:00
Vadim Pisarevsky
ce5e2697cb
Merge pull request #3597 from wangyan42164:cascade_cl_opt
2015-01-15 11:24:25 +00:00
berak
fd60e98c5b
fixes for latest changes in opencv3.0 api
...
fixes for latest changes in opencv3.0 api
waitKey() normalization
fixed mser bindings
2015-01-15 12:01:47 +01:00
Olexa Bilaniuk
02124f19e6
Further LevMarq improvements.
...
Implemented a damping-parameter choice strategy similar to that
described in http://www2.imm.dtu.dk/documents/ftp/tr99/tr05_99.pdf .
Removed a few debug statements.
Chosen a new starting lambda value, 0.01.
We now actually output the mask of inliers.
2015-01-15 04:21:16 -05:00
Vladislav Vinogradov
dccdadc38a
fix documentation warnings
2015-01-15 10:34:43 +03:00
VBystricky
d5092a6f7c
Add CV_CAP_PROP_POS_FRAMES property to cap_images.cpp
2015-01-15 01:55:17 +04:00
Alexander Smorkalov
54f52c3f45
Build fix for non-TEGRA case.
2015-01-14 22:17:37 +03:00
Vladislav Vinogradov
734212a402
refactor CUDA CascadeClassifier
2015-01-14 19:50:05 +03:00
Vladislav Vinogradov
8257dc3c1e
refactor CUDA HOG algorithm:
...
use abstract interface with hidden implementation
2015-01-14 19:50:05 +03:00
Vladislav Vinogradov
0af7597d36
fix CUDA HOG for multi GPU systems:
...
move GPU constants initialization from constructor to compute method
2015-01-14 19:50:05 +03:00
Vladislav Vinogradov
f126f371b2
move CUDA object detection algorithms to separate module
2015-01-14 19:50:05 +03:00
Artur Wieczorek
1264be8785
Check if _WIN32_IE is defined with proper value in window_w32.cpp
...
TBBUTTONINFO struct and BTNS_xxx symbols used in the code need _WIN32_IE to be defined with at least 0x0500 value (_WIN32_IE_IE50) in order to be included from commctrl.h.
2015-01-14 14:52:32 +01:00
Artur Wieczorek
01717c83d7
Don't define destructors for COM-based interfaces.
2015-01-14 14:06:42 +01:00
Yan Wang
07ab0c1c53
Avoid compile unnecessary OpenCL kernel.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-01-14 19:52:41 +08:00
Olexa Bilaniuk
ff91af825d
LevMarq made semi-functional.
...
Replaced the complex rules OpenCV uses to select lambda with a naive but
fast heuristic. It's imperfect but produces good results. It is still
subject to the same problem as OpenCV - namely, on occasion LevMarq will
make a poor result even worse.
2015-01-14 04:22:48 -05:00
Olexa Bilaniuk
8a5182662e
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
2015-01-14 04:11:24 -05:00
Vijay Pradeep
1292fdf71a
Now using default arg instead of overloads
2015-01-13 11:25:01 -08:00
Vladislav Vinogradov
5f1282afdb
fix documentation warnings
2015-01-13 18:23:59 +03:00
Vladislav Vinogradov
8a178da1a4
refactor CUDA BFMatcher algorithm:
...
use new abstract interface and hidden implementation
2015-01-13 18:03:57 +03:00
Vladislav Vinogradov
764d55b81d
add extended documentation for Features2DAsync
2015-01-13 18:03:57 +03:00
Vladislav Vinogradov
f960a5707d
refactor CUDA ORB feature detector/extractor algorithm:
...
use new abstract interface and hidden implementation
2015-01-13 18:03:57 +03:00
Vladislav Vinogradov
554ddd2ec4
fix compilation without CUDA
2015-01-13 18:03:57 +03:00
Vladislav Vinogradov
9f77ffb03f
extend Feature2DAsync interface
2015-01-13 18:03:57 +03:00
Vladislav Vinogradov
14ef62ed66
refactor CUDA FAST feature detector algorithm:
...
use new FastFeatureDetector abstract interface and hidden implementation
2015-01-13 18:03:56 +03:00
Vladislav Vinogradov
6f91b7f6a4
remove firstLevel=2 test case, because CPU implementation fails
2015-01-13 18:03:56 +03:00
Vladislav Vinogradov
1421e306fb
fix compilation without CUDA
2015-01-13 18:00:27 +03:00
Vladislav Vinogradov
ecee388236
move buildWarp*Maps to stitching
2015-01-13 18:00:26 +03:00
Vladislav Vinogradov
4cc7b0a74f
move ImagePyramid to cudalegacy
2015-01-13 18:00:26 +03:00
Vadim Pisarevsky
b2a5e66fc5
Merge pull request #3593 from kilobyte:master
2015-01-13 12:25:21 +00:00
Vadim Pisarevsky
f566f6baa9
Merge pull request #3535 from wangyan42164:use_hypot
2015-01-13 11:22:21 +00:00
Vadim Pisarevsky
2ecca8f59c
Merge pull request #3566 from jet47:cuda-imgproc-refactoring
2015-01-13 11:21:51 +00:00
Vadim Pisarevsky
bc23f29b27
Merge pull request #3537 from mshabunin:ml-old-xml
2015-01-13 11:17:36 +00:00
Adam Borowski
7b0d1c932e
Get rid of sysctl includes on Linux.
...
The 'sysctl' syscall has been strongly deprecated on Linux for ages.
Currently, on old architectures it will spam syslog whenever used, and on
newer ones it's missing from the headers altogether. Opencv has migrated
away on Linux already, but #includes were left lingering. This commit
removes them on non-__APPLE__, unbreaking x32 (and probably others).
2015-01-13 01:52:56 +01:00
Ilya Lavrenov
81f786393a
NEON detection in runtime
2015-01-13 01:35:53 +03:00
Alexander Smorkalov
1fa37fe733
OpenCV for Tegra compilation fix for
...
- Gaussian blur;
- CascadeClassifier;
- Blenders in stitching module;
- Laplacial pyromids in stitching module.
2015-01-12 23:43:26 +03:00
Olexa Bilaniuk
f73b48b8b6
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
2015-01-12 11:59:38 -05:00
Olexa Bilaniuk
4401095b38
Optimizations to Jacobian and error calculations.
...
Deleted multiplications by zero and consequent additions of zero terms.
2015-01-12 11:33:05 -05:00
Vadim Pisarevsky
390f17d1e0
Merge pull request #3575 from Ashod:multipage_imread
2015-01-12 11:31:04 +00:00
Olexa Bilaniuk
7fca146b21
More LevMarq bugfixes.
...
LevMarq now doesn't outright fail, but doesn't seem to improve things
much if at all.
2015-01-12 05:37:40 -05:00
Olexa Bilaniuk
33a3fba2d1
Work on LevMarq code.
...
Refactoring of Cholesky decomposition.
Fix for memory corruption bug.
LevMarq as a whole still non-functional.
2015-01-12 04:58:07 -05:00
Ilya Lavrenov
8c94568cc3
cv::sum
2015-01-12 10:59:31 +03:00
Ilya Lavrenov
33176db5dc
compareHist
2015-01-12 10:59:31 +03:00
Ilya Lavrenov
6bce6ee34a
checks
2015-01-12 10:59:31 +03:00
Ilya Lavrenov
1d3c860411
SinCos_32f
2015-01-12 10:59:31 +03:00
Ilya Lavrenov
3b23e57925
convertMaps
2015-01-12 10:59:31 +03:00
Ilya Lavrenov
0fd8f50522
warpAffine INTER_NEAREST
2015-01-12 10:59:31 +03:00
Ilya Lavrenov
d92f67ee2c
warpPerspective
2015-01-12 10:59:31 +03:00
Ilya Lavrenov
ef29b15c9a
reciprocal
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
44d89638fd
divide
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
7b060d9122
cvtColor 4 cn
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
f2cd65cf1e
fixes
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
25e99c453f
avx2 in arithm
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
70933ea999
convert from f64
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
612b8ce2cb
fixed compilation issues
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
b2f851af06
cornerMinEigenVal
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
d87457a025
split/merge
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
fc0869735d
used popcnt
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
31827d8dfe
fixed typo
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
bc394e7516
detection of other CPU features
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
3a426660ea
sse_utils.hpp
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
a340ea872e
cvtColor Luv 2 RGB u8
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
e20613a776
cvtColor RGB 2 Luv u8
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
584eed633e
cvtColor Lab 2 RGB u8
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
05e21015e9
cvtColor HLS 2 RGB u8
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
51684c109e
cvtColor RGB 2 HLS u8
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
51e7fb76b6
cvtColor HSV 2 RGB u8
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
c4c86a8990
cvtColor XYZ 2 RGB f32
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
93f8800844
cvtColor RGB 2 XYZ f32
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
e1773749ae
cvtColor RGB 2 gray 16s
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
1c9e886a6a
cvtColor YCrCb 2 RGB 32f
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
97fad1cb53
cvtColor RGB 2 YCrCb 32f
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
b99396ab12
cvtColor RGB 2 YCrCb
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
940f1e7914
interliving / deinterliving
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
fe371bf624
cvtColor Gray 2 BGR5x5
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
9cacd3261d
cvtColor BGR5x5 2 Gray
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
edee922b59
cvtColor YCrCb 2 RGB
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
5f2135695e
cvtColor rgb 2 YCrCb
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
bfb45b27e6
column sum 32s
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
1ca35b7424
resize are fast
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
56f3c92737
pyrUp and pyrDown
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
63fc6ef316
convertTo from 64f
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
8870ef4159
convertTo from 16u, 16s, 32s, 32f
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
116fb275a8
convertTo from 8s
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
19e77e4787
convertTo from 8u
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
b758dbd384
convertTo AVX2
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
3a78a22733
convertScaleAbs for s8, f64
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
5578088983
countNonZero
2015-01-12 10:59:28 +03:00
Ilya Lavrenov
972ff1d0c4
polarToCart
2015-01-12 10:59:28 +03:00
Ilya Lavrenov
0a5c9cf145
magnitude 64f
2015-01-12 10:59:28 +03:00
Ilya Lavrenov
6ab928fb39
phase 64f
2015-01-12 10:59:28 +03:00
Ilya Lavrenov
a2a8ba17fc
compare
2015-01-12 10:59:28 +03:00
Ilya Lavrenov
8d48632ebe
avx2
2015-01-12 10:59:28 +03:00
Olexa Bilaniuk
c175a86cbb
Merge remote-tracking branch 'upstream/master' into rho
2015-01-12 02:11:14 -05:00
Timur Sattarov
4762728fd5
More sensible error messages
2015-01-11 03:56:07 +04:00
Vijay Pradeep
964d5a20e9
Whitespace fix
2015-01-09 10:44:19 -08:00
Vijay Pradeep
177478a8ad
overload instead of default arg for ABI backwards compatibility. rng_seed is now 'int' to support python port
2015-01-09 10:18:08 -08:00
Josep Bosch
75c99d65a5
Fisheye calibration methods available now in python
2015-01-09 10:05:36 +01:00
Yan Wang
75277bb770
Remove unnecessary global/local dim for radius match.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-01-09 13:37:00 +08:00
Vijay Pradeep
a1c5740044
solvePnPRansac now accepts a seed and is deterministic
2015-01-08 18:24:55 -08:00
Vijay Pradeep
042ff210d5
Fixing race condition by expanding resultsMutex lock section
2015-01-08 15:26:15 -08:00
Nisarg Thakkar
a11c02497f
Fixed Bug similar to Bug#3757. UMat all dims zero after release.
2015-01-08 13:48:48 +05:30
orestis
c7b2e48efe
Canny TBB Optimization
2015-01-07 19:54:20 +02:00
Joe Howse
379de5708f
Fix shadowed variable warning
2015-01-05 10:56:46 -04:00
Alexander Smorkalov
c778011f14
More accurate AVX and AVX2 control.
...
- Previous version just checked option support, but not enable it.
- Also OpenCV tests reports invalid AVX and AVX2 support status.
2015-01-04 23:41:14 +03:00
Ashod Nakashian
473964806c
Added imread and imreadmulti regression tests.
2015-01-03 12:48:29 -05:00
Ashod Nakashian
61ca38103c
Added imreadmulti API to read multi-paged images into a vector of Mat.
2015-01-03 00:09:35 -05:00
Ashod Nakashian
ecf359b8c9
Support for multipage decoding in BaseImageDecoder and implemented in TiffDecoder.
2015-01-03 00:09:34 -05:00
Mike Izbicki
ac47c0c624
fix to work with python 2.6
...
I had to make this modification locally to get opencv to build with python 2.6. Python 2.6 requires indices in the format string (the `0` I added). This requirement was relaxed in 2.7, so what used to be there would be working for people who could upgrade. I don't think the change has any negative consequences for future python versions, but I'm no expert.
2015-01-02 14:41:44 -08:00
Ilya Lavrenov
68962adc54
SSE mul
2014-12-31 17:58:54 +03:00
Ilya Lavrenov
60f2f7898a
SSE4.1 addWeighted fo 16u
2014-12-31 17:55:30 +03:00
Vadim Pisarevsky
2f6db4dfac
Merge pull request #3547 from ilya-lavrenov:ocl_setto
2014-12-31 09:30:40 +00:00
Maksim Shabunin
38d37d2b00
Fixed uninitialized memory usage in ANN_MLP
2014-12-31 12:16:26 +03:00
Maksim Shabunin
d004ee58c5
Support loading old models in ML module
...
- added test for loading legacy files
- added version to new written models
- fixed loading of several fields in some models
- added generation of new fields from old data
2014-12-31 12:16:25 +03:00
Vadim Pisarevsky
1c8493fb0d
Merge pull request #3549 from mshabunin:sphinx-doc-remove
2014-12-31 09:14:22 +00:00
Vadim Pisarevsky
c937e15763
Merge pull request #3555 from ilya-lavrenov:sse_integral
2014-12-31 09:13:18 +00:00
Vadim Pisarevsky
f792fdc3e0
Merge pull request #3559 from ilya-lavrenov:sse_dot_s8
2014-12-31 08:06:06 +00:00
Vadim Pisarevsky
2bddbd2cb5
Merge pull request #3558 from ilya-lavrenov:sse_resize
2014-12-31 08:04:00 +00:00
Vadim Pisarevsky
ba8a971742
Merge pull request #3551 from serval2412:master
2014-12-31 06:09:29 +00:00
Vadim Pisarevsky
2b30759af0
Merge pull request #3556 from rokm:semicolon-warnings
2014-12-31 06:08:12 +00:00
Vadim Pisarevsky
622cf566b9
Merge pull request #3560 from ilya-lavrenov:sse_remap
2014-12-31 06:07:02 +00:00
Vadim Pisarevsky
9c872f5316
Merge pull request #3567 from vbystricky:intelperc_fix
2014-12-31 06:06:18 +00:00
vbystricky
083d8645a5
Fix error of compilation of cap_intelperc.cpp
2014-12-30 15:38:03 +03:00
Vladislav Vinogradov
f50a061225
added stream parameter to all cudaimgproc routines
2014-12-30 15:37:45 +03:00
Vladislav Vinogradov
220d937d9a
removed buffered versions of histogram functions
...
used BufferPool mechanism instead
2014-12-30 15:37:45 +03:00
Maksim Shabunin
e23ba9215d
Fixed memory leak in ML module
...
"int * CvMLData::sample_idx" was not freed
2014-12-30 15:20:24 +03:00
Vladislav Vinogradov
b4e7ee46c6
fix compilation without CUDA
2014-12-30 11:06:33 +03:00
Vladislav Vinogradov
cd0e95de16
refactor cudaarithm reductions:
...
* remove overloads with explicit buffer, now BufferPool is used
* added async versions for all reduce functions
2014-12-30 11:06:33 +03:00
Vladislav Vinogradov
a4e598f474
use new BufferPool class for some cudaarithm routines
2014-12-30 11:06:33 +03:00
Vladislav Vinogradov
7454189c2a
use new getInputMat/getOutputMat/syncOutput methods in cudaarithm routines
2014-12-30 11:06:33 +03:00
Vladislav Vinogradov
3d0410c147
remove reciprocal version of cuda::divide
...
it might cause errors, due to implicit type conversion and another cuda::divide
overload
2014-12-30 11:06:32 +03:00
Vladislav Vinogradov
00e7816c1b
add auxiliary functions to work with Input/Output arrays:
...
they allow to perform asynchronous upload/download into temporary buffer
to get valid GpuMat object
2014-12-30 11:06:32 +03:00
Ilya Lavrenov
02b2fdeda9
SSE resize Lanczos
2014-12-30 10:41:23 +03:00
Yan Wang
9699fde8d2
Use hypot to do vector calculation.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-30 14:12:28 +08:00
Olexa Bilaniuk
46631c4b18
Merge remote-tracking branch 'upstream/master' into rho
2014-12-29 20:55:24 -05:00
Ilya Lavrenov
042895977e
SSE2 conversio in remap
2014-12-30 01:00:22 +03:00
Ilya Lavrenov
f57136fd79
SSE2 cv::Mat::dot
2014-12-30 00:34:09 +03:00
Ilya Lavrenov
f6b3bc01e5
addWeighted
2014-12-29 22:01:53 +03:00
Rok Mandeljc
e3b32cce80
modules/core: removed extra semi-colon from mat.inl.hpp and utility.hpp
...
This silences the pedantic warning messages from gcc 4.8.3
2014-12-29 16:23:43 +01:00
Ilya Lavrenov
9436103ed6
SSE2 optimization of cv::integral
2014-12-29 15:51:55 +03:00
Ilya Lavrenov
1af7d397d4
optimization of UMat::setTo
2014-12-29 13:34:21 +03:00
Alexander Smorkalov
8acd4c3ff4
More accurate fix for libtiff and aarch64.
2014-12-28 12:44:24 +03:00
Alexander Smorkalov
c0a8d4e1ef
Fix of HaarCascade GPU test for aarch64.
2014-12-28 11:49:25 +03:00
Julien Nabet
2d5e3b57ea
Fix cppcheck reports warnings:
...
(performance) Possible inefficient checking for 'lmap' emptiness
(warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
(style) Array index '<xxx>' is used before limits check
2014-12-27 10:54:34 +01:00
Joe Howse
2d16026df6
more const correctness in OpenNI2 getProperty
2014-12-27 00:11:14 -04:00
Joe Howse
b7a3204c57
const correctness in OpenNI and OpenNI2 getProperty
2014-12-26 23:54:03 -04:00
Maksim Shabunin
11591b3e9d
Added Qt help generation support
2014-12-26 19:17:18 +03:00
Maksim Shabunin
b4050c775e
Updated sample files documentation inclusions
2014-12-26 19:17:18 +03:00
Maksim Shabunin
bebf6c47c6
Removed Sphinx generation commands from cmake scripts
2014-12-26 19:17:08 +03:00
Maksim Shabunin
d01bedbc61
Removed Sphinx documentation files
2014-12-26 19:12:19 +03:00
Vadim Pisarevsky
61991a3330
Merge pull request #3444 from Sync-my-L2P:patch-1
2014-12-26 14:40:29 +00:00
Vadim Pisarevsky
27b224ac74
Merge pull request #3485 from mapycz:fix-calibrate-crash
2014-12-26 14:38:54 +00:00
Vadim Pisarevsky
61886a61de
Merge pull request #3504 from a-wi:VideoCapture_get_const_v3
2014-12-26 14:37:47 +00:00
Vadim Pisarevsky
a5969aec96
Merge pull request #3534 from taka-no-me:build_fixes
2014-12-26 14:34:13 +00:00
Vadim Pisarevsky
0ff67253f7
Merge pull request #3531 from jet47:cuda-core-refactoring
2014-12-26 12:12:42 +00:00
Vadim Pisarevsky
f85838087a
Merge pull request #3539 from mshabunin:openni-linux-paths
2014-12-26 12:12:01 +00:00
Vladislav Vinogradov
fe3f236aa5
disable GeneralizedHoughGuil performance test
2014-12-26 12:04:07 +03:00
Vladislav Vinogradov
f36546dbd2
improve error reporting in _InputArray methods
2014-12-26 12:03:25 +03:00
Vladislav Vinogradov
7c901e39e1
disable sanity test for GeneralizedHoughGuil
...
the algorithm is not stable yet
2014-12-25 19:23:16 +03:00
Vladislav Vinogradov
18d1be4530
fix tests for match template
2014-12-25 19:23:16 +03:00
Vladislav Vinogradov
26afa49d71
fix cuda match template:
...
use correct types for integral/sum outputs
2014-12-25 19:23:16 +03:00
Vladislav Vinogradov
9b8c3fd675
rewrite cuda::cvtColor with new device layer and fix test failures
2014-12-25 19:23:15 +03:00
Vladislav Vinogradov
d00f36ec75
fix tests for gpu::matchTemplate:
...
use ASSERT_FLOAT_EQ to compare float values, it is more robust for
large values
2014-12-25 17:43:13 +03:00
Andrey Kamaev
c105b72945
Assorted fixes:
...
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
2014-12-25 12:41:16 +03:00
Maksim Shabunin
128e509527
Added enviroment search paths for OpenNI2 for linux and fixed specific warning
2014-12-24 15:07:05 +03:00
Vadim Pisarevsky
1bdd86edeb
Merge pull request #3523 from jet47:fix-cuda-buffer-pool
2014-12-24 11:20:27 +00:00
Vadim Pisarevsky
cddee22cf2
Merge pull request #3527 from jet47:cuda-deprivate-old-device-layer
2014-12-24 11:20:06 +00:00
Vadim Pisarevsky
5d15676b7b
Merge pull request #3532 from oresths:filter_neon
2014-12-24 09:02:24 +00:00
Roman Donchenko
034ff3ce13
Merge pull request #3497 from SpecLad:fs-open-fail-leak
2014-12-24 08:59:53 +00:00
Vladislav Vinogradov
e7e0da0153
fix GpuMat::swap method:
...
add swap instruction for allocator field
2014-12-23 17:43:28 +03:00
Vladislav Vinogradov
b33f3bb2cc
refactor CV_CUDA_TEST_MAIN, use CV_TEST_MAIN for it
...
use CV_CUDA_TEST_MAIN for opencv_test_core to initialize CUDA
device information
2014-12-23 17:43:14 +03:00
Vladislav Vinogradov
8237418be6
add Allocator parameter to cudev::GpuMat_ contructors
2014-12-23 17:42:49 +03:00
Vladislav Vinogradov
f054d6316a
add cuda::HostMem::getAllocator method
...
it allows to use cudaHostAlloc methods for cv::Mat objects
2014-12-23 17:42:49 +03:00
Vladislav Vinogradov
2f8e1798ca
add more FeatureSet constants
2014-12-23 17:42:49 +03:00
Vladislav Vinogradov
1be1a28920
move CUDA core tests to core module
2014-12-23 17:42:49 +03:00
Vladislav Vinogradov
53862687d5
rename CudaMem -> HostMem to better reflect its purpose
2014-12-23 17:42:49 +03:00
Vladislav Vinogradov
9210d8e542
move allocMatFromBuf function to farneback.cpp:
...
* it is the only place, where it is used
* no need to make this function public
2014-12-23 17:42:49 +03:00
Vladislav Vinogradov
1d82aecf45
minor reorganization for CUDA doxygen groups:
...
move main CUDA group to modules/core/cuda.hpp
2014-12-23 17:42:20 +03:00
Vladislav Vinogradov
b5ab82fdbd
mark old CUDA device layer as deprecated and remove it from doxygen documentation
...
add a note to use new cudev module as a replacement
2014-12-23 17:42:14 +03:00
Vladislav Vinogradov
68e08bbecd
fix null stream initialization for multi-gpu systems
2014-12-23 17:41:24 +03:00
Vladislav Vinogradov
05d40946f3
move StackAllocator to cpp file
...
it is internal class, no need to export it
2014-12-23 17:41:24 +03:00
Vladislav Vinogradov
7ed38b97c3
fix cuda::BufferPool deinitialization
...
The deinitialization of BufferPool internal objects is controled by global
object, but it depends on other global objects, which leads to errors
caused by undefined deinitialization order of global objects.
I merge global objects initialization into single class, which performs
initialization and deinitialization in correct order.
2014-12-23 17:41:24 +03:00
Jiri Drbalek
d71e001736
fix crash when sample point out of image boundaries
2014-12-22 21:01:17 +00:00
Roman Donchenko
08da247a87
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
...
... before any exceptions occur.
2014-12-22 18:54:39 +03:00
Vadim Pisarevsky
d9f159a554
Merge pull request #3513 from mshabunin:compat-30
2014-12-22 11:58:01 +00:00
Vadim Pisarevsky
c0005fd293
Merge pull request #3520 from JoeHowse:master
2014-12-22 11:14:29 +00:00
Vadim Pisarevsky
f12bd999bf
Merge pull request #3524 from jet47:fix-cuda-warnings
2014-12-22 10:58:07 +00:00
Vadim Pisarevsky
a1df295079
Merge pull request #3525 from jet47:fix-cudev-tests
2014-12-22 10:57:07 +00:00
Vadim Pisarevsky
63bc4d4b7f
Merge pull request #3471 from HelenWong:FixBug3714
2014-12-22 10:55:23 +00:00
Vadim Pisarevsky
cc024d3ef2
Merge pull request #3484 from euphrat:gmg_update_fix
2014-12-22 10:54:57 +00:00
Vadim Pisarevsky
7b20ce4952
Merge pull request #3490 from oresths:symmcolumnsmall_fix
2014-12-22 10:44:47 +00:00
Vadim Pisarevsky
20d957d212
Merge pull request #3511 from mattip:2.4
2014-12-22 10:41:21 +00:00
Vadim Pisarevsky
432546e4c4
Merge pull request #3512 from vins31:OpenNi2_AsusXtion
2014-12-22 10:39:42 +00:00
Vadim Pisarevsky
03df7831ab
Merge pull request #3514 from mshabunin:compat-24
2014-12-22 10:38:56 +00:00
Vadim Pisarevsky
700a388173
Merge pull request #3499 from StevenPuttemans:fix_2432
2014-12-22 10:29:31 +00:00
Vadim Pisarevsky
2425dac9a1
Merge pull request #3500 from StevenPuttemans:fix_2432_2.4
2014-12-22 10:28:33 +00:00
Vadim Pisarevsky
9071598a65
Merge pull request #3515 from StevenPuttemans:fix_FeatureDetector_docs
2014-12-22 10:27:01 +00:00
Vadim Pisarevsky
1ab551487d
Merge pull request #3516 from ana-GT:openni2_defaultMode
2014-12-22 10:26:30 +00:00
Vadim Pisarevsky
060d67517a
Merge pull request #3518 from wangyan42164:ocl_cascade_detect
2014-12-22 10:25:47 +00:00
Vadim Pisarevsky
199f1aec2e
Merge pull request #3519 from fvgoto:patch-1
2014-12-22 10:25:00 +00:00
Roman Donchenko
16ce114e0c
Fix memory leaks appearing when cvOpenFileStorage throws
2014-12-22 12:59:08 +03:00
Vladislav Vinogradov
ec33c4ae36
increase epsilons for tests due to different optimizations (IPP vs CUDA, float vs double)
2014-12-22 11:48:45 +03:00
Vladislav Vinogradov
25f33a7e30
update cudev color conversions according to the latest changes in CPU code
2014-12-22 11:48:45 +03:00
Vladislav Vinogradov
48c9c24da6
disable -Wshadow warning for CUDA modules:
...
it is generated by CUDA headers and we can't fix it
2014-12-22 11:48:19 +03:00
orestis
fffe2464cd
Change DescriptorExtractor_ORB regression test
...
to compensate for neon ieee754 non-compliancy.
Also changed the comparison between max valid and calculated distance to
make the error message more accurate (in case curMaxDist == maxDist)
2014-12-21 21:27:03 +02:00
orestis
9811a739b0
Change gaussianBlur5x5 perf test epsilon
...
Set it 1 instead of 0.001, as is already done in gaussianBlur3x3. That
will allow integer destination matrices that are not exactly the same,
but very close to the expected result, to pass the test.
2014-12-20 17:14:21 +02:00
orestis
9c6da03504
SymmRowSmallVec_32f 1x5 asymm
...
NEON speedup: 2.31x
Auto-vect speedup: 2.26x
Test kernel: [-0.9432, -1.1528, 0, 1.1528, 0.9432]
2014-12-19 22:51:42 +02:00
orestis
13c0855114
SymmRowSmallVec_32f 1x5
...
NEON speedup: 2.36x
Auto-vect speedup: 2.36x
Test kernel: [0.1, 0.2408, 0.3184, 0.2408, 0.1]
2014-12-19 22:47:06 +02:00
orestis
ed0ce48179
SymmColumnVec_32f16s asymm
...
NEON speedup: 9.46x
Auto-vect speedup: 1x
Test kernel: [-0.9432, -1.1528, 0, 1.1528, 0.9432]
2014-12-19 22:44:39 +02:00
orestis
a2a131799f
SymmColumnVec_32f16s
...
NEON speedup: 8.64x
Auto-vect speedup: 1x
Test kernel: [0.1, 0.2408, 0.3184, 0.2408, 0.1]
2014-12-19 22:42:31 +02:00
orestis
37e018454d
SymmColumnSmallVec_32s16s 3x1 asymm
...
NEON speedup: 2.12x
Auto-vect speedup: 1.01x
Test kernel: [-2, 0, 2]
2014-12-19 22:40:55 +02:00
orestis
4443d6b0a1
SymmColumnSmallVec_32s16s [-1, 0, 1]
...
NEON speedup: 3.27x
Auto-vect speedup: 1.01x
2014-12-19 22:37:52 +02:00
orestis
99e782e62c
SymmColumnSmallVec_32s16s 3x1
...
NEON speedup: 1.75x
Auto-vect speedup: 1x
2014-12-19 22:36:46 +02:00
orestis
33dfeb85be
SymmColumnSmallVec_32s16s [3, 10, 3] Scharr
...
NEON speedup: 2.04x
Auto-vect speedup: 1x
2014-12-19 22:35:52 +02:00
orestis
61a7f48bf4
SymmColumnSmallVec_32s16s [1, -2, 1]
...
NEON speedup: 2.75x
Auto-vect speedup: 1.01x
2014-12-19 22:34:11 +02:00
orestis
4f906372e2
SymmColumnSmallVec_32s16s [1, 2, 1]
...
NEON speedup: 2.66x
Auto-vect speedup: 1x
2014-12-19 22:33:11 +02:00
orestis
80a0364465
SymmColumnVec_32s8u asymm
...
NEON speedup: 2.95x
Auto-vect speedup: 1x
Test kernel: [-0.9432, -1.1528, 0, 1.1528, 0.9432]
2014-12-19 22:29:54 +02:00
orestis
4f5916f12d
SymmColumnVec_32s8u
...
NEON speedup: 1.96x
Auto-vect speedup: 1x
Test kernel: [0.0708, 0.2445, 0.3694, 0.2445, 0.0708]
2014-12-19 22:26:41 +02:00
orestis
1fb966dc61
SymmRowSmallVec_8u32s 1x5 asymm
...
NEON speedup: 3.14x
Auto-vect speedup: 1.6x
Test kernel: [-5, -2, 0, 2, 5]
2014-12-19 22:23:09 +02:00
orestis
2e7b9a2c0f
SymmRowSmallVec_8u32s 1x3 asymmetric
...
NEON speedup: 1.95x
Auto-vect speedup: 1.17x
Test kernel: [-2, 0, 2]
2014-12-19 22:15:37 +02:00
orestis
969a218057
SymmRowSmallVec_8u32s [-1, 0, 1]
...
NEON speedup: 1.84x
Auto-vect speedup: 1.2x
2014-12-19 22:11:52 +02:00
orestis
c0019a42e4
SymmRowSmallVec_8u32s 1x5 general
...
NEON speedup: 3.86x
Auto-vect speedup: 1.67x
Test kernel: [0.0708, 0.2445, 0.3694, 0.2445, 0.0708]
2014-12-19 22:10:58 +02:00
orestis
cb48d7798d
SymmRowSmallVec_8u32s 1x3 general
...
NEON speedup: 2.56x
Auto-vect speedup: 1.26x
Test kernel: [1, 3, 1]
2014-12-19 22:08:23 +02:00
orestis
0ba3b06efd
SymmRowSmallVec_8u32s [1, 2, 1]
...
NEON speedup: 4.1
Auto-vect speedup: 2.25
2014-12-19 22:02:57 +02:00
Maksim Shabunin
c485aee464
Included c-headers for better 2.4 compatibility
2014-12-19 17:05:26 +03:00
Joe Howse
13c04120dd
For Java compatibility, avoiding explicit pseudonym in enum
2014-12-16 21:37:14 -04:00
Ana Huaman Quispe
1ad1b737c2
Fixed registration bug: It was ALWAYS OFF - even after changing the property
2014-12-16 19:45:50 -05:00
Joe Howse
620a969285
Allow BGR, RGB, or gray capture via libv4l
2014-12-16 20:07:37 -04:00
Artur Wieczorek
854a722c70
Implement VideoCapture::get, CvCapture::getProperty, IVideoCapture::getProperty as constant methods.
2014-12-16 16:08:22 +01:00
Florian Verdet
f87f0cc481
fix obvious copy+paste typo in computeDistance()
...
(with this else-branch, argument contour2 would not be used at all)
2014-12-16 12:46:07 +01:00
Maksim Shabunin
91e21847e2
Some changes to make migration to 3.0 easier
2014-12-16 13:00:31 +03:00
Yan Wang
efa84d8225
Use preprocessor for constant values in OpenCL kernel instead of
...
the parameter variable.
It could improve the performance of
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/*.
Especially,
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/15
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/16
could be improved about 2% in Intel platform.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-16 16:21:05 +08:00
Yan Wang
fd2d800c06
Remove unnecessary local variable "size".
...
It should also be better for optimizing when compiling kernel.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-16 14:25:24 +08:00
Ana Huaman Quispe
0b429fee7b
Changed CV_DbgAssert to CV_Assert when setting video modes for OpenNI2. Otherwise, in release mode the default modes never get set
2014-12-15 18:16:25 -05:00
Vadim Pisarevsky
009aec5164
Merge pull request #3491 from mshabunin:ios-extra-world
2014-12-15 18:07:09 +00:00
Vadim Pisarevsky
3c74c23bad
Merge pull request #3473 from TobyWanKenobi:master
2014-12-15 18:04:01 +00:00
Vadim Pisarevsky
d54b069ae1
Merge pull request #3448 from Ashod:highgui_trackbar_improvements
2014-12-15 18:03:01 +00:00
Olexa Bilaniuk
bcc630a8dc
Merge remote-tracking branch 'upstream/master' into rho
2014-12-15 12:31:22 -05:00
StevenPuttemans
73d1ea9a52
fix bug 2432 for 2.4 branch
2014-12-15 11:56:42 +01:00
StevenPuttemans
edb608d206
fix documentation bug 2432
2014-12-15 11:53:55 +01:00
StevenPuttemans
db9a0cfbc0
add extra to FeatureDetector docs
2014-12-15 11:31:18 +01:00
vincentweb
4d12beb723
Added better OpenNI2 support to the Asus Xtion and Occipital Structure
...
sensors which do not have image generators.
2014-12-14 20:52:24 +01:00
mattip
ff7ea605ef
export thread control to generated wrappers
2014-12-14 11:55:02 +02:00
Sync-my-L2P
5a43c7a28e
Update segmentation.cpp
...
removed trailing whitespaces
2014-12-11 17:36:36 +01:00
Vadim Pisarevsky
25378587e2
Merge pull request #3479 from mshabunin:doxygen-tutorials
2014-12-09 14:06:23 +00:00
Vadim Pisarevsky
10dc5a3759
Merge pull request #3492 from Dmitry-Me:reduceVariablesScope1
2014-12-09 14:05:35 +00:00
Alexander Alekhin
0f7721e915
Merge pull request #3486 from Chuanbo-Weng:repeat-perf
2014-12-08 15:49:21 +00:00
Dmitry-Me
f269828160
Reduce variables scope, move declaration to first use point
2014-12-08 18:21:17 +03:00
TobyWanKenobi
b35f5d115f
Removed "FORMAT_XML" to generalize format
...
Removed the "FileStorage::FORMAT_XML" to generalize format of the String
model.
2014-12-08 09:21:55 +01:00
orestis
c762da9893
Fix SymmColumnSmallVec_32s16s SSE code
...
Specifically, in general antisymmetric case src[-1] (S0) should be
subtracted from from src[1] (S2), and not the opposite.
2014-12-06 19:53:07 +02:00
Ashod Nakashian
63c49be487
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
2014-12-06 11:56:01 -05:00
Ashod Nakashian
006384edaf
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
2014-12-06 11:55:17 -05:00
Vadim Pisarevsky
0a4c616d43
Merge pull request #3487 from taka-no-me:ctrl_s_gtk
2014-12-06 10:04:22 +00:00
Vadim Pisarevsky
ef347f4b62
Merge pull request #3472 from Dmitry-Me:preventDivByZero
2014-12-06 08:09:01 +00:00
Vadim Pisarevsky
ef534537b4
Merge pull request #3478 from akarsakov:rect_fix_typo
2014-12-06 08:08:27 +00:00
Vadim Pisarevsky
4f82b3588a
Merge pull request #3480 from mshabunin:python-test-24
2014-12-06 08:07:56 +00:00
Vadim Pisarevsky
bada364eb3
Merge pull request #3481 from mshabunin:python-test
2014-12-06 08:07:39 +00:00
Olexa Bilaniuk
51963f95dd
Merge remote-tracking branch 'upstream/master' into rho
2014-12-05 15:56:33 -05:00
Jeremy Huddleston Sequoia
35f96d6da7
Fix tautologies in calibfilter.cpp which cause a build failure when using -Werror=address with clang-3.5
...
http://code.opencv.org/issues/4048
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-12-05 10:22:11 -08:00
Maksim Shabunin
c28fea32c7
Build separate world-like iOS framework for contrib
2014-12-05 17:48:28 +03:00
Alexander Alekhin
893deb4040
Merge pull request #3483 from wangyan42164:ocl_orb_improve
2014-12-05 12:55:54 +00:00
Andrey Kamaev
05bc48e8f4
Make Ctrl+S open save dialog on Gtk backend
2014-12-05 14:53:19 +03:00
Andrey Kamaev
fac99de7ec
It turns opengl gheck is not needed for win ctrl+s
2014-12-05 14:52:44 +03:00
Firat Kalaycilar
2bda7aaf61
minor fix to make "updateBackgroundModel=false" option meaningful.
2014-12-04 22:36:42 +02:00
Yan Wang
2df606f098
Use sincos instead of sin and cos.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-04 15:48:23 +08:00
Yan Wang
1c9f956b88
Remove unnecesary operations and calculations in loop body.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-04 15:25:18 +08:00
Chuanbo Weng
2d8c89c40b
Remove unnecessary kercn limitation of 4.
...
When accessing global memory by DWORD4, memory bandwidth
can be fully utilized on Intel platform. This patch will
make more image format(e.g. 8UC4) be processed in DWORD4
by work-item. After applying this patch, 3 subcase of
./opencv_perf_core --gtest_filter=OCL_RepeatFixture_Repeat.Repeat/*
can be speedup on HD4000 graphics card with Beignet:
OCL_RepeatFixture_Repeat.Repeat/2, 64% improvement.
OCL_RepeatFixture_Repeat.Repeat/6, 50% improvement.
OCL_RepeatFixture_Repeat.Repeat/8, 56% improvement.
Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
2014-12-04 11:15:13 +08:00
TobyWanKenobi
f54b80d2c8
Re-edition of documentation
...
Re-edited the documentation again.
2014-12-03 17:13:11 +01:00
Maksim Shabunin
3212dd5465
Python test: new options provide local test data paths
2014-12-03 18:15:54 +03:00
Maksim Shabunin
84379140ba
Python test: added options to provide local data path
2014-12-03 18:12:01 +03:00
TobyWanKenobi
b3bba3476d
Re-editing Documentation
...
Attempting to re-editing the documentation, to satisfy buildbot error
status.
2014-12-03 15:54:25 +01:00
TobyWanKenobi
270af2ca79
Changing tabs to spaces.
...
Edited previous code to change tabs into spaces.
2014-12-03 15:40:12 +01:00
Alexander Karsakov
bcca34bc96
Fixed typo in description of Rect operations
2014-12-03 16:01:03 +03:00
HelenWong
ec57a938c0
Fix#3714:Improve Display Image Tutorial
...
For Bug #3714 , user use the imshow() function without calling
namedWindow() properly, because user did not know the implicit rule for
imshow(). (i.e. without calling namedWindow implied calling namedWindow(
,CV__WINDOW_AUTOSIZE).
Improve the Display Image Tutorial to educate the user for such implied
rule.
Put a note on documentation for Bug#3714
Revise the documentation regarding to imshow() function to better
educate the user the implicit rule. (i.e. without creating the window
before the imshow() function is the same as creating AUTOSIZE window)
2014-12-02 09:43:52 -08:00
TobyWanKenobi
a1e04c98aa
Add method in StatModel class, to load from String
...
Added a method "loadFromString" which is based on the "load" one. It
allow to directly pass the XML string which can be usefull and faster
when you have a huge file in a variable.
2014-12-02 15:15:06 +01:00
Maksim Shabunin
6d282ddf72
Documentation: removed mention of Mat(IplImage*) constructor
2014-12-02 15:15:10 +03:00
Dmitry-Me
cb049657e5
Prevent division by zero
2014-12-02 14:44:09 +03:00
Vadim Pisarevsky
be5c910358
Merge pull request #3443 from HelenWong:bug3363Fix
2014-12-02 09:14:36 +00:00
Vadim Pisarevsky
f61db41d25
Merge pull request #3453 from mshabunin:doxygen-others
2014-12-02 09:05:32 +00:00
Vadim Pisarevsky
726ed2632d
Merge pull request #3469 from a-wi:Fill_ellipse_arc_v3
2014-12-02 09:03:52 +00:00
Dmitry-Me
c669b7e4cd
Simplify overengineered code
2014-12-01 17:58:06 +03:00
Artur Wieczorek
41afe54696
Fix determining bounding box of the edge collection in FillEdgeCollection().
...
There is necessary to account also x-coordinate of the end of the edge when determining bounding box of the edge collection.
2014-12-01 14:30:05 +01:00
Maksim Shabunin
03e213ccae
Doxygen documentation: BiB references and fixes
2014-12-01 15:50:55 +03:00
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
2014-12-01 15:50:36 +03:00
Maksim Shabunin
6dcafe0c2d
Doxygen documentation: cuda submodules reorganized
2014-12-01 15:47:13 +03:00
Maksim Shabunin
397bf7f2b7
Doxygen documentation: viz
2014-12-01 15:47:13 +03:00
Maksim Shabunin
9d89f8d3dc
Doxygen documentation: shape, superres, videostab
2014-12-01 15:47:13 +03:00
Maksim Shabunin
ceb6e8bd94
Doxygen documentation: cuda
2014-12-01 15:47:13 +03:00
Maksim Shabunin
472c210687
Doxygen documentation: flann, photo and stitching modules
2014-12-01 15:47:13 +03:00
Maksim Shabunin
8e9ea0e3d1
Doxygen doucmentation: ml module
2014-12-01 15:47:13 +03:00
Maksim Shabunin
c5a698fb54
Doxygen documentation: calib3d and features2d modules
2014-12-01 15:47:13 +03:00
Maksim Shabunin
dcae7698ad
Doxygen documentation for: highgui, video, imgcodecs and videoio
2014-12-01 15:47:13 +03:00
Vadim Pisarevsky
1f43999f2a
Merge pull request #3428 from 23pointsNorth:patch-6
2014-12-01 10:45:31 +00:00
Vadim Pisarevsky
aadab03b7b
Merge pull request #3452 from Dmitry-Me:fixIncorrectSizeComputation
2014-12-01 10:43:44 +00:00
Vadim Pisarevsky
02f4f2f96d
Merge pull request #3426 from mshabunin:doxygen-imgproc
2014-12-01 10:43:13 +00:00
Vadim Pisarevsky
d368a7ceb4
Merge pull request #3446 from pokeefe:fix-compilation-without-videoio
2014-12-01 10:41:35 +00:00
Vadim Pisarevsky
c5b6c0456d
Merge pull request #3445 from jet47:get-rid-of-cuda-h
2014-12-01 10:40:57 +00:00
Vadim Pisarevsky
7106d3e8c2
Merge pull request #3458 from thorikawa:kmeans-index-parallel
2014-12-01 10:37:23 +00:00
Vadim Pisarevsky
6b0952b9bd
Merge pull request #3464 from asuwend1:master
2014-12-01 10:30:49 +00:00
Andrey Kamaev
3fa02787ac
Make Ctrl+S open save dialog on Windows
2014-11-30 00:43:21 +03:00
Ari Suwendi
b14f7c99d2
bug fix for a crash when input image is small
2014-11-29 01:57:15 -08:00
Takahiro Poly Horikawa
553bb7956e
Fix "assignment operator could not be generated" warnings
2014-11-28 19:33:52 +09:00
Takahiro Poly Horikawa
180e54d09d
- Use cv::Mutex to safely update converged flag
...
- Use cv::AutoBuffer rather than new allocation
- Fix "assignment operator could not be generated" warning
2014-11-28 18:39:49 +09:00
Takahiro Poly Horikawa
123ca7e1c5
Parallize building kmeans index in flann
2014-11-27 16:29:05 +09:00
HelenWong
e88bf2bc30
Updated Documentation (HoughCircles)
...
Rewrite the note on HoughCircles documentation to make it more clear
Add note to clarify that the output vector of found circles is sorted by
descending order of centres accumulator values.
Also delete reductant lines on the HoughCircles documentation.
Added comments to hough circles function.
Added comments to icvhoughgradient
Misalignment in line 1183 corrected
2014-11-26 11:37:33 -08:00
Dmitry-Me
4ff8a3ad92
Fix incorrect size computation
2014-11-26 12:24:53 +03:00
Yan Wang
6e7050555e
Optimize pyrUp_unrolled() by mad function.
...
It could improve performance when image size is large.
E.g. OCL_PyrUpFixture_PyrUp.PyrUp/18
2014-11-26 16:55:08 +08:00
Pat O'Keefe
6d78cfc0d9
Fix compilation when building without the Video I/O module.
2014-11-25 13:52:07 -05:00
Artur Wieczorek
7512b5fdde
Fix determining bounding box of the edge collection in FillEdgeCollection().
...
There is necessary to account also x-ccordinate of the end of the edge when determining bounding box of the edge collection.
2014-11-25 18:54:47 +01:00
Vladislav Vinogradov
eeb997261d
get rid of cuda.h usage
2014-11-25 18:29:56 +03:00
Sync-my-L2P
f14b8b4341
Update segmentation.cpp
...
Added detailed comments to watershed()
2014-11-25 16:25:56 +01:00
Olexa Bilaniuk
38e3f2c7f5
Merge https://github.com/Itseez/opencv into rho
2014-11-22 12:28:19 -05:00
orestis
a7757b0eb6
Fix anchor for small symmetrical column filters.
...
In the unoptimized version of small symmetrical column filters, when we
try to detect if the kernel, ky, is equal to [1;2;1] or [1;-2;1] we
should take into consideration that the anchor points in the middle
element.
2014-11-19 23:12:58 +02:00
Vadim Pisarevsky
ba9bc2d72f
Merge pull request #3409 from fish2000:patch-1
2014-11-19 16:25:36 +00:00
StevenPuttemans
f151b1d277
fix wrong property name and corresponding documentation
2014-11-19 14:00:40 +01:00
Andrey Kamaev
f4ba8b13c7
Add cv::setWindowTitle to highgui
2014-11-18 16:54:03 +03:00
Maksim Shabunin
555fdf893a
Documenting imgproc module
...
- disabled doxygen tree
- enabled doxygen enum listing
- added imgproc reference to main page
- enabled BiB support
- chenged doxygen root page format
2014-11-18 14:00:56 +03:00
Olexa Bilaniuk
68e59d6154
[RHO] Initial commit of RHO algorithm for rapid homography estimation.
...
Implements the RHO algorithm as presented in
Paper: Bilaniuk, Olexa, Hamid Bazargani, and Robert Laganiere. "Fast
Target Recognition on Mobile Devices: Revisiting Gaussian Elimination
for the Estimation of Planar Homographies." In Computer Vision and
Pattern Recognition Workshops (CVPRW), 2014 IEEE Conference on, pp.
119-125. IEEE, 2014.
- Complete, heavily documented reference C implementation, as well as
temporarily disabled dirty SSE2 port.
- Enabled tests for RHO in test_homography; Currently these fail
presumably due to too-stringent accuracy requirements.
- Refinement and final refinement are not yet functional; Do not pass
their corresponding flags to RHO.
2014-11-17 15:06:08 -05:00
Vadim Pisarevsky
8ebd474c0e
Merge pull request #3425 from StevenPuttemans:fix_firewire_buffersize
2014-11-16 18:06:20 +00:00
Daniel Angelov
303868b3c4
Fixed variable name consistency
...
The function parameters were different from the ones described below.
P.S. Why is ``flow`` InputOutputArray, shouldn't it be just OutputArray? If so, shouldn't the reason be specified - e.g. so others can benefit as well (e.g. not allocating memory on every frame?)
2014-11-14 22:49:22 +00:00
StevenPuttemans
d9164bdd4c
added extra BUFFERSIZE doc and getter
2014-11-14 14:09:43 +01:00
Tom Stellard
42b1bd56cc
ocl: Move static oclMat variables into FarnebackOpticalFlow class
...
Move some static functions into the FarnebackOpticalFlow class as well,
so they can access these new class variables.
oclMat objects cannot be declared statically, because their destructor
depends on the statically defined __module variable from cl_context.cpp.
Since statically defined variables in separate compilation units have
an undefined destruction order there is always the possibility the
__module will be destructed before an oclMat object, which results
in a segfault.
2014-11-13 11:16:10 -05:00
Roman Donchenko
da6a38f9f6
NCV.cu: include <algorithm>
...
It's needed for std::max.
2014-11-13 16:16:26 +03:00
Vadim Pisarevsky
92e08c9863
Merge pull request #3412 from StevenPuttemans:ieee1934_camera_set_params
2014-11-13 07:27:33 +00:00
Vadim Pisarevsky
4b97e8c51c
Merge pull request #3399 from mshabunin:doxygen-core
2014-11-13 07:25:27 +00:00
Vadim Pisarevsky
773e621190
Merge pull request #3414 from SpecLad:vg-stereogc
2014-11-13 07:20:30 +00:00
Alexander Alekhin
d2f19a3a0d
Merge pull request #3418 from tstellarAMD:2.4-hog-crash-fix
2014-11-13 01:49:06 +00:00
Alexander Alekhin
a16a11f32b
Merge pull request #3413 from wangyan42164:denoising_opencl_improvement
2014-11-13 01:47:01 +00:00
Ilya Lavrenov
d8ca61b01b
attemp to fix dox warning
2014-11-12 19:18:45 +03:00
Tom Stellard
ec335b7398
ocl: Fix crash during destruction of gauss_w_lut object in hog.cpp
...
gauss_w_lut is a statically defined variable of type oclMat. The oclMat
destructor calls openCLFree() which via getInitializationMutex() accesses
the __module variable which has been statically defined in cl_context.cpp
Since the destruction order of statically defined variables in different
compilation units is undefined, it is possible that __module will
be destructed before gauss_w_lut, which would result in a segfault when
getInitializationMutex() is called while destructing gauss_w_lut.
In order to avoid this issue, we need to make gauss_w_lut a private
member of the HOGDescriptors class so we know it will be destroyed
before __module.
2014-11-12 10:07:07 -05:00
Yan Wang
a8b4c99ed6
Improve the performance of fast_nlmeans_denoising_opencl.
...
1. Remove unnecessary barriers.
2. Adjust CTA_SIZE based on the following cases for Intel platform:
a) OCL_Photo_DenoisingGrayscale.DenoisingGrayscale
b) OCL_Photo_DenoisingColored.DenoisingColored
2014-11-12 22:34:33 +08:00
Roman Donchenko
7d8e5f623a
Fix uninitialized memory reads and memory leaks in StereoGC
2014-11-12 17:00:08 +03:00
StevenPuttemans
2b8229f716
adding extra buffer parameter
2014-11-12 13:09:53 +01:00
Vadim Pisarevsky
4763d8033a
Merge pull request #3406 from shiquanwang:Fix-bug-#4003_build-python-binding-under-python3
2014-11-12 11:26:19 +00:00
Maksim Shabunin
6aa7a86ae9
Doxygen documentation for core module
2014-11-12 14:21:58 +03:00
Vadim Pisarevsky
23a81c0fb8
Merge pull request #3407 from wangyan42164:canny_bug_fix
2014-11-12 11:09:55 +00:00
Yan Wang
184b6e314c
Fix canny segment fault (Bug #3978 )
...
Avoid stack overflow based on std::vector cause
std::vector::resize() segmentation fault.
2014-11-12 17:48:05 +08:00
Vadim Pisarevsky
bea86deea9
Merge pull request #3408 from ilya-lavrenov:doc_fix
2014-11-11 13:29:46 +00:00
Vadim Pisarevsky
b80a3a91a8
Merge pull request #3401 from SpecLad:optflow-bogus-Warray-bounds
2014-11-11 13:27:41 +00:00
Alexander Bohn / FI$H2k
8340e31f1f
Fixed OS X compilation error in window_cocoa.mm
...
Un-commented `NSApplicationActivationPolicyRegular` argument (in leu of zero) and got rid of problematic dereference
2014-11-11 04:35:35 -08:00
Roman Donchenko
13d67b6ae7
Suppress a bogus -Warray-bounds in modules/superres/src/optical_flow.cpp
...
This is actually the same warning that the suppression at the bottom
suppresses, but that one doesn't suppress it when using a native compiler
(go figure).
I remove the forced inclusion of precompiled headers into all sources,
since otherwise this workaround doesn't work - the header with the warning
is included before I can use a pragma.
2014-11-10 18:38:54 +03:00
Ilya Lavrenov
701d2386ce
fixed doc
2014-11-10 16:19:27 +03:00
Shiquan Wang
7127634aa0
Mod: Open header files with io.open for Python 2/3 compatibility.
2014-11-10 21:09:43 +08:00
Vadim Pisarevsky
e05a0bc6c5
Merge pull request #3322 from StevenPuttemans:fix_pvpapi_interface
2014-11-10 08:27:42 +00:00
Vadim Pisarevsky
a181835549
Merge pull request #3405 from D-Alex:master
2014-11-10 08:19:29 +00:00
Alexander Duda
60cacbfd66
solvePnPRansac: fix mask generation
2014-11-09 23:10:43 +01:00
Alexander Duda
ed55d13112
PnPRansacCallback::computeError: fix count in case of Nx3 matrices
2014-11-09 23:08:47 +01:00
Alexander Alekhin
2981ee00d9
OpenNI2: prevent failure of setVideoMode() call with invalid parameters
...
Not all parameters are specified for openni::VideoMode, so
"selected" mode can be unsupported for device.
Replace default VideoMode constructor to result of getVideoMode() call.
2014-11-08 02:21:59 +03:00
Alexander Alekhin
ae4cb571ab
Set status to beta
2014-11-07 19:22:46 +03:00
Vadim Pisarevsky
d58cadc1ea
moved cv::partition from private.hpp to operations.hpp, to expose the function to users
2014-11-07 18:14:39 +03:00
Vadim Pisarevsky
47838a4a22
Merge pull request #3402 from vpisarev:fixed_python_tests
2014-11-07 14:34:14 +00:00
Vadim Pisarevsky
80a985c894
fixed path to the checkerboard image
2014-11-07 15:57:42 +03:00
Vadim Pisarevsky
9b13b07639
Merge pull request #3400 from vpisarev:fixed_umat_test_crash
2014-11-07 12:50:26 +00:00
Alexander Alekhin
569a95e9e1
Merge pull request #3394 from akarsakov:ocl_canny
2014-11-07 12:42:24 +00:00
Vadim Pisarevsky
573be75f50
Merge pull request #3392 from wangyan42164:houghlines_bug_fix
2014-11-07 11:52:58 +00:00
Vadim Pisarevsky
1abc26905d
Merge pull request #3397 from ElenaGvozdeva:ocl_WarpAffine_test
2014-11-07 11:52:35 +00:00
Vadim Pisarevsky
7c8789dc12
fixed my_umat(roi).clone() test by disabling poorly aligned ROI's. Real fix of the problem will require a separate branch in UMat::copyTo().
2014-11-07 14:49:48 +03:00
Yan Wang
0692bf5f34
Fix HoughLines crashes (Bug #3959 ).
...
Avoid phi exceed PI/2 to get the negative value of cos(phi).
2014-11-07 17:52:16 +08:00
Alexander Karsakov
7c870014fb
Correctly unrolled some cycles
2014-11-07 12:13:00 +03:00
Alexander Alekhin
f50f249f80
Merge pull request #3138 from alalek:icv_update
2014-11-06 15:58:14 +00:00
ElenaGvozdeva
7dd059c084
fixed test for ocl WarpAffine
2014-11-06 17:19:45 +03:00
Alexander Karsakov
462c3c25a9
Removed incorrect using of rootn() and powr() in ocl_pow
2014-11-06 16:23:02 +03:00
Alexander Karsakov
0ec0aeb7d0
Minor optimization for ocl_canny
2014-11-06 13:07:33 +03:00
Vadim Pisarevsky
5044e0f590
Merge pull request #3372 from pokeefe:add-test-for-projection-decomposition
2014-11-06 08:40:36 +00:00
Vadim Pisarevsky
cf0cc00547
Merge pull request #3391 from alalek:ocl_failure_messages
2014-11-06 08:37:34 +00:00
Vadim Pisarevsky
1d804bc695
Merge pull request #3360 from mirab:threshold_triangle
2014-11-06 08:36:24 +00:00
Alexander Alekhin
4eb16122c0
ocl: change processing of OpenCL failures
...
disable "unwanted" messages
2014-11-05 19:44:36 +03:00
Miroslav Benes
4046f0398a
Make Otsu and Triangle algorithms mutually exclusive
...
Make Otsu and Triangle algorithms mutually exclusive in cv::threshold code.
Signed-off-by: Miroslav Benes <mbenes@suse.cz>
2014-11-05 16:04:26 +01:00
Vadim Pisarevsky
da6898f758
Merge pull request #3389 from blackibiza84:master
2014-11-05 14:58:27 +00:00
Vadim Pisarevsky
91a8ea5e60
Merge pull request #3387 from YusukeSuzuki:cap_v4l_rgb24fix
2014-11-05 11:42:51 +00:00
Vadim Pisarevsky
7de4e0496c
Merge pull request #3390 from vbystricky:fix_houghlines
2014-11-05 11:41:12 +00:00
Vadim Pisarevsky
b476bf2a00
Merge pull request #3294 from mshabunin:fix-ios-warnings-24
2014-11-05 11:35:19 +00:00
Vadim Pisarevsky
5efad375e0
Merge pull request #3384 from ilya-lavrenov:neon_new
2014-11-05 11:26:53 +00:00
Vadim Pisarevsky
72419c3778
Merge pull request #3373 from berak:patch-2
2014-11-05 11:14:59 +00:00
Vadim Pisarevsky
23b28a6700
Merge pull request #3376 from vriera:2.4
2014-11-05 11:13:03 +00:00
Vadim Pisarevsky
c4906c7f43
Merge pull request #3388 from bartaandras:master
2014-11-05 11:04:06 +00:00
Michele Adduci
e181c76d21
Updated test_features2d.cpp with latest API change
2014-11-05 12:03:28 +01:00
Michele Adduci
914b78b8bb
Updated ORB test with parameters
2014-11-05 12:00:31 +01:00
Vadim Pisarevsky
d052d863eb
Merge pull request #3315 from abak:seamless-refactor
2014-11-05 10:41:32 +00:00
vbystricky
957e5ef8eb
Fix OpenCL version of HoughLinesP function
2014-11-05 14:31:06 +04:00
Alexander Alekhin
58e054a003
IPPICV: disable boxFilter 16SC1/16UC1 (performance)
2014-11-05 13:26:23 +03:00
Alexander Alekhin
1c9f590f0d
IPPICV: disable NormDiff_L1_16s_C1R for IPP/ICV 8.2/8.2.1
2014-11-05 13:26:23 +03:00
Michele Adduci
e1bb844475
Fix cudafeatures2d and cudastereo with new 3.0 APIs for ORB and StereoBM
2014-11-05 10:42:02 +01:00
bartaandras
21227ba092
Fixed calc_output_scale with NO_OUTPUT_SCALE flag set.
2014-11-04 11:35:45 +01:00
Yusuke Suzuki
9cd08c662c
add V4L2_PIX_FMT_RGB24 convert code
2014-11-04 15:21:30 +09:00
berak
c2cb3b515d
support older gcc versions
2014-11-02 08:16:29 +01:00
Ilya Lavrenov
1fe5441185
cv::convertMaps
2014-11-01 10:13:28 -07:00
Ilya Lavrenov
aa11e102fd
removed saturation from pyramids
2014-11-01 13:23:45 +03:00
Ilya Lavrenov
8d0383180c
fixes for cv::warpAffine
2014-11-01 13:19:52 +03:00
Ilya Lavrenov
15af3f7114
fixes in VResizeLinearVec_32s8u
2014-11-01 13:19:52 +03:00
Ilya Lavrenov
a4dd2162f2
cv::resize (INTER_LANCZOS4)
2014-11-01 13:19:52 +03:00
Ilya Lavrenov
1b01e1fe68
cv::resize (INTER_AREA CV_16S, CV_32F)
2014-11-01 13:19:52 +03:00
Ilya Lavrenov
4ed696d770
cv::compareHist (CV_COMP_INTERSECT)
2014-11-01 13:19:51 +03:00
Ilya Lavrenov
5ca25ab8f0
cv::pow (integer power)
2014-11-01 13:19:51 +03:00
Ilya Lavrenov
ccdc71286c
cv::polarToCart
2014-11-01 13:19:51 +03:00
Ilya Lavrenov
d5f006eee5
cv::magnitude; cv::corner**
2014-11-01 13:19:51 +03:00
Ilya Lavrenov
fb97273b3c
cv::phase; cv::cartToPolar
2014-11-01 13:19:51 +03:00
Ilya Lavrenov
7e6fb668ed
cv::pyrUp
2014-11-01 13:19:51 +03:00
Ilya Lavrenov
46faf592fc
cv::warpAffine
2014-11-01 13:19:51 +03:00
Ilya Lavrenov
85a814f748
VResizeLinearVec_32s8u
2014-11-01 13:19:51 +03:00
Vadim Pisarevsky
a28cde9c3b
Merge pull request #3382 from StevenPuttemans:fix_3982
2014-10-31 11:18:24 +00:00
Vadim Pisarevsky
dce629d0e2
Merge pull request #3343 from mshabunin:doxygen-docs
2014-10-30 10:45:03 +00:00
Vadim Pisarevsky
e19a12f655
Merge pull request #3361 from mshabunin:fix-drawing
2014-10-30 10:44:21 +00:00
Vadim Pisarevsky
529af7a90e
Merge pull request #3364 from mshabunin:doxygen-docs-24
2014-10-30 10:42:25 +00:00
Alexander Alekhin
cae89a7a88
Merge pull request #3318 from akarsakov:ocl_cvtcolor
2014-10-29 14:25:09 +00:00
Alexander Alekhin
fd59551ff0
Merge pull request #3354 from vbystricky:oclopt_convertScaleAbs
2014-10-29 13:53:56 +00:00
StevenPuttemans
8bf58937a9
fixing SVM negative value rounding
2014-10-29 13:50:20 +01:00
Alexander Alekhin
efebd83bc8
Merge pull request #3159 from ElenaGvozdeva:ocl_gemm
2014-10-29 11:18:06 +00:00
StevenPuttemans
7dce2d0b8f
fixing cap_pvpapi interface and making sure both AVT Manta and Proscilla
...
series are supported. Testing this with both cams for Windows and Linux
exhaustively.
Optimizing memory footprint by removing unused calls.
Adapted with the input of Shai
Added small example that illustrates how it should work.
2014-10-28 15:33:37 +01:00
Alexander Karsakov
967a88759f
Don't process empty src image in GFTT
2014-10-28 16:06:36 +03:00
ElenaGvozdeva
d88fdd0378
use LOCAL_SIZE+1
2014-10-28 15:18:31 +03:00
Alexander Karsakov
643c906f3d
Added optimized loading to YUV2RGB_422 kernel
2014-10-28 15:07:51 +03:00
Alexander Alekhin
30222c7be8
Merge pull request #3359 from akarsakov:ocl_buildMaps
2014-10-28 09:18:31 +00:00
Vicente Olivert Riera
2e393ab833
superres: Fix return value VideoFrameSource_GPU
...
superres module fails to compile with the following error messages:
[100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o
/opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)':
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int*)operator new(4ul)' from 'int*' to 'cv::Ptr<cv::superres::FrameSource>'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope
/opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type]
cc1plus: some warnings being treated as errors
make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1
make[3]: *** Waiting for unfinished jobs....
This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.
2014-10-27 13:39:35 +00:00
Alexander Karsakov
1466621f99
Added loading 4 pixels in line instead of 2 to RGB[A] -> YUV(420) kernel
2014-10-27 16:00:34 +03:00
Alexander Karsakov
ebfaf4c5d8
Added checking that z is non zero to buildWarpPlaneMaps kernel
2014-10-27 15:38:44 +03:00
Alexander Karsakov
0aab779532
Overload PlaneWarper::buildMaps method from base class
2014-10-27 15:36:52 +03:00
Maksim Shabunin
09fb7512ed
Fixed iOS framework compilation warnings
2014-10-27 15:28:21 +03:00
ElenaGvozdeva
65b8a1cb37
Some small fixes
2014-10-27 14:38:22 +03:00
Elena Gvozdeva
c5a2879ce0
use vectors
2014-10-27 14:38:22 +03:00
Elena Gvozdeva
2d89df1804
use local memory
2014-10-27 14:38:21 +03:00
Elena Gvozdeva
d78bc3c321
naive implementation
2014-10-27 14:38:21 +03:00
Alexander Alekhin
dee56598e9
Merge pull request #3369 from vbystricky:fix_scaleAdd
2014-10-27 10:03:29 +00:00
Dinar Ahmatnurov
b5a6df4966
fixed issue with malformed UTF-8 string;
...
ocl: Change static variable order in cl_context.cpp to avoid crashes during destruction
ContextImpl::currentContext contains a reference to one of the
DeviceInfoImpl objects from:
static std::vector<DeviceInfoImpl> global_devices;
ContextImpl::currentContext is destroyed in the destructor
for the statically defined object __module, and relies on its
DeviceInfoImpl reference to query some hardware features while
being destroyed.
This means that we need to ensure that the global_devices vector is
destroyed affter __module, otherwise ContextImpl::currentContext's
DeviceInfoImpl reference will no longer be valid when __module is
destroyed.
Since these variables are all confined to a single compilation unit,
they will be destruct from bottom to top, so we need to make sure
that __module is the bottom definition so it can be destroyed first.
iOS: fix crash from overrelease in UIImageToMat
viz: fixed memory leak, issue 3961
fix installation layout for debian packages:
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
Fix test name.
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
TIFF loader: Pass buffer size to read functions.
replace not ascii and not cyrillic symbols with '?';
add test for putText;
fix warning;
minor fixes;
2014-10-27 12:47:53 +03:00
Vadim Pisarevsky
67e50b4415
Merge pull request #3362 from mshabunin:fix-drawing-24
2014-10-26 17:44:07 +00:00
Vadim Pisarevsky
0cf170587f
Merge pull request #3363 from asmorkalov:qnx_support
2014-10-26 17:42:24 +00:00
Pat O'Keefe
83ccdabe7e
Add test for calib3d function decomposeProjectionMatrix(...)
2014-10-25 19:11:02 -06:00
Alexander Alekhin
1f08d8cb6f
Merge pull request #3367 from akarsakov:ocl_image2d
2014-10-24 16:01:21 +00:00
Alexander Alekhin
1fbad26fe3
Merge pull request #3342 from alalek:perf_stability_check
2014-10-24 16:00:20 +00:00
vbystricky
8466911ad0
Move _dst.create() to the begining of scaleAdd function
2014-10-24 18:27:47 +04:00
Alexander Alekhin
caba92f2b8
Merge pull request #3284 from vbystricky:oclopt_stereoBM
2014-10-24 12:59:13 +00:00
Alexander Karsakov
237cb93143
Added extra checks to ocl::Image2D
2014-10-24 15:04:42 +03:00
Alexander Alekhin
579a7fff6d
ocl: restore clFinish() in unmap() for AMD devices
...
This reverts commit 7d91b8efcd
2014-10-24 14:29:38 +04:00
Maksim Shabunin
071e78d02e
Disabled videoio_video_prop_fps test
...
This test does not return correct values with some software configurations.
Possible problem with ffmpeg on buildbot's linux-slave.
2014-10-24 11:37:15 +04:00
vbystricky
21ad8e92d4
Optimize OpenCL version of StereoBM function
...
Fix problems on NVidia devices.
2014-10-23 20:18:53 +04:00
Vladislav Vinogradov
84f33d0578
minor fix for StereoCSBP data cost compute kernel and test
2014-10-23 19:33:44 +04:00
Vladislav Vinogradov
5c07e0b6d3
increase epsilons for some tests, which functions use floating point arithm
2014-10-23 19:33:42 +04:00
Vladislav Vinogradov
e0827069c1
avoid pointer arithmetic on register memory in color conversion
2014-10-23 18:39:23 +04:00
Maksim Shabunin
9b55c09999
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
Conflicts:
CMakeLists.txt
doc/CMakeLists.txt
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/cuda.inl.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/matx.hpp
modules/core/include/opencv2/core/types.hpp
modules/flann/include/opencv2/flann/lsh_table.h
modules/imgproc/include/opencv2/imgproc.hpp
2014-10-23 18:27:26 +04:00
Alexander Smorkalov
6bb6039ebb
Fixes for QNX 6.6 Neitrino support.
2014-10-23 17:17:35 +04:00
Alexander Karsakov
3a263c6326
Added tests for Image2D
2014-10-23 14:23:37 +03:00
Maksim Shabunin
ba7c92b0e8
Fixed highgui drawing test
...
- changed image comparison technique
- removed old assert statements
2014-10-23 13:28:33 +04:00
Maksim Shabunin
e85ae5f2f0
Fixed imgcodecs tests
...
- Imgcodecs_Image, write_imageseq - assuming JPEG images have losses
- Imgcodecs_Drawing, c_regression - replaced assert calls
- Imgcodecs_Drawing - exact comparison with reference image
2014-10-23 12:38:42 +04:00
Miroslav Benes
5b1fd739d9
Add Triangle thresholding algorithm
...
Add Triangle method for automatic threshold computation next to the existing
Otsu's method. Triangle deals better with images whose histogram does not
contain dominant peak.
See paper Zack GW, Rogers WE, Latt SA.: Automatic measurement of sister
chromatid exchange frequency. J Histochem Cytochem. 1977 Jul;25(7):741-53.
2014-10-22 16:54:39 +02:00
Alexander Karsakov
62d4393883
Small optimization for buildMaps kernels in case rowsPerWI > 1
2014-10-22 17:43:29 +03:00
Maksim Shabunin
ba5f343c38
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
2014-10-22 15:24:15 +04:00
Vadim Pisarevsky
e40567eaee
Merge pull request #3352 from alucarded:BackgroundSubtractorMOG2_optimization
2014-10-22 01:55:23 +00:00
vbystricky
a8aa6381d9
Optimize OpenCL version of conversScaleAbs function
2014-10-21 19:20:20 +04:00
Alexander Karsakov
60367907fe
Used direct float calculations
2014-10-21 17:18:03 +03:00
Alexander Karsakov
5aa9ac9a77
Added OCL code for YUV422 -> RGB[A]|BGR[A] color conversion
2014-10-21 17:18:03 +03:00
Alexander Karsakov
c8707b891b
Added OCL code for RGB[A]|BGR[A] -> YUV_[YV12|IYUV] color conversion
2014-10-21 17:18:03 +03:00
Alexander Karsakov
8c91604f5a
Added OCL code for YUV2GRAY_420 color conversion
2014-10-21 17:18:02 +03:00
Alexander Karsakov
1cc17a7186
Added OCL code for YUV2BGR_YV12 and YUV2BGR_IYUV color conversions
2014-10-21 17:18:02 +03:00
Alexander Karsakov
85b60ee3cb
Added support for YUV2RGB[A]_NV21 and YUV2BGR[A]_NV21 conversion
2014-10-21 17:18:02 +03:00
Alexander Alekhin
8ab6852927
added performance validation check
2014-10-21 15:23:19 +04:00
ElenaGvozdeva
070e5ec042
Changed predictOptimalVectorWidth function, now it is possible to choose vector size.
2014-10-21 13:13:15 +03:00
Alexander Alekhin
322593e89f
Merge pull request #3256 from vbystricky:oclopt_BFMatcher
2014-10-21 08:59:23 +00:00
Tomasz Posłuszny
8dd213c829
BackgroundSubtractorMOG2, learningRate=0 optimization
2014-10-20 19:45:31 +02:00
Vadim Pisarevsky
4de9605b7b
Merge pull request #3344 from mshabunin:java_automation
2014-10-20 06:50:34 +00:00
Vadim Pisarevsky
d767c9df58
Merge pull request #3349 from a-wi:DShow_Strsafe_header_v3
2014-10-20 06:49:18 +00:00
Vadim Pisarevsky
926b64fff7
Merge pull request #3292 from mshabunin:fix-ios-warnings
2014-10-20 06:41:51 +00:00
Andreas Stührk
24580e348a
TIFF loader: Pass buffer size to read functions.
2014-10-19 01:22:18 +02:00
Andreas Stührk
cfdcf9f2d2
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
2014-10-19 01:22:04 +02:00
Andreas Stührk
63ac69cadf
Fix test name.
2014-10-19 01:13:35 +02:00
Vadim Pisarevsky
55f490485b
Merge pull request #3348 from vpisarev:refactor_algorithms2
2014-10-18 18:52:35 +00:00
Artur Wieczorek
dcbe797980
Include strsafe.h to compile successfully under MinGW in Debug mode.
2014-10-18 20:38:34 +02:00
Vadim Pisarevsky
dcee883961
fixed MSVC warnings and iOS framework compile error
2014-10-18 21:58:34 +04:00
Vadim Pisarevsky
e4418e186e
Merge pull request #3345 from D-Alex:master
2014-10-18 17:00:31 +00:00
Vadim Pisarevsky
40efd17be4
Merge pull request #3346 from Nerei:fixed_memory_leak_in_viz
2014-10-18 16:57:55 +00:00
Vadim Pisarevsky
c45d2642ca
Merge pull request #3347 from Nerei:memory_leak_in_viz_opencv30
2014-10-18 16:57:35 +00:00
Vadim Pisarevsky
b37a641cc9
fixed bug in automatic SVM training
2014-10-18 20:53:39 +04:00
Vadim Pisarevsky
d2b9dc5530
quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)
2014-10-18 20:44:26 +04:00
Anatoly Baksheev
cb95d1df35
viz: fixed memory leak
2014-10-18 18:17:42 +04:00
Anatoly Baksheev
0f2b7fbc45
viz: fixed memory leak, issue 3961
2014-10-18 18:12:36 +04:00
Alexander Duda
11ebaf673f
fix warning in template Scalar::mul gcc < 4.8
...
In this particular case t shadows transpose of the base class Matx:
types.hpp:1805:14: warning: declaration of ‘t’ shadows a member of
'this' [-Wshadow]
Changelog gcc 4.8: The option -Wshadow no longer warns if a declaration
shadows a function declaration.
This warning is problematic because it prevents the module
opencv_contrib/modules/ruby to pass the build process
2014-10-18 14:22:27 +02:00
vbystricky
3787388eac
Optimize OpenCL version of BFMatcher
2014-10-17 19:48:45 +04:00
Maksim Shabunin
c5a1650ac0
Refactoring in gen_java.py script
2014-10-17 19:36:24 +04:00
Maksim Shabunin
276bed3e4a
final fix
2014-10-17 18:29:30 +04:00
Maksim Shabunin
571ebb2373
Fixing iOS clang warnings, part 3
2014-10-17 18:15:21 +04:00
Maksim Shabunin
ef3d02214b
Fixing iOS clang warnings, part 2
2014-10-17 18:14:54 +04:00
Maksim Shabunin
d3821e8cd7
Forgotten punctuation
2014-10-17 18:14:54 +04:00
Maksim Shabunin
420737e098
Fixing iOS clang warnings, part 1
2014-10-17 18:14:54 +04:00
Maksim Shabunin
630eddf25a
Extracted repeated cmake instruction block
2014-10-17 18:14:53 +04:00
Vadim Pisarevsky
4038beb67e
fixed incorrect array access in solvepnp (which affected debug builds only)
2014-10-17 17:01:39 +04:00
Vadim Pisarevsky
3f37e034a0
another fix in opencv_world
2014-10-17 16:09:09 +04:00
Vadim Pisarevsky
8d9e619412
fixed opencv_world build
2014-10-17 16:05:38 +04:00
Vadim Pisarevsky
1a809ca89b
fixed msvc compile warning
2014-10-17 15:56:27 +04:00
Vadim Pisarevsky
cc11a8d183
Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv into refactor_features2d_take4
...
Conflicts:
modules/features2d/src/orb.cpp
2014-10-17 15:13:35 +04:00
Vadim Pisarevsky
54e65598bd
fixed error in OpenCL ORB
2014-10-17 15:02:57 +04:00
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
2014-10-17 15:02:56 +04:00
Vadim Pisarevsky
9c9ecc22e2
fixed opencv_java build
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
fa76c634ec
ok; all the tests now pass
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
01d3848f17
all the tests now pass except for MSER
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
162384a838
fixed several test failures; currently 9 out of 73 tests fail
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
06d4aa6060
now all the samples and opencv_contrib compile!
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
09df1a286b
OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
2e915026a0
yet another attempt to refactor features2d; the first commit, features2d does not even compile
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
f6f839eb3c
trying to resolve the merge conflict
2014-10-17 14:46:08 +04:00
Vadim Pisarevsky
c5292c2549
fixed error in OpenCL ORB
2014-10-17 14:30:12 +04:00
Vadim Pisarevsky
c422bdc3f8
fixed some more compile errors and test failures
2014-10-17 14:22:02 +04:00
Thomas Weisbach
81c0537b0c
iOS: fix crash from overrelease in UIImageToMat
2014-10-17 17:49:14 +09:00
Vadim Pisarevsky
61cddd8b63
fixed opencv_java build
2014-10-16 22:52:04 +04:00
Vadim Pisarevsky
25a7d023dd
ok; all the tests now pass
2014-10-16 21:59:38 +04:00
Vadim Pisarevsky
c5261ea3d2
all the tests now pass except for MSER
2014-10-16 20:58:29 +04:00
Alexander Alekhin
af1d29db83
Merge pull request #3332 from lupustr3:pvlasov/implementation_detector
2014-10-16 14:51:53 +00:00
Vadim Pisarevsky
97a5dd0ead
fixed several test failures; currently 9 out of 73 tests fail
2014-10-16 17:00:40 +04:00
Vadim Pisarevsky
d017faa06c
now all the samples and opencv_contrib compile!
2014-10-16 16:34:22 +04:00
Vadim Pisarevsky
b30ad42609
Merge pull request #3270 from boaz001:patch-1
2014-10-16 10:09:28 +00:00
Boaz Stolk
ae81006eab
Applied proposed fix
2014-10-15 22:36:38 +02:00
Vadim Pisarevsky
5e667ee53a
OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet
2014-10-15 22:49:17 +04:00
Pavel Vlasov
45958eaabc
Implementation detector and selector for IPP and OpenCL;
...
IPP can be switched on and off on runtime;
Optional implementation collector was added (switched off by default in CMake). Gathers data of implementation used in functions and report this info through performance TS;
TS modifications for implementations control;
2014-10-15 14:24:41 +04:00
Adrien BAK
5442de7d99
adjust numerical precision for windows build
2014-10-15 12:47:53 +09:00
Tom Stellard
8f3b876ee6
ocl: Change static variable order in cl_context.cpp to avoid crashes during destruction
...
ContextImpl::currentContext contains a reference to one of the
DeviceInfoImpl objects from:
static std::vector<DeviceInfoImpl> global_devices;
ContextImpl::currentContext is destroyed in the destructor
for the statically defined object __module, and relies on its
DeviceInfoImpl reference to query some hardware features while
being destroyed.
This means that we need to ensure that the global_devices vector is
destroyed affter __module, otherwise ContextImpl::currentContext's
DeviceInfoImpl reference will no longer be valid when __module is
destroyed.
Since these variables are all confined to a single compilation unit,
they will be destruct from bottom to top, so we need to make sure
that __module is the bottom definition so it can be destroyed first.
2014-10-14 20:54:13 -04:00
Adrien BAK
9972059476
suppress warnings
2014-10-14 19:07:15 +09:00
Adrien BAK
53d11f490d
whitespace
2014-10-14 16:45:02 +09:00
Adrien BAK
5c98209127
whitespaces
2014-10-14 16:31:22 +09:00
Adrien BAK
ee210afc44
white space
2014-10-14 16:10:53 +09:00
Adrien BAK
cb76d00f5f
precalculate indices
2014-10-14 16:08:45 +09:00
Adrien BAK
419450689b
remove unnecessary buffer copies
2014-10-14 16:08:45 +09:00
Adrien BAK
b4504639c8
refactor poisson_solver
2014-10-14 16:08:45 +09:00
Adrien BAK
6bfea73716
move calls to ptr<>
2014-10-14 16:08:45 +09:00
Adrien BAK
4a5ea85094
another useless include
2014-10-14 16:08:45 +09:00
Adrien BAK
df312a4ffa
at<> -> ptr<>
2014-10-14 16:08:45 +09:00
Adrien BAK
5a16de2ef6
.size().width -> cols
2014-10-14 16:08:45 +09:00
Adrien BAK
980496bb0e
remove useless include
2014-10-14 16:08:45 +09:00
Adrien BAK
d2719ea92f
change numerical precision because of architecture discrepancy
2014-10-14 16:08:45 +09:00
Adrien BAK
1c75fa7297
norm -> cvtest::norm
2014-10-14 16:08:45 +09:00
Adrien BAK
c6ffa5059d
remove useless includes
2014-10-14 16:08:45 +09:00
Adrien BAK
0f0bda9722
factor conditional save
2014-10-14 16:08:45 +09:00
Adrien BAK
11d89ad7c1
coding guidelines
2014-10-14 16:08:45 +09:00
Adrien BAK
53f4f06a15
remove debugging code
2014-10-14 16:08:45 +09:00
Adrien BAK
c69016467d
replace implementation of dst
2014-10-14 16:08:44 +09:00
Adrien BAK
89e7860572
replace double by float
2014-10-14 16:08:44 +09:00
Adrien BAK
ed9f6a3cb4
simplify a line
2014-10-14 16:08:44 +09:00
Adrien BAK
e46810eabe
this has been submitted to the daily wtf
2014-10-14 16:08:44 +09:00
Adrien BAK
47b01be0a4
replace 8 loops by 2
2014-10-14 16:08:44 +09:00
Adrien BAK
b04d06938d
replace double* by vector<double>
2014-10-14 16:08:44 +09:00
Adrien BAK
a14bfb331d
remove logging
2014-10-14 16:08:44 +09:00
Adrien BAK
a361cc9479
remove some more useless buffers and rename a bunch of variables
2014-10-14 16:08:44 +09:00
Adrien BAK
61fe623cf1
backport bug fix
2014-10-14 16:08:44 +09:00
Adrien BAK
d46c466e20
remove useless buffers
2014-10-14 16:08:44 +09:00
Adrien BAK
89be83e5be
rename variables
2014-10-14 16:08:43 +09:00
Adrien BAK
b3ddc2b9a7
refactor array_product
2014-10-14 16:08:43 +09:00
Adrien BAK
33c15d6309
rename stuff, adds logging and replace shitty else if chain by switch
2014-10-14 16:08:43 +09:00
Adrien BAK
1f6acc23fa
adds header guards + move impl to proper file
2014-10-14 16:08:43 +09:00
Adrien BAK
e8c2f2ee3e
constness
2014-10-14 16:08:43 +09:00
Adrien BAK
2f046ae873
fix grayscale loading
2014-10-14 16:08:43 +09:00
Adrien BAK
63715a899e
fix regressiont ests npr
2014-10-14 16:08:43 +09:00
Adrien BAK
ed0eb139cb
improve decolor tests
2014-10-14 16:08:43 +09:00
Adrien BAK
0a3aab288a
improved cloning test
2014-10-14 16:08:42 +09:00
Vadim Pisarevsky
1796a26fc7
yet another attempt to refactor features2d; the first commit, features2d does not even compile
2014-10-13 23:01:45 +04:00
Samuel Martin
ea50be0529
core: fix x86 PIC code compilation
...
This bug was triggered by Buildroot autobuilders [1,2], causing this
kind of failures [3,4]:
[ 14%] Building CXX object modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o
/home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp: In function '(static initializers for /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp)':
/home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp:280:10: error: inconsistent operand constraints in an 'asm'
make[3]: *** [modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o] Error 1
[1] http://buildroot.org/
[2] http://autobuild.buildroot.org/
[3] http://autobuild.buildroot.org/?reason=opencv-2.4.10
[4] http://autobuild.buildroot.org/results/483/4838285b25d6293a5cf0bb9eadd5040a7c75d766/build-end.log
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
2014-10-12 12:45:20 +02:00
Vadim Pisarevsky
3b250d6e9c
this is trivial change; the main change is in opencv_extra - added regression data for perf tests
2014-10-11 22:57:22 +04:00
Vadim Pisarevsky
b11b08b478
Merge pull request #3265 from BKNio:putText_develop
2014-10-11 18:06:25 +00:00
Vadim Pisarevsky
a798386660
Merge pull request #3326 from ilya-lavrenov:neon_canny
2014-10-11 17:58:24 +00:00
Vadim Pisarevsky
1edefac4dc
Merge pull request #3276 from asmorkalov:abidrk/pyStitching
2014-10-11 17:39:55 +00:00
Vadim Pisarevsky
0d196529f7
Merge pull request #3300 from rohitrawat:bug_3787_docs_NAryMatIterator
2014-10-11 17:35:51 +00:00
Vadim Pisarevsky
8b7c0a7893
Merge pull request #3308 from edgarriba:master
2014-10-11 17:33:28 +00:00
Vadim Pisarevsky
c37acef077
Merge pull request #3328 from ilya-lavrenov:warp_tests
2014-10-11 17:19:52 +00:00
Vadim Pisarevsky
b4c3f465fb
Merge pull request #3325 from a-wi:Dshow_capture_v3
2014-10-11 16:04:02 +00:00
Ilya Lavrenov
faf91a466c
imrpoved output of warp test in case of failure
2014-10-11 02:35:02 -07:00
edgarriba
4071c4e7c9
Updating to c++ interfaces
2014-10-11 01:44:46 +02:00
Ilya Lavrenov
af04a85303
fixes for cv::accumulate**
2014-10-10 10:00:13 -07:00
Artur Wieczorek
ec93d103b7
Refactored code responsible for printing debug messages in DShow video capture module to reduce footprint in Release mode.
...
Replace printf function used for diagnostic purposes with dedicated DebugPrintOut function to output debug messages. This function is effective only in Debug mode and its body becomes empty in Release mode to reduce footprint.
2014-10-10 17:49:01 +02:00
Vadim Pisarevsky
a3916113b9
Merge pull request #3254 from ilya-lavrenov:neon_scale_add
2014-10-10 14:26:14 +00:00
Ilya Lavrenov
5f23d99918
the rest modes of cv::Mat::convertTo
2014-10-10 14:10:50 +00:00
Dinar Ahmatnurov
5a797ae7de
fix issue with font;
2014-10-10 17:11:20 +04:00
Vadim Pisarevsky
ff8e32453b
Merge pull request #3307 from ilya-lavrenov:ffmpeg_rtsp
2014-10-10 11:02:50 +00:00
Vadim Pisarevsky
f6b1c2a0b6
Merge pull request #3324 from akarsakov:fix_lpsolver_tests
2014-10-10 10:59:09 +00:00
Artur Wieczorek
c54928e003
Fixed getting CV_CAP_PROP_FOURCC property value
...
Save selected FCC in order to return proper CV_CAP_PROP_FOURCC property value (currently FCC for RGB24 is always returned).
2014-10-10 08:53:52 +02:00
Artur Wieczorek
efd237b8b8
Fixed media type guid for I420 in DShow capture.
...
FOURCC code bytes should be placed in the reverse order.
2014-10-10 08:53:50 +02:00
Artur Wieczorek
de0b46a765
Fixed selecting media type in DShow video capture.
...
Set correct value of sample size when calling IAMStreamConfig::SetFormat function. For non-RGB media type it can be set to zero value.
(See http://msdn.microsoft.com/en-us/library/windows/desktop/dd373477%28v=vs.85%29.aspx )
2014-10-10 08:53:48 +02:00
Ilya Lavrenov
fb2012def2
TCP instead of UDP
2014-10-09 19:23:51 +04:00
Vadim Pisarevsky
d7ba03a9cb
Merge pull request #3298 from a-wi:DShow_capture
2014-10-09 15:00:25 +00:00
Vadim Pisarevsky
ca5e73a9d0
Merge pull request #3283 from abak:fix-cloning-illumination-change-noipp
2014-10-09 14:57:57 +00:00
Vadim Pisarevsky
397870d7a5
Merge pull request #3279 from akarsakov:ocl_houghlines
2014-10-09 14:56:45 +00:00
Vadim Pisarevsky
9575a82a9e
Merge pull request #3299 from felixendres:orb_keypoint_detector_threshold
2014-10-09 14:52:38 +00:00
Vadim Pisarevsky
6fa6e3d3d5
Merge pull request #3301 from MC-Escherichia:fix_gen_javadoc_py_prints
2014-10-09 14:50:36 +00:00
Vadim Pisarevsky
1e744bf5b1
Merge pull request #3309 from nisargthakkar:Thickness1NoLineCV_AA
2014-10-09 14:42:44 +00:00
Vadim Pisarevsky
8364ea3954
Merge pull request #3311 from BarneyBear:2.4-drawMatches-flag-fix
2014-10-09 14:20:23 +00:00
Vadim Pisarevsky
c24e6f7ae9
Merge pull request #3316 from nisargthakkar:Bug3887
2014-10-09 14:19:12 +00:00
Vadim Pisarevsky
0c1b405964
Merge pull request #3320 from ElenaGvozdeva:gemm_doc
2014-10-09 14:12:51 +00:00
Ilya Lavrenov
4babecf3b0
fixes for cv::addWeighted and cv::Mat::dot
2014-10-09 12:55:52 +00:00
vbystricky
1d280352f4
Add code for print errors of OpenCL kernels runing
2014-10-09 13:59:38 +04:00
Alexander Karsakov
a8169f08fc
Used checking norm of results for LPSolver accuracy tests
2014-10-09 13:32:56 +04:00
ElenaGvozdeva
75601ccf9e
small change in description for Gemm
2014-10-09 11:39:44 +03:00
Andreas Stührk
afb164cc15
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".
2014-10-08 23:31:30 +02:00
Ilya Lavrenov
183e378bd0
cv::resize (INTER_LINEAR && INTER_CUBIC)
2014-10-08 13:11:38 -07:00
Ilya Lavrenov
00b8f0dec1
cv::pyrUp
2014-10-08 12:04:49 -07:00
Ilya Lavrenov
48a9905f5d
cv::pyrDown
2014-10-08 11:47:46 -07:00
Nisarg Thakkar
474897ff01
Made some changes specefict to 4 channel images. Fixed step value for tptr
2014-10-08 22:08:14 +05:30
Nisarg Thakkar
29fb2b6e47
Fixed doc for Bug #3887
...
Fixed doc for Bug #3887
2014-10-08 19:52:35 +05:30
Alexander Karsakov
dfff9a8125
Added OCL performance test for YUV2RGB_IYUV, YUV2GRAY_420, RGB2YUV_IYUV, YUV2RGB_YUY2, YUV2GRAY_YUY2 color conversion modes
2014-10-08 17:25:51 +04:00
Vadim Pisarevsky
ac730d9f53
Merge pull request #3312 from berak:b_3945_30
2014-10-08 08:40:55 +00:00
Ilya Lavrenov
7166b7b640
cv::cvtColor (RGB2Luv CV_8U)
2014-10-07 13:49:05 -07:00
Ilya Lavrenov
1c1c41d3be
cv::cvtColor (Luv2RGB CV_8U)
2014-10-07 13:35:11 -07:00
Ilya Lavrenov
06461b401a
cv::cvtColor (Lab2BGR CV_8U)
2014-10-07 10:27:28 -07:00
Ilya Lavrenov
71c3e67cb2
cv::cvtColor (HLS2RGB CV_8U)
2014-10-07 15:37:21 +00:00
Ilya Lavrenov
c173d9fa18
cv::cvtColor (RGB2HLS CV_8U)
2014-10-07 15:33:09 +00:00
Ilya Lavrenov
8d367d4b4d
cv::cvtColor (HSV2RGB CV_8U)
2014-10-07 15:25:02 +00:00
Ilya Lavrenov
eb3046f7d3
cv::cvtColor (Gray2RGB5x5)
2014-10-07 14:10:39 +00:00
Alexander Karsakov
66a8acfd3d
Optimization for HoughLinesP
2014-10-07 17:53:33 +04:00
berak
56fcc41d70
bugfix #3945 pass idx,idx1 by reference instead of static vars
2014-10-07 12:19:54 +02:00
Alexander Alekhin
14d5358982
Merge pull request #3210 from akarsakov:ocl_gftt_opt
2014-10-07 09:06:54 +00:00
Niklas Frisk
af72e6b8f4
Fixes #3910 , flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.
2014-10-07 09:40:56 +02:00
edgarriba
88aed15ffa
Removing windows compilation crashes
2014-10-07 09:10:03 +02:00
edgarriba
f317d1277f
Merge remote-tracking branch 'upstream/master'
2014-10-06 23:46:30 +02:00
Ilya Lavrenov
f91e461ea0
cv::cvtColor (RGB5x52Gray)
2014-10-06 13:06:08 -07:00
Ilya Lavrenov
a84c4ac197
cv::cvtColor (RGBRGB5x5)
2014-10-06 12:40:41 -07:00
Ilya Lavrenov
b9f57bda05
cv::cvtColor (RGB5x52RGB)
2014-10-06 11:55:12 -07:00
Ilya Lavrenov
28ee84b731
cv::cvtColor (BGR[A]2RGB[A])
2014-10-06 11:18:33 -07:00
edgarriba
2494e028c0
Updating upnp sanity heck
2014-10-06 18:18:03 +02:00
edgarriba
1709421c2c
Updating sanity check
2014-10-06 17:43:01 +02:00
edgarriba
71dd9a6f1b
Updating sanity check
2014-10-06 17:22:43 +02:00
edgarriba
862b675bee
Updating sanity check
2014-10-06 16:23:21 +02:00
edgarriba
f328f9a10d
Removing whitespaces
2014-10-06 14:53:06 +02:00
Ilya Lavrenov
a54f6bb08b
cv::cvtColor
2014-10-06 11:52:41 +00:00
edgarriba
72fb85f6a0
Removing whitespaces
2014-10-06 13:01:23 +02:00
edgarriba
4d54f35a96
Updating documentation
2014-10-06 10:31:50 +02:00
edgarriba
d6bf209bb3
Updating for N=2
2014-10-06 10:28:04 +02:00
Matthew Conway
92efe4534b
update gen_javadoc prints to python3 syntax fixed #3768
2014-10-04 14:48:03 -04:00
Ilya Lavrenov
00f16e9178
neon
2014-10-03 08:43:02 +00:00
Rohit Rawat
2ad8c6dbd0
Fixing bug in NAryMatIterator documentation(Bug #3787 ).
...
Fixed the non-working code example for NAryMatIterator.
The documentation of NAryMatIterator in file:
modules/core/include/opencv2/core/core.hpp has a working example which
was used for these edits.
2014-10-02 18:48:31 -05:00
Artur Wieczorek
5c96021172
Fixed getting CV_CAP_PROP_FOURCC property value
...
Save selected FCC in order to return proper CV_CAP_PROP_FOURCC property value (currently FCC for RGB24 is always returned).
2014-10-02 21:41:54 +02:00
edgarriba
dc76ca5fc9
Updating documentation
2014-10-02 21:39:29 +02:00
edgarriba
7520544840
Return the estimated focal length
2014-10-02 17:05:42 +02:00
edgarriba
ea893bf9d9
Updating UPNP documentation
2014-10-02 17:05:06 +02:00
edgarriba
7429454171
Add UPNP acc_test and perf_test
2014-10-02 16:45:59 +02:00
edgarriba
a5b3a205d9
Add UPNP case + Modify model_points
2014-10-02 16:45:04 +02:00
edgarriba
84475ef1de
UPNP code for N=1
2014-10-02 16:43:50 +02:00
edgarriba
71f4894d87
Added UPNP flag
2014-10-02 16:43:15 +02:00
Artur Wieczorek
4b1bb702ce
Fixed media type GUID for I420 format in DShow capture.
...
FOURCC code bytes should be placed in the reverse order.
2014-10-02 13:07:50 +02:00
Felix Endres
ee6835492c
Exposing the FAST detector threshold for ORB
...
Implemented as a new optional parameter for
the constructor of the ORB detector. The
change of this parameter has been included
in the orb unit test.
2014-10-02 12:17:01 +02:00
Artur Wieczorek
7e78b5d06e
Fixed selecting media type in DShow video capture.
...
Set correct value of sample size when calling IAMStreamConfig::SetFormat function. For non-RGB media type it can be set to zero value.
(See http://msdn.microsoft.com/en-us/library/windows/desktop/dd373477%28v=vs.85%29.aspx )
2014-10-02 12:08:37 +02:00
Alexander Smorkalov
11c81067dc
doc/check_docs2.py warnings fixes
2014-10-02 13:40:30 +04:00
Artur Wieczorek
3a0b375104
Remove ATL dependency from MSMF capture code.
...
Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.
2014-10-01 12:02:28 +02:00
Andrey Pavlenko
7018f94959
Merge pull request #3288 from StevenPuttemans:fix_ts_dependencies
2014-10-01 07:33:36 +00:00
Andrey Pavlenko
533fde66e3
Merge pull request #3281 from a-wi:MSMF_remove_ATL_dependency
2014-10-01 07:26:25 +00:00
Andrey Pavlenko
5bd18155be
Merge pull request #3290 from asmorkalov:android_disable_fisheye.rectify_for_tegra
2014-10-01 07:26:04 +00:00
Alexander Smorkalov
ca40a749b6
Turn off superres accuracy tests if video i/o is not supported.
2014-10-01 09:15:24 +04:00
Ilya Lavrenov
6f05a250be
optimization of cv::CLAHE (~3x)
2014-09-30 12:40:11 -07:00
Ilya Lavrenov
af6a64d76b
cv::accumulate functions
2014-09-30 11:07:45 -07:00
Roman Donchenko
d54d580f79
Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport
2014-09-30 15:55:26 +00:00
Ilya Lavrenov
be3efdf274
cv::sum refactoring
2014-09-30 14:36:21 +00:00
Ilya Lavrenov
a3e56114d1
cv::multiply
2014-09-30 14:20:22 +00:00
Alexander Alekhin
7e8846b81e
Merge pull request #3223 from vbystricky:oclopt_BgSubMOG2
2014-09-30 13:39:20 +00:00
Alexander Smorkalov
71c4e96e17
Test fisheye.rectify disabled for Tegra.
2014-09-30 14:49:33 +04:00
Alexander Alekhin
4d63362206
Merge pull request #3278 from akarsakov:ocl_houghlines_perf_test
2014-09-30 10:49:14 +00:00
StevenPuttemans
60fd5c2a3a
fixing dependencies
2014-09-30 11:53:46 +02:00
Alexander Smorkalov
8271c4e9c4
Highgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04.
2014-09-30 13:35:19 +04:00
Alexander Smorkalov
1f4fe3bb27
GStreamer 1.0 backport from master branch.
2014-09-30 12:30:09 +04:00
Alexander Smorkalov
a0431acb37
OpenCV Manager version++.
2014-09-30 12:05:46 +04:00
Ilya Lavrenov
81548a30aa
cv::medianBLur
2014-09-30 07:59:33 +00:00
Alexander Karsakov
4880dd0cd6
Added performance test for OCL version of HoughLines and HoughLinesP
2014-09-30 11:03:54 +04:00
Adrien BAK
037f27c882
change masking to patchNaNs
2014-09-30 14:58:40 +09:00
Adrien BAK
2411556242
fix photo::cloning::IlluminationChange when IPP is used
2014-09-30 14:28:44 +09:00
Artur Wieczorek
e3f1d722e7
Remove ATL dependency from MSMF capture code
...
Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.
2014-09-30 01:35:59 +02:00
Ilya Lavrenov
8e1ccfae3d
cv::boxFilter
2014-09-29 13:54:31 -07:00
Ilya Lavrenov
1c491c42cd
fix for cornerHarris
2014-09-29 14:59:46 +00:00
Alexander Karsakov
eaf5a163b1
Added HoughLinesP OCL implementation
2014-09-29 16:48:16 +04:00
Maksim Shabunin
a160158cb3
Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4
2014-09-29 12:07:22 +00:00
Alexander Karsakov
3695a31606
Combined counter and corner buffers into one
2014-09-29 11:10:57 +04:00
Artur Wieczorek
34533dc569
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
2014-09-29 00:39:35 +02:00
Artur Wieczorek
655b22e050
Fixed CMake issue with FFMPEG videoio configuration
2014-09-29 00:39:05 +02:00
Ilya Lavrenov
bbc161e1cb
fix for cv::Mat::convertTo with scale
2014-09-28 14:51:30 -07:00
Ilya Lavrenov
f50f0ba63e
cv::norm
2014-09-28 07:28:33 -07:00
Ilya Lavrenov
44ea50f1c4
cv::countNonZero
2014-09-28 07:06:53 -07:00
Ilya Lavrenov
34a571d37f
cv::Mat::dot
2014-09-28 05:00:22 -07:00
Ilya Lavrenov
e46332a183
cv::Mat::convertTo with scale and shift
2014-09-28 03:49:56 -07:00
Ilya Lavrenov
74e60e44ad
cv::compare
2014-09-28 02:41:08 -07:00
Ilya Lavrenov
857a2d5bfd
cv::addWeighted
2014-09-28 01:11:07 -07:00
abidrahmank
797143d515
extending stitching module for Java and Python bindings
2014-09-27 19:35:49 +04:00
Vadim Pisarevsky
e6f653af44
Merge pull request #3269 from asmorkalov:ocv_gstreamer3
2014-09-27 15:25:20 +00:00
Vadim Pisarevsky
f187fd99da
Merge pull request #3271 from mgeorg:reset_ffmpeg_mutex
2014-09-27 13:09:24 +00:00
Vadim Pisarevsky
01a883df0c
Merge pull request #3267 from a-wi:MSMF_capture_fixes_v3
2014-09-27 13:07:12 +00:00
Vadim Pisarevsky
6a53cb9307
Merge pull request #3266 from mshabunin:arm_warning
2014-09-27 13:06:44 +00:00
Vadim Pisarevsky
1920232268
Merge pull request #3260 from a-wi:MSMF_file_error
2014-09-27 13:06:18 +00:00
Manfred Georg
7f4eb4f6c6
set ffmpeg mutex to NULL on destruction.
...
The Mutex manager registered with ffmpeg must reset the mutex to NULL after destruction, otherwise ffmpeg will give the invalid mutex to the next mutex manager when it asks it to CREATE a new mutex.
See ffmpeg code: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=libavcodec/utils.c;h=28c5785398fcf11a3d3c70a8cd09e9df798e2734;hb=HEAD#l3423
Cherry picked from head (file has moved but issue is the same).
Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp
2014-09-26 10:19:34 -07:00
Manfred Georg
8d95c91805
set ffmpeg mutex to NULL on destruction.
2014-09-26 09:44:25 -07:00
Ilya Lavrenov
d090fcf2fe
cv::moments (CV_8UC1)
2014-09-26 14:39:04 +00:00
Ilya Lavrenov
09fbc78a97
cv::threshold
2014-09-26 13:16:48 +00:00
Ilya Lavrenov
b4fc87c380
cv::remap
2014-09-26 10:35:28 +00:00
Ilya Lavrenov
6377f5a458
fixed warps accuracy tests
2014-09-26 09:41:46 +00:00
Ilya Lavrenov
4dd6148646
cv::resize 16uc1
2014-09-26 09:41:46 +00:00
Ilya Lavrenov
c0b702a994
cv::resize area 2x
2014-09-26 09:41:45 +00:00
Ilya Lavrenov
12001a42f9
corners
2014-09-26 09:41:45 +00:00
Ilya Lavrenov
d30ce2b9ac
canny
2014-09-26 09:41:45 +00:00
Maksim Shabunin
047abb0050
Merge pull request #3258 from ilya-lavrenov:neon_convert
2014-09-26 09:27:16 +00:00
Dinar Ahmatnurov
de6edcc48a
fixing issue with "ёЁ";
2014-09-26 11:32:14 +04:00
Alexander Smorkalov
23456d67e5
Added test on CAP_PROP_FRAMECOUNT option for cv::VideoCapture
2014-09-26 10:50:22 +04:00
Alexander Smorkalov
15251056ba
Fixed compatibility with GStreamer 1.x
2014-09-26 10:45:08 +04:00
Alexander Smorkalov
cc6e6aa028
Fixed query of basic VideoCapture properties. Added tests for them.
2014-09-25 14:40:54 +04:00
Artur Wieczorek
302b138aa7
CMake configuration for MSMF capture
...
Applied in PR3247 to 2.4 branch.
2014-09-25 12:05:54 +02:00
Artur Wieczorek
b91bd6716c
Fixed MSMF file capture error while opening the file containing unsupported video stream format
...
Applied in PR3260 to 2.4 branch
2014-09-25 11:54:15 +02:00
Artur Wieczorek
8f334b4e41
Fixed assertion warning in MSMF frame grabber
...
Applied in PR3251 to 2.4 branch
2014-09-25 11:51:31 +02:00
Artur Wieczorek
7c00b17085
Fixed MSMF video capture initialization
...
Applied in PR3251 to 2.4 branch.
2014-09-25 11:49:31 +02:00
Artur Wieczorek
25cf51637d
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
...
Applied in PR3243 to 2.4 branch.
2014-09-25 11:45:11 +02:00
Artur Wieczorek
6ad3427426
Fixed compilation errors under VS 2010 and Win 7
...
Applied in PR3240 to 2.4 branch.
2014-09-25 11:43:13 +02:00
Maksim Shabunin
e88a36621e
Fixed warning during cross compile for ARM
2014-09-25 12:27:48 +04:00
Ilya Lavrenov
345b1369be
correct neon rounding
2014-09-25 07:54:52 +00:00
Dinar Ahmatnurov
e9f7c4aeba
added Cyrillic;
...
added Cyrillic;
replace binary format with hex;
move duplicated code to inline function;
2014-09-25 11:15:20 +04:00
Vadim Pisarevsky
467f5fc90f
Merge pull request #3261 from a-wi:CMake_FFMPEG_config
2014-09-24 17:03:08 +00:00
Vadim Pisarevsky
120594163f
Merge pull request #3249 from mshabunin:java_wrap
2014-09-24 16:58:56 +00:00
Vadim Pisarevsky
541b627d21
Merge pull request #3257 from Atanahel:gbt_bugfix_master
2014-09-24 12:25:18 +00:00
Artur Wieczorek
93d1ceae43
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
2014-09-24 02:11:59 +02:00
Artur Wieczorek
073a7ff95a
Fixed CMake issue with FFMPEG highgui configuration
...
Currently, FFMPEG source files are included in highgui project file regardless of CMake WITH_FFMPEG option.
After applying this PR FFMPEG files are included only if WITH_FFMPEG option is enabled.
2014-09-23 23:46:03 +02:00
Artur Wieczorek
5bf1a4c08c
Fixed MSMF file capture error while opening the file containing unsupported video stream format
2014-09-23 20:21:53 +02:00
Ilya Lavrenov
5d018c090f
Neon optimization of cv::scaleAdd (CV_32F)
2014-09-23 21:16:29 +04:00
Ilya Lavrenov
4b3f2c1972
Neon optimization of Mat::convertTo
2014-09-23 15:06:17 +00:00
Benoit Seguin
450734cc32
Correction of the integer data treated as floating point data bug, already corrected in the 2.4 branch.
2014-09-23 14:03:20 +02:00
Vadim Pisarevsky
ecbec7235f
Merge pull request #3253 from asmorkalov:ocv_gstreamer2
2014-09-23 11:51:25 +00:00
bhack
32f6e1a554
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
...
Taken from 3f07655231
2014-09-23 12:39:16 +02:00
Alexander Smorkalov
0518455163
More accurate selection of color space conversion element for GStreamer 1.x
2014-09-23 14:18:44 +04:00
Alexander Smorkalov
aa57634213
Fixed compatibility with GStreamer 1.x.
2014-09-23 14:04:53 +04:00
Vadim Pisarevsky
7752483486
Merge pull request #3252 from GravityJack:point-division
2014-09-23 08:43:43 +00:00
Vadim Pisarevsky
10bbcca11e
Merge pull request #3251 from a-wi:MSMF_camera_errors
2014-09-23 08:42:57 +00:00
Alexander Smorkalov
a419b64347
Fixed GStreamer encoding pipeline frame drop for most cases.
...
For several muxers and encoders GStreamer still drops the last frame.
2014-09-23 12:31:51 +04:00
Vadim Pisarevsky
19b3aab23f
Merge pull request #3244 from tstellarAMD:2.4-ocl-inline-fix-v2
2014-09-23 07:19:38 +00:00
Vadim Pisarevsky
df28bb5ccd
Merge pull request #3190 from StevenPuttemans:fix_simpleblobdetector
2014-09-23 07:18:01 +00:00
Vadim Pisarevsky
281ce441a8
Merge pull request #3250 from ilya-lavrenov:neon_convert_scale_abs
2014-09-23 07:15:24 +00:00
vbystricky
a75807354d
Optimize OpenCL version function BackgroundSubstractionMOG2
2014-09-23 10:33:30 +04:00
StevenPuttemans
d4ec359f11
Fixing errors
2014-09-22 22:12:27 +02:00
Marc Rollins
c8ede7c9ea
Updating documentation to reflect division operations.
2014-09-22 12:07:16 -07:00
Marc Rollins
f32a6fb9a1
Adding element-wise division operators to Point3_ class.
2014-09-22 11:59:11 -07:00
Marc Rollins
fb9bbf99c4
Adding division operators to Point_ class.
...
Performs element-wise division.
2014-09-22 11:54:52 -07:00
Artur Wieczorek
3603102c89
Fixed assertion warning in MSMF frame grabber
2014-09-22 19:38:04 +02:00
Artur Wieczorek
a615102947
Fixed MSMF video capture initialization
2014-09-22 19:35:36 +02:00
Ilya Lavrenov
515be70867
Neon optimization of cv::convertScaleAbs
2014-09-22 15:47:46 +00:00
Vadim Pisarevsky
9c91d0103f
Merge pull request #3247 from a-wi:CMake_MSMF_configuration
2014-09-22 15:31:09 +00:00
StevenPuttemans
03662c0589
fix blobdetector
2014-09-22 13:58:45 +02:00
Ilya Lavrenov
27b933ba5a
Neon optimization of cv::sum
2014-09-22 09:22:03 +00:00
Maksim Shabunin
0d7b44db50
Java wrappers now support nested namespaces and classes
...
- wrapper support python3
- added wrapper log
- generating full name for nested namespaces and classes
2014-09-22 11:47:03 +04:00
Maksim Shabunin
6337fd0650
Support of bioinspired contrib module wrapping
...
- added java wrapper
- disabled python wrapper
2014-09-22 11:43:29 +04:00
Artur Wieczorek
7c354c14f7
CMake configuration for MSMF capture
2014-09-21 21:03:41 +02:00
Artur Wieczorek
d2ba09e6ff
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
2014-09-19 22:46:09 +02:00
Tom Stellard
934394c5e2
ocl: Don't use 'inline' attribute on functions
...
In C99 'inline' is not a hint to the compiler to inline the function,
it is an attribute that affects the linkage of the function. 'inline'
functions are required to have a definition in a different compiliation
unit, so compilers are free to delete 'inline' functions if they want to.
This issue can be seen in Clang when compiling at -O0. Clang
will sometimes delete 'inline' functions which creates an invalid
program.
Issue 3746: http://code.opencv.org/issues/3746
2014-09-19 16:13:57 -04:00
Vadim Pisarevsky
6c3cadbd73
Merge pull request #3240 from a-wi:MSMF_compilation_errors
2014-09-19 17:36:13 +00:00
Vadim Pisarevsky
4dda2002f6
Merge pull request #3241 from WilhelmHannemann:bugfix_brute_force_match_cl
2014-09-19 17:35:07 +00:00
Artur Wieczorek
539f8032dc
Fixed compilation errors under VS 2010 and Win 7
2014-09-19 17:07:52 +02:00
WilhelmHannemann
150487feda
Bugfix brute_force_match.cl (see http://code.opencv.org/issues/2837 ): wrong results for non-float descriptors in OpenCL BruteForceMatcher
2014-09-19 16:41:54 +02:00
Vadim Pisarevsky
3516e14e05
Merge branch 'bug_3172' of https://github.com/elmarb/opencv into bfmatcher_fix;
...
use different fix for the problem, embedded right into the BFMatcher.
2014-09-19 15:31:21 +04:00
E Braun
d82b918a7b
fix for bug 3172
2014-09-19 14:47:43 +04:00
E Braun
f60726b090
Revert "fix for bug 3172"
...
This reverts commit ed2cdb71e5
2014-09-19 14:47:43 +04:00
E Braun
1675b23a64
fix for bug 3172
2014-09-19 14:47:43 +04:00
E Braun
aa9da6e433
regression test for bug 3172
2014-09-19 14:47:43 +04:00
Maksim Shabunin
2992e3a1b6
Fixed android test detection and some spaces in CMakeLists.txt
2014-09-19 13:11:59 +04:00
Maksim Shabunin
cff5e3ee88
Changed java tests detection procedure
2014-09-19 12:34:42 +04:00
Juan Carlos Niebles
0c988f00bc
Merge github.com:Itseez/opencv
2014-09-18 12:00:28 -05:00
Juan Carlos Niebles
dc49e11527
removed setter methods, replaced by CV_PROP_RW macro
2014-09-18 09:39:35 -05:00
Vadim Pisarevsky
d1afa0e370
Merge pull request #3234 from vpisarev:fixed_photo_test_failure
2014-09-18 13:06:54 +00:00
Vadim Pisarevsky
1578dd1027
Merge pull request #2702 from GregoryMorse:patch-3
2014-09-18 12:38:54 +00:00
Vadim Pisarevsky
06e55ddf38
Merge pull request #2893 from ilya-lavrenov:tapi_vector_width_intel
2014-09-18 12:05:24 +00:00
Benoit Seguin
084835ec30
Fixing a line where integer data was treated as floating point data.
2014-09-18 14:03:13 +02:00
Vadim Pisarevsky
470f427a95
Merge pull request #3232 from Chuanbo-Weng:master
2014-09-18 11:48:29 +00:00
Vadim Pisarevsky
aa6ba149bc
make sure ptr<> is called with proper parameter, otherwise the assertion fails
2014-09-18 15:47:59 +04:00
Juan Carlos Niebles
f610c88103
extended python interface for KalmanFilter
2014-09-17 18:45:48 -05:00
Vadim Pisarevsky
ccaedaedc8
Merge pull request #2047 from GregoryMorse:patch-4
2014-09-17 12:48:45 +00:00
Vadim Pisarevsky
458bde5e24
Merge pull request #3180 from mshabunin:java_ptr_support
2014-09-17 12:07:43 +00:00
Vadim Pisarevsky
3bc174f1bb
Merge pull request #3230 from znah:ipp_median_fix
2014-09-17 12:06:32 +00:00
Chuanbo Weng
c5552788c5
Use vload to read unaligned data instead of dereference operator.
...
According to opencl 1.2 spec 6.1.5:
For arguments to a __kernel function declared to be a pointer to a
data type, the OpenCL compiler can assume that the pointee is always
appropriately aligned as required by the data type. The behavior of
an unaligned load or store is undefined, except for the
vloadn, vload_halfn, vstoren, and vstore_halfn functions defined in
section 6.12.7.
Original code read data of type T from address not aligned by multiple
of sizeof(T), so the result is incorrect. With this patch, the cases
./opencv_perf_imgproc
--gtest_filter=OCL_ImgSize_TmplSize_Method_MatType_MatchTemplate.MatchTemplate/*
could work well with beignet 0.9.3.
Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
2014-09-17 19:28:07 +08:00
Vadim Pisarevsky
c5de129c36
Merge pull request #3222 from dmitrygribanov:dg/2.4-stitching-wave-correction-bugfix
2014-09-17 10:54:02 +00:00
Vadim Pisarevsky
533dd85299
Merge pull request #3225 from jormansa:bug_#3631
2014-09-17 10:40:42 +00:00
Vadim Pisarevsky
4a0364ded5
Merge pull request #3220 from asmorkalov:ocv_gstreamer
2014-09-17 09:55:49 +00:00
Vadim Pisarevsky
d14d4bc110
Merge pull request #3215 from dmitrygribanov:dg/stitching-wave-correction-bugfix
2014-09-17 09:52:34 +00:00
Vadim Pisarevsky
550bd24ca8
Merge pull request #3226 from whoshuu:patch-1
2014-09-17 09:52:01 +00:00
Alexander Mordvintsev
0319120adc
fix: ippiFilterMedianBorder sometimes crash when doing in-place filtering
2014-09-17 13:26:39 +04:00
Philipp Hasper
bac492fff6
Doc: Fixing indentation
2014-09-17 09:30:19 +02:00
Philipp Hasper
68fe45b594
Doc: Fixing indentation
2014-09-17 09:29:17 +02:00
Huu Nguyen
81b9be1623
Fix implicit narrowing error in initializer list
...
The implicit narrowing in the initializer list throws a compiler error for some compilers with C++11 support turned on. The specific error message is: "error: narrowing conversion of 'PyInt_AsLong(((PyObject*)o))' from 'long int' to 'double' inside { }".
Tested on Clang 5.1.0 and Mac OS X 10.9.4.
2014-09-16 15:30:10 -07:00
Alexander Alekhin
4689426a91
Merge pull request #3208 from vbystricky:oclopt_Filter2D
2014-09-16 13:03:45 +00:00
Alexander Smorkalov
38887e6ea9
Code review fixes.
2014-09-16 14:52:41 +04:00
jormansa
1d2d579bd6
bug fixed
2014-09-15 18:09:44 +02:00
Andrey Pavlenko
80687c8a56
Merge pull request #3219 from mshabunin:png_iccp_strip_24
2014-09-15 13:54:19 +00:00
Dmitry Gribanov
8a1d3929cc
Feature based stitching's wave correction bugfix.
...
When we have similar matrices in input, then algorithm returns matrices
with NaN values.
2014-09-15 17:04:08 +04:00
Alexander Smorkalov
343f4b3026
OpenCV version++.
2014-09-15 14:55:25 +04:00
Alexander Smorkalov
3ea8be7292
Several fixes for GStreamer support in OpenCV
...
- Accurate ASYC task handling for both GStreamer generations.
- Correct video duration request for videos.
- More accurate pipeline destruction.
- Correct color space conversion plugin for GStreamer 1.0.
2014-09-15 13:47:09 +04:00
Maksim Shabunin
882426a9b2
Stripped iCCP chunk from png files
2014-09-15 12:48:28 +04:00
Vadim Pisarevsky
c445ce6125
Merge pull request #3218 from berak:docfix_colormap_30
2014-09-15 07:34:16 +00:00
berak
ad20feaca0
small corrections to applyColorMap docs
2014-09-14 21:15:48 +02:00
Vadim Pisarevsky
4057e27539
Merge pull request #3126 from avdmitry:move_KDTree_to_ml
2014-09-14 18:57:23 +00:00
Vadim Pisarevsky
e5ab0ac294
Merge pull request #3201 from PhilLab:patch-3
2014-09-14 18:49:35 +00:00
Vadim Pisarevsky
e810f3052d
Merge pull request #3206 from stonier:parallel_qt
2014-09-14 18:48:51 +00:00
Vadim Pisarevsky
8d61ecbc4d
Merge pull request #3205 from parafin:ximea_unix-3.0
2014-09-14 18:44:41 +00:00
Vadim Pisarevsky
cf15b9e8ad
Merge pull request #3204 from parafin:ximea_unix-2.4
2014-09-14 18:44:23 +00:00
Vadim Pisarevsky
87f0010f42
Merge pull request #3203 from parafin:bug_3858-3.0
2014-09-14 18:44:06 +00:00
Dmitriy Anisimov
a6b29be55b
minor change: moved algorithm type to the end of params
2014-09-13 15:06:07 +04:00
Dmitry Gribanov
ee0da48bd2
Feature based stitching's wave correction bugfix.
...
When we have similar matrices in input, then algorithm returns matrices
with NaN values.
2014-09-12 18:07:54 +04:00
Maksim Shabunin
88aea1d52f
Stripped iCCP chunk from png files
2014-09-12 16:30:23 +04:00
Andrey Pavlenko
79f593a429
Merge pull request #3198 from mshabunin:java_test_fix
2014-09-11 16:15:25 +00:00
Alexander Karsakov
8c08714b8c
Remove two "set" kernel call
2014-09-11 18:11:23 +04:00
vbystricky
b0bf8478e5
Optimization OpenCL version of Filter2D
2014-09-11 12:59:51 +04:00
Maksim Shabunin
39874ef742
Fixed some failing java tests
...
- fixed lena.png extension
- fixed getTextSize wrapper
- added junit html report generation
2014-09-11 11:56:05 +04:00
GregoryMorse
b9d5f3f6e9
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.
...
Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.
My discussion and proposal to finish this change:
Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.
ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.
The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.
It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.
Update cap_msmf.cpp
Fixed bugs and completed the change. I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction). Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it). Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled). After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft. This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration. Better to document that it is not supported.
Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.
The remaining changes are not difficult and will be complete soon along with debug tracing messages.
Update and rename cap_msmf.h to cap_msmf.hpp
Successful test - samples are grabbed
Library updated and cleaned up with comments, marshaling, exceptions and linker settings
Fixed trailing whitespace
VS 2013 support and cleanup consistency plus C++/CX new object fixed
VS 2013 Update 2 library bug fix integrated
Various minor cleanup
Create agile_wrl.h
a-wi's changes integrated
Update cap_msmf.hpp
Update cap_msmf.cpp
Regression test fixes and simplifications
2014-09-10 17:21:38 +08:00
GregoryMorse
b5a4159efc
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.
...
Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.
My discussion and proposal to finish this change:
Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.
ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.
The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.
It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.
Fixed bugs and completed the change. I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction). Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it). Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled). After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft. This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration. Better to document that it is not supported.
Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.
The remaining changes are not difficult and will be complete soon along with debug tracing messages.
Update and rename cap_msmf.h to cap_msmf.hpp
Successful test - samples are grabbed
Library updated and cleaned up with comments, marshaling, exceptions and linker settings
Fixed trailing whitespace
VS 2013 support and cleanup consistency plus C++/CX new object fixed
Conflicts:
modules/highgui/src/cap_msmf.cpp
modules/highgui/src/cap_msmf.hpp
modules/highgui/src/ppltasks_winrt.h
Fix merge conflicts
VS 2013 Update 2 library bug fix integrated
a-wi's changed integrated
2014-09-10 17:05:52 +08:00
Vadim Pisarevsky
2e950eb41b
Merge pull request #3196 from PhilLab:patch-4
2014-09-10 07:56:13 +00:00
Daniel Stonier
d3ad26926d
fixed support for parallelised imshows with qt via the gui receiver.
2014-09-10 03:29:17 +09:00
Igor Kuzmin
ed402c5be6
XIMEA cam support: allow on OS X too
2014-09-09 19:25:14 +04:00
Igor Kuzmin
4d45a2c43f
XIMEA cam support: use correct library for 64 bit Linux
2014-09-09 19:24:16 +04:00
Igor Kuzmin
74827c35ff
fix for issue 3858 (remove unneeded #include's)
...
also use correct include path on Linux
2014-09-09 19:22:20 +04:00
Igor Kuzmin
0421da78b3
XIMEA cam support: allow on OS X too
2014-09-09 19:17:13 +04:00
Igor Kuzmin
b027a84fa1
XIMEA cam support: use correct library for 64 bit Linux
2014-09-09 19:15:03 +04:00
Igor Kuzmin
fbbf4e380f
fix for issue 3858 (remove unneeded #include's)
...
also use correct include path on Linux
2014-09-09 19:10:05 +04:00
Philipp Hasper
62c704d1e9
Updated PnP parameter documentation
2014-09-09 12:24:05 +02:00
Andrey Pavlenko
a8db3df8f6
typo: rect -> roi
2014-09-09 12:25:14 +04:00
Vadim Pisarevsky
faed8f43d6
Merge pull request #3194 from stonier:2.4
2014-09-09 06:33:15 +00:00
Maksim Shabunin
93c03ef05b
Fixed android java test build
2014-09-08 19:21:32 +04:00
Maksim Shabunin
b3bae170ed
Fixed java tests build
...
- disabled xfeature2d dependency for java wrappers
- fixed java wrappers build after cmake rerun
- disabled opencv_ml tests temporarily
- fixed Imgproc usage in java tests
2014-09-08 18:30:03 +04:00
Andrey Pavlenko
43714b9d03
disabling java bindings for xfeatures2d module due to build errors
2014-09-08 18:30:03 +04:00
Alexander Smorkalov
35768ed638
Python tests added to -tests deb package.
2014-09-08 18:11:12 +04:00
Philipp Hasper
cc7aa5890d
Fixing documentation links
2014-09-08 14:41:29 +02:00
Alexander Karsakov
c942c6539a
Remove mul24 since id can be larger 2^23
2014-09-08 13:11:58 +04:00
Daniel Stonier
161f50962d
make sure children are included in the moveToThread
2014-09-08 04:31:37 +09:00
Daniel Stonier
e638b9e805
support invokation of cv windows from parallel threads to an external qt application.
2014-09-08 03:19:56 +09:00
Dmitriy Anisimov
dfaf75f502
moving algorithm type to param
2014-09-06 09:29:32 +04:00
