Ilya Krylov
9c7e0bfd33
Added fisheye camera model
2014-04-25 14:49:36 +04:00
Adrian Stratulat
4fb5680d91
Documentation - minor fix-ups
2014-04-23 17:30:27 +00:00
Artur Wieczorek
f27a886314
Fix for issue #3645 ( http://code.opencv.org/issues/3645 ).
...
Implement missing features in CvCaptureCAM_VFW class.
Implemented missing CvCaptureCAM_VFW::setProperty() member function (handling CV_CAP_PROP_FRAME_WIDTH, CV_CAP_PROP_FRAME_HEIGHT, CV_CAP_PROP_FPS properties).
Extended CvCaptureCAM_VFW::setProperty()/getProperty() functions to handle also CV_CAP_PROP_FPS property.
Minor refactoring of CvCaptureCAM_VFW class.
2014-04-21 17:10:58 +02:00
Alessandro Trebbi
3d25d70627
fix for compiling 2.4 opencv with xcode 5.1
2014-04-18 13:42:47 +02:00
Andrey Pavlenko
7ba4212529
Merge pull request #2544 from alalek:perf_report_regressions
2014-04-15 16:17:39 +04:00
Vadim Pisarevsky
6a5a0fe803
Merge pull request #2016 from pemmanuelviel:kmeansppSquareDist
2014-04-15 13:31:48 +04:00
Roman Donchenko
df8e28283f
Merge pull request #2571 from MartinChodakowski:fix-old-python-doc-typos
2014-04-11 14:15:26 +04:00
Roman Donchenko
4c2db3d6e7
Merge pull request #2579 from maksqwe:test_operations_fix
2014-04-11 14:14:33 +04:00
Roman Donchenko
8ab224746b
Merge pull request #2603 from maksqwe:unused_fix_2.4
2014-04-11 14:14:04 +04:00
Vadim Pisarevsky
dae04aacc3
Merge pull request #2575 from rold2007:Bugfix_1437
2014-04-10 13:31:33 +04:00
Vadim Pisarevsky
b66adc81a4
Merge pull request #2599 from maksqwe:test_calibration_2.4
2014-04-10 13:30:37 +04:00
Maks Naumov
eb89f5207c
remove unused variables in CV_KDTreeTest_CPP::findNeighbors()
2014-04-09 23:07:48 +03:00
Maks Naumov
29d1bce85f
remove unused variable in TEST_P()
2014-04-09 23:06:06 +03:00
Maks Naumov
79eb3c5cde
remove unused variable in OCL_PERF_TEST_P()
2014-04-09 23:04:29 +03:00
Maks Naumov
befbe89bdf
remove unused variable in ocl_moments()
2014-04-09 23:01:49 +03:00
Maks Naumov
eb45cf0c93
remove unused variable in findCorners_caller()
2014-04-09 22:59:52 +03:00
Maks Naumov
9b52b61451
remove unused variable in HOGDescriptor::groupRectangles()
2014-04-09 22:56:19 +03:00
Maks Naumov
a01659825c
remove unused variable in loadFromXML()
2014-04-09 22:53:36 +03:00
Maks Naumov
b033a63e63
fix typo in test_cameracalibration
2014-04-09 14:41:16 +03:00
David Rolland
cb8ddb1179
Corrected bug #1437 . Corrected the cast of two short values from an lParam. lParam contains two signed-short, the position can be negative when another mouse event happens with a mouse_move (mouse_click, etc.)
...
The Microsoft documentation specifies NOT to use LOWORD and HIWORD macros to extract the x/y positions as it won't work correctly with multiple monitors. See http://msdn.microsoft.com/en-us/library/windows/desktop/ms645607(v=vs.85).aspx .
2014-04-09 18:24:21 +12:00
Anatoly Baksheev
3f95818252
Added cloud shading support - additional normals array is used
2014-04-08 20:31:28 +04:00
Firat Kalaycilar
990295644e
made a performance improvement.
...
changed the way the mean value for each pixel is assigned in the output image.
2014-04-08 16:10:32 +03:00
Firat Kalaycilar
9eb0e7d99b
Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_bgimg_gray
2014-04-08 14:58:32 +03:00
Martin Chodakowski
267241b889
Fix typos in old python wrapper documentation(Bug #3628 )
...
Fixed spelling of CV_INTER_LINEAR flag in geometric_transformations.rst
2014-04-08 00:55:08 -04:00
Maks Naumov
8271bd5f14
fix condition in CV_OperationsTest::operations1()
2014-04-07 11:24:27 +03:00
Vladislav Vinogradov
d822d6f101
disable GeneralizedHough tests on gcc 4.7
2014-04-07 09:49:17 +04:00
Vladislav Vinogradov
f8d922ad3e
disable gpu::GeneralizedHough compilation on gcc 4.7
2014-04-04 10:31:33 +04:00
Alexander Smorkalov
0c30b18769
Bug #3611 Initializing static cv::Mat with cv::Mat::zeros causes segmentation fault fixed.
2014-04-01 18:00:44 -07:00
Roman Donchenko
a8cb5c3983
Merge pull request #2554 from asmorkalov:ocv_249_version
2014-04-01 12:16:25 +04:00
Alexander Smorkalov
e23f7303a6
OpenCV version++. OpenCV Manager version++.
2014-03-31 15:00:25 -07:00
Andrey Pavlenko
0d5ffec521
Merge pull request #2553 from ilya-lavrenov:typo
2014-03-31 23:21:07 +04:00
Andrey Pavlenko
97eac3f394
Merge pull request #2551 from ilya-lavrenov:ocl_nonfree
2014-03-31 21:21:27 +04:00
Andrey Pavlenko
bb3c0c066c
Merge pull request #2548 from jet47:gpu_mog2_test
2014-03-31 20:19:21 +04:00
Ilya Lavrenov
9b9769169f
doc typos
2014-03-31 19:57:05 +04:00
Ilya Lavrenov
7df92bbb77
fixed C4505
2014-03-31 17:30:15 +04:00
Alexander Alekhin
eeed9ce247
perf report: summary.py: added custom --regressions map
2014-03-31 16:04:18 +04:00
Andrey Pavlenko
1f4586f3dd
Merge pull request #2541 from JinoBetti:2.4
2014-03-31 15:48:45 +04:00
Vladislav Vinogradov
6d368dc1e7
increase epsilon for MOG2::getBackgroundImage test:
...
it uses float arithmetics
2014-03-30 18:02:03 -07:00
Andrey Pavlenko
51530d4d8e
Merge pull request #2543 from apavlenko:24_haar_revert
2014-03-28 23:17:08 +04:00
Andrey Pavlenko
3747d2643f
Revert pull request #1929 from @alalek "ocl: added workaround into Haar kernels"
...
This reverts commit 3dcddad88a
.
Conflicts:
modules/ocl/src/opencl/haarobjectdetect.cl
2014-03-28 16:08:11 +04:00
Andrey Pavlenko
7d82171af4
- fix test
2014-03-28 16:06:39 +04:00
Andrey Pavlenko
e6e817e613
Revert "Merge pull request #1779 from perping:integral_2.4"
...
This reverts commit 54ea5bbac7
, reversing
changes made to 28e0d3d771
.
2014-03-28 16:05:04 +04:00
Roman Donchenko
0469c18726
Merge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix
2014-03-28 12:45:39 +04:00
Roman Donchenko
4382970739
Merge pull request #2540 from mjul:fixtypos_2.4
2014-03-28 11:58:11 +04:00
Alexander Smorkalov
d17740ec87
Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed.
2014-03-28 04:56:31 +04:00
JinoBetti
91511c1521
Update out.cpp
...
Fixed a bug with the cv::format(cv::Mat, ...) method for matrices with only one row
see http://answers.opencv.org/question/21201/cvformat-does-not-format-the-way-it-should/?answer=23945#post-id-23945 for details
2014-03-27 16:28:40 +01:00
Roman Donchenko
2e3e106676
Merge pull request #2537 from ilya-lavrenov:doc_fix
2014-03-27 17:43:02 +04:00
Martin Jul
a1798cb28e
Fixed typo in BFMatcher in docs.
2014-03-27 13:52:49 +01:00
Ilya Lavrenov
80df44bd75
doc fix
2014-03-27 16:30:29 +04:00
Andrey Pavlenko
a1d151924d
Merge pull request #2527 from apavlenko:ocl_surf_24
2014-03-26 19:03:44 +04:00
Andrey Pavlenko
fa5705613d
splitting plain and OCL tests for SURF.
2014-03-26 17:18:05 +04:00
Roman Donchenko
a7f9677378
Merge pull request #2404 from yashdv:old_basic_structures_doc_fix
2014-03-26 12:18:39 +04:00
Andrey Pavlenko
c1acbb02bc
disabling calls to SURF_OCL causing tests failures
2014-03-25 14:09:49 +04:00
Andrey Pavlenko
63a746c6ea
fixing conditional compilation
2014-03-25 13:16:42 +04:00
Andrey Pavlenko
7e03a8b279
fixing check_docs2.py issue
2014-03-25 13:15:56 +04:00
Roman Donchenko
8af175b81b
Merge pull request #2521 from atrebbi:#3620
2014-03-24 18:54:00 +04:00
Roman Donchenko
f8a100f3e0
Merge pull request #2520 from vlkolesnikov:misprint_fix
2014-03-24 14:05:18 +04:00
Roman Donchenko
9aa6528fd7
Merge pull request #2504 from asmorkalov:android_camera_locks_24
2014-03-24 12:06:51 +04:00
Vladimir Kolesnikov
60803afe8f
Misprint fixed in table formatter
2014-03-24 11:04:49 +04:00
Andrey Pavlenko
ae89787984
Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree
2014-03-24 10:25:47 +04:00
Andrey Pavlenko
cf3a2e30cd
Merge pull request #2517 from ilya-lavrenov:fix
2014-03-24 10:25:04 +04:00
Andrey Pavlenko
259b9e093c
disabling failing tests
2014-03-24 10:12:02 +04:00
Andrey Pavlenko
5421d741bc
making OCL tests conform to the comon style
2014-03-24 10:08:44 +04:00
Alessandro Trebbi
c4a63f6a86
-
2014-03-23 22:00:16 +01:00
Ilya Lavrenov
20b6191842
doc fix
2014-03-23 16:20:00 +04:00
Andrey Pavlenko
244f126ff6
Merge pull request #2454 from apavlenko:2.4_haar_extend
2014-03-21 18:45:58 +04:00
Alexander Smorkalov
0dba5bdc4a
Multiple fixes in camera.
...
Fixed constant value for focus mode FOCUS_MODE_CONTINUES_PHOTO;
Add setters and getters for exposure lock and white balance lock flags;
Excluded camera restart for all setters except frame size.
2014-03-21 17:26:05 +04:00
Roman Donchenko
46d39aff68
Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm
2014-03-21 16:28:48 +04:00
Andrey Pavlenko
fe5eaae102
adding missing include (fixing 'no ocl implementation' error)
2014-03-21 14:30:49 +04:00
Alexander Smorkalov
846266fde4
Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.
2014-03-21 14:16:03 +04:00
Firat Kalaycilar
c9f51d5eed
modified BackgroundSubtractorMOG2::getBackgroundImage so that it can now work with gray-level images.
2014-03-21 09:44:11 +02:00
Andrey Pavlenko
640e180efe
switching to CV_HAAR_SCALE_IMAGE mode, enabling test
2014-03-20 22:22:55 +04:00
Andrey Pavlenko
9c7ba6db90
Merge pull request #2490 from ilya-lavrenov:ocl_sep_filters
2014-03-20 13:54:27 +04:00
Roman Donchenko
68c57a1e82
Merge pull request #2473 from euphrat:mog2_weight_bugfix
2014-03-20 12:40:23 +04:00
Roman Donchenko
a1e5bd71f1
Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control
2014-03-19 14:49:22 +04:00
Firat Kalaycilar
0a16d93e1d
Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in the CUDA and OCL versions of BackgroundSubtractorMOG2
2014-03-18 17:26:24 +02:00
Alexander Smorkalov
b4e4f13f9e
Superres module enabled for Android. GPU samples build fixed for Android.
2014-03-18 17:07:19 +04:00
Firat Kalaycilar
4d9698a4cf
Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_weight_bugfix
2014-03-18 14:00:30 +02:00
Roman Donchenko
bff92da970
Merge pull request #2488 from Nerei:minor_doc
2014-03-18 15:41:20 +04:00
Roman Donchenko
d76226e21b
Merge pull request #2456 from kurodash:pr_use_cvAlloc
2014-03-18 14:39:40 +04:00
Roman Donchenko
bfb1ba371c
Merge pull request #2026 from pemmanuelviel:giveFurthestPoint
2014-03-18 13:40:44 +04:00
Ilya Lavrenov
3940b6163b
remove intel guard since the code is 2 times faster on AMD too
2014-03-17 19:11:21 +04:00
yash
51cb6998ea
made the example consistent with the fuction definition and improved doc
...
made the example consistent with the fuction definition and improved doc
2014-03-17 18:44:02 +05:30
Anatoly Baksheev
0c02e5de25
minor doc fix
2014-03-17 17:02:49 +04:00
Roman Donchenko
882971151d
Merge pull request #2485 from Nerei:viz_correct_viewer_pose
2014-03-17 11:59:14 +04:00
Roman Donchenko
136e5eb804
Merge pull request #2484 from berak:mat_doc_24
2014-03-17 11:57:10 +04:00
Anatoly Baksheev
24d8cbf940
Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry)
2014-03-16 20:07:05 +04:00
berak
80708008a4
missing () on Mat::type()
2014-03-16 14:04:05 +01:00
kuroda sho
f9484bae8a
fix: use "cvAlloc" wrapper function for malloc.
2014-03-14 17:09:08 +09:00
Ilya Lavrenov
61c347fb76
typos
2014-03-13 22:56:46 +04:00
Ilya Lavrenov
357a856cf6
nonfree perf tests
2014-03-13 22:35:08 +04:00
Ilya Lavrenov
6f76e7b42d
improved performance of bitwise ops
2014-03-13 19:42:13 +04:00
Ilya Lavrenov
adc15c2bba
improved performance of cv::ocl::sum
2014-03-13 17:33:18 +04:00
Ilya Lavrenov
3ebfe60008
improved performance of cv::ocl::countNonZero
2014-03-13 15:35:53 +04:00
Ilya Lavrenov
8e79de35a8
changes for GFTT
2014-03-13 14:57:13 +04:00
Ilya Lavrenov
a5afcd9f11
improved performance of cv::ocl::minMax
2014-03-13 14:35:12 +04:00
Firat Kalaycilar
a87607e3ef
Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in BackgroundSubtractorMOG2
2014-03-12 16:14:59 +02:00
Roman Donchenko
836635d2d5
Merge pull request #2434 from Nerei:viz_continue
2014-03-12 16:53:42 +04:00
Anatoly Baksheev
4d7a593c25
minor cmake fix fo macos
2014-03-12 16:22:22 +04:00
Roman Donchenko
1bb0c5747c
Merge pull request #2462 from ibtaylor:fix_deblurring_calcBlurriness_var_name_typo
2014-03-11 17:41:18 +04:00
Andrey Pavlenko
0084dee05b
Merge pull request #2448 from akarsakov:ocl_cxt_termination
2014-03-11 12:57:29 +04:00
Ilya Lavrenov
3eff05e3eb
added performance tests for cv::ocl::calcHist
2014-03-11 12:34:27 +04:00
Ian Taylor
45969bb3ae
fix variable name typo in calcBlurriness
2014-03-10 03:02:06 -04:00
kurodash
0eaeff0641
fix: use "cvAlloc" wrapper function for malloc.
2014-03-07 19:02:37 +09:00
Andrey Pavlenko
229aa62300
Merge pull request #2445 from ilya-lavrenov:ocl_perf
2014-03-06 22:03:01 +04:00
Alexander Karsakov
806e9241a6
Clarifying comments
2014-03-06 16:44:46 +04:00
Alexander Smorkalov
b3e18d23a3
Implicit CUDA and OpenCL control for module definition added.
...
Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used
on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.
2014-03-06 10:31:33 +04:00
Ilya Lavrenov
f7a474180b
tuned some tests
2014-03-06 09:24:02 +04:00
Anatoly Baksheev
fde0185a77
iteractor work
2014-03-06 03:26:21 +04:00
Vadim Pisarevsky
22f42a639f
fixed doc builder warnings; make sure the tests give reasonable results when OpenCL is not available
2014-03-05 18:48:19 +04:00
Alexander Karsakov
4aa891e773
Remove clReleaseDevice call (workaround for pure virtual call on Windows)
2014-03-05 17:57:06 +04:00
Vadim Pisarevsky
60ce2b2e9f
modified SURF's performance test to test OpenCL version as well
2014-03-05 17:10:51 +04:00
Vadim Pisarevsky
da70b04262
made SURF_OCL default constructor parameters the same as SURF
2014-03-05 17:04:49 +04:00
Vadim Pisarevsky
3c1917771b
modified OpenCL SURF API and the tests in 2.4.x to prove that it gives different from CPU results
2014-03-05 16:31:41 +04:00
Dave Hughes
b184d7f27b
Fix for #3554
...
v4l2_scan_controls_enumerate_menu is unused and causes ioctl error on
RaspberryPi and possibly other Video4Linux variants. See
http://www.raspberrypi.org/forum/viewtopic.php?f=43&t=65026 for more
detail.
2014-03-05 02:44:40 +00:00
Andrey Pavlenko
ba4513503e
Merge pull request #2429 from ilya-lavrenov:master_compatible_tests
2014-03-04 19:18:13 +04:00
Roman Donchenko
b5248dbf3f
Merge pull request #2407 from codyrigney92:LKOptFlow_NEON
2014-03-04 15:30:26 +04:00
Roman Donchenko
fa3f29f2b5
Merge pull request #2439 from ilya-lavrenov:typo
2014-03-04 13:51:31 +04:00
Ilya Lavrenov
099ea91823
typos
2014-03-04 12:47:40 +04:00
Roman Donchenko
a600267b9f
Merge pull request #2432 from ilya-lavrenov:summary_py
2014-03-04 11:46:29 +04:00
Ilya Lavrenov
29deff8707
ability to merge logs with intersections only
2014-03-03 13:27:07 +04:00
Roman Donchenko
af8aa8a2fa
Merge pull request #2433 from ilya-lavrenov:typos
2014-03-03 12:20:35 +04:00
Anatoly Baksheev
fb7e74c511
iteractor work
2014-03-02 23:15:53 +04:00
Ilya Lavrenov
eedf86402d
typos
2014-03-02 21:04:17 +04:00
Ilya Lavrenov
767b28f2e3
tests
2014-03-01 18:47:44 +04:00
Cody Rigney
fbc69e444b
Added NEON optimizations for LK optical flow (Intrinsics).
2014-02-28 16:48:04 -05:00
Ilya Lavrenov
c1c3139368
master-like performance tests
2014-02-28 22:40:24 +04:00
Alexander Karsakov
e6f6707558
OCL: Fix for Haar classifier (thanks to Konstantin Rodyushkin).
2014-02-26 18:11:11 +04:00
Roman Donchenko
1db1a83410
Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix
2014-02-25 15:04:24 +04:00
Roman Donchenko
7dc549f166
Merge pull request #2411 from asmorkalov:android_mat_leak_fix
2014-02-25 12:37:01 +04:00
Alexander Smorkalov
c78142acb0
Bug #3391 org.opencv.android.NativeCameraView crashes after latest OpenCV Manager update fixed.
...
The crash was cased by massive Mat objects leak in NativeCameraView class.
2014-02-25 11:54:03 +04:00
Alexander Smorkalov
dbb7aa7856
Highgui_Tiff.decode_tile16384x16384 disabled for Android.
...
Last changes in test leads to SIGKILL on Android.
SIGKILL is called by out of memory killer.
2014-02-25 10:36:20 +04:00
Andrey Pavlenko
d695d4a0bf
Merge pull request #2406 from ilya-lavrenov:abf
2014-02-25 09:12:32 +04:00
Ilya Lavrenov
e1a598c5b3
disabled ABF tests
2014-02-24 23:26:01 +04:00
Nghia Ho
ced8e7a813
Typo
2014-02-24 20:06:20 +11:00
Roman Donchenko
51421098dd
Merge pull request #2201 from mattip:2.4
2014-02-21 17:57:36 +04:00
Matti Picus
dc50dc7254
fix merge
2014-02-21 13:54:58 +02:00
Matti Picus
f5330a44e8
merge with origin
2014-02-21 11:59:49 +02:00
Matti Picus
31c8f2ec57
fix code, it turns out only TIFFReadRGBATile needs buffer pointer mangling
2014-02-20 22:12:22 +02:00
Matti Picus
46d128e073
add test (needs updated opencv_extra repo)
2014-02-20 22:10:22 +02:00
Ilya Lavrenov
aa5311ea9f
backport of master-based perf tests for matchTemplate to 2.4
2014-02-20 18:58:32 +04:00
Vladislav Vinogradov
7fd21d217a
fix bug #3562 :
...
add missing __syncthreads to edgesHysteresisLocalKernel
2014-02-20 10:24:52 +04:00
Roman Donchenko
ce42593fe6
Merge pull request #2368 from asmorkalov:ocv_gcc48_warning_fix
2014-02-19 12:03:06 +04:00
Alexander Smorkalov
4c1ed13846
Warning fixes for GCC 4.8.
2014-02-18 23:53:35 +04:00
Roman Donchenko
af9368d35f
Merge pull request #2370 from ilya-lavrenov:cuda_nlm_typo
2014-02-18 17:00:54 +04:00
Roman Donchenko
c35dab9046
Merge pull request #2359 from SpecLad:moments-no-vectorize
2014-02-18 17:00:32 +04:00
Roman Donchenko
6f19ef8631
Merge pull request #2361 from alekcac:ios_camera_changes
2014-02-18 15:44:56 +04:00
Ilya Lavrenov
da9bdf9c15
fixes typo and unused variables
2014-02-18 14:16:54 +04:00
Alexander Shishkov
77df5948e7
removed trailing spaces
2014-02-18 13:56:26 +04:00
Roman Donchenko
e35d98e566
Worked around an apparent GCC bug in moments.
2014-02-18 13:51:27 +04:00
Roman Donchenko
b7659c62f3
Merge pull request #2366 from yashdv:mat_copyto_doc_bug
2014-02-18 13:47:46 +04:00
yash
394c74b349
edited the doc for mat::copyto and clarified the part regarding reallocation by .create
2014-02-18 15:04:27 +05:30
Andrey Pavlenko
e6420c523d
Merge pull request #2235 from alalek:ocl_svm_perf_test
2014-02-18 13:33:16 +04:00
Roman Donchenko
95d7ecb33f
Merge pull request #2364 from ilya-lavrenov:unused_field
2014-02-18 11:57:36 +04:00
yash
38ef8894b7
Made a sentence in the doc for Mat::copyTo more clearer
2014-02-18 10:51:05 +05:30
Ilya Lavrenov
01527c44fd
removed unused field
2014-02-17 21:50:00 +04:00
Alexander Shishkov
cc529d971b
removed tabs
2014-02-17 17:37:02 +04:00
Evgeniy
8236181c62
Added more colorizing options to XLS generating script
2014-02-17 17:01:23 +04:00
Roman Donchenko
e8d26b02ac
Merge pull request #2339 from jet47:gpu-warnings
2014-02-17 13:35:15 +04:00
Marijan Vukcevich
9a98cd6e65
Update cap_ios_abstract_camera.mm
...
AVCaptureVideoPreviewLayer setOrientation is depricated. This fixes the warning and provides backward compatibility.
2014-02-17 13:23:25 +04:00
Roman Donchenko
8cbb284b7b
Merge pull request #2348 from ilya-lavrenov:typo
2014-02-17 12:02:59 +04:00
Vladislav Vinogradov
150e522bee
fix bug #3552 :
...
replace std::swap with own code
2014-02-16 12:17:17 +04:00
Ilya Lavrenov
510680a5df
typo
2014-02-16 01:42:02 +04:00
Anatoly Baksheev
03bd82796d
source compatibility with master
2014-02-15 23:40:09 +04:00
Anatoly Baksheev
56754e907d
fixed crash for windows if console widow is closed or CTRL_C/CTRL_BRAK keys in console are pressed.
2014-02-15 20:08:04 +04:00
Anatoly Baksheev
1a5dfe421d
Added WidgetMerger, Polyline - colors support for each point independently, simple widgets now compute color array instead of setting global color
2014-02-15 17:02:17 +04:00
Vladislav Vinogradov
8b8c368148
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
2014-02-14 17:56:03 +04:00
Alexander Alekhin
d1606b4aa3
ocl: added SVM perf test
2014-02-14 16:36:46 +04:00
Roman Donchenko
e0d991cf46
Merge pull request #2335 from jet47:gpu-alphacomp-test
2014-02-14 16:20:45 +04:00
Roman Donchenko
fa272c43c2
Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host
2014-02-14 15:37:09 +04:00
Roman Donchenko
a1de9e9ad5
Merge pull request #2329 from ilya-lavrenov:macosx_ogl
2014-02-14 14:38:37 +04:00
Vladislav Vinogradov
1ce5165cb7
temporary disable performance test for alphaComp function
2014-02-14 14:27:43 +04:00
Roman Donchenko
ecbe843061
Merge pull request #2333 from asmorkalov:java_dead_code_fix
2014-02-13 19:21:56 +04:00
Alexander Smorkalov
dbe7634286
Dead code removed as this cannot be null in Java.
2014-02-13 18:17:47 +04:00
Vladislav Vinogradov
eb247d826f
temporary disable perf test for StereoBeliefPropagation
2014-02-13 17:25:59 +04:00
Vladislav Vinogradov
9e69e2a07a
increase epsilon for AlphaComp sanity test for integer input
2014-02-13 17:16:43 +04:00
Ilya Lavrenov
879c0196d4
enabled OpenGL on MacOSX
2014-02-13 00:17:15 +04:00
Stuart Cunningham
5d43d3ca88
Fix Windows build of grfmt_tiff.cpp by using libtiff's integer types.
2014-02-12 23:41:38 +11:00
Stuart Cunningham
8bbce0a2a2
Fix reading of 16-bit TIFF images on big endian host.
...
Use correct integer types for arguments to TIFFGetField to avoid corruption
of values and failed loads of TIFF file when using cv::imread().
Added test where both big and little endian TIFF files are read using imread().
Fixed build of 3rdparty libtiff on big endian hosts.
Reduced memory required during decode_tile16384x16384 test by not converting
large grayscale test image to color image during read.
2014-02-12 21:21:06 +11:00
Zhigang Gong
9aef26e2ad
Workaround a LLVM/Clang 3.3 bug.
...
The LLVM/Clang 3.3 has a bug when compile a cl kernel with
assignment of a scalar to a vector data type. This patch
could work around this bug.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
2014-02-12 13:14:43 +08:00
Anatoly Baksheev
261546f6f6
casting Vec3b operator for viz::Color
2014-02-11 23:27:19 +04:00
Anatoly Baksheev
f1c062c30a
cloud collection finalize
2014-02-10 15:45:46 +04:00
Anatoly Baksheev
5dc17f5d58
Fixed all OpenGL issues for Macos (via objective-C++ layer)
2014-02-10 15:45:46 +04:00
Anatoly Baksheev
069dd8a068
default meshlab background
2014-02-10 15:45:45 +04:00
Anatoly Baksheev
f8ccc115ef
proper render call order (fixes some issues with VTK6.1)
2014-02-10 15:45:45 +04:00
Anatoly Baksheev
17fea0dd0a
fixed size_t/int conversion warnings
2014-02-10 15:45:45 +04:00
Anatoly Baksheev
998aefd1d1
cloud collection merges data only on rendering
2014-02-10 15:45:44 +04:00
Anatoly Baksheev
eb8728d727
Updated cloud io functionality - removed dependency from VTK legacy
2014-02-10 15:45:44 +04:00
Roman Donchenko
63dbe66b41
Merge pull request #2308 from jet47:gpu-tests-timeout
2014-02-10 15:10:31 +04:00
Roman Donchenko
3cc27c769c
Merge pull request #2309 from Nerei:fixed_cl_exe_hang_with_eigen
2014-02-10 14:59:05 +04:00
Anatoly Baksheev
becbfa6281
Fixed Cl.exe hang for VS2008 x64 with Eigen::exp() function
2014-02-10 13:41:27 +04:00
Vladislav Vinogradov
8b44a42a40
decrease input size for several gpu tests to fix "timed out" error:
...
* BruteForceNonLocalMeans
* OpticalFlowBM
2014-02-10 11:50:14 +04:00
Roman Donchenko
1d68a89947
Merge pull request #2303 from jet47:gpu-canny-fix
2014-02-07 19:03:14 +04:00
Roman Donchenko
48f95d92ae
Merge pull request #2294 from jet47:fix-gpu-issues
2014-02-07 16:54:49 +04:00
Vladislav Vinogradov
5dbdadb769
fixed several bugs in CUDA Canny implementation:
...
* out of border access in edgesHysteresisLocalKernel
* incorrect usage of atomicAdd
2014-02-07 16:04:29 +04:00
Vladislav Vinogradov
bfc27271e2
Revert "disable gpu Canny and HoughCircles perf tests:"
...
This reverts commit dbce90692a
.
2014-02-07 14:55:06 +04:00
Vladislav Vinogradov
3e1f74f2ca
fix nonfree module compilation without CUDA
2014-02-07 13:40:37 +04:00
Vladislav Vinogradov
5d099df578
Revert "disable CUDA generalized Hough Transform"
...
This reverts commit 33d42b740c
.
2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
3e4bb371c8
fix epsilons for several gpu tests
2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
b6ba1f226c
Revert "disable gpu CvtColor.*2HSV tests:"
...
This reverts commit 952027a853
.
2014-02-06 18:02:14 +04:00