Anatoly Baksheev
e154bce259
fixed compilation for vs2008
2013-11-17 14:13:13 +04:00
Anatoly Baksheev
d8600d3d13
fixed all Viz warnings
...
moved some headers to precomp.hpp
2013-11-17 14:13:11 +04:00
Anatoly Baksheev
5c6248005a
fixed warnings
2013-11-17 14:08:57 +04:00
Anatoly Baksheev
dfef42f94e
Fixed Viz compilation: removed CV_EXPORTS from cv::viz::Color. The macro forced instantiation of all Matx<double, 4, 1> constructors and triggered StaticAssert there.
2013-11-17 14:08:56 +04:00
Anatoly Baksheev
d275e29ea4
compilation & warnings
2013-11-17 14:08:55 +04:00
Anatoly Baksheev
13bb236ad5
fixed some warnings
2013-11-16 21:18:36 +04:00
Anatoly Baksheev
8f6f9c3e58
compilation for VS2008
2013-11-16 20:14:01 +04:00
Alexander Alekhin
0a698bf145
ocl: fix cvtColor XYZ: variables on stack
2013-11-16 13:45:39 +04:00
Ilya Lavrenov
cc237b7aba
generalized ocl::resize for all data types (INTER_NEAREST mode)
2013-11-15 22:52:29 +04:00
Roman Donchenko
615d6c22d1
Switched OpenCV to a 3-component version number.
...
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
2013-11-15 19:41:53 +04:00
Roman Donchenko
4e2ec7b97d
Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor
2013-11-15 15:55:29 +04:00
Roman Donchenko
2e79dde357
Merge pull request #1799 from SpecLad:avformat-53-6
2013-11-15 11:51:59 +04:00
Roman Donchenko
3b7acf2657
Fix building with FFmpeg 0.8.
...
avformat_find_stream_info was introduced in Libav avformat 53.3,
but it was only merged to FFmpeg in avformat 53.6.
In Libav avformat 53.3-53.5 av_find_stream_info is not removed
(only deprecated), so this shouldn't break building with that.
2013-11-14 17:25:46 +04:00
Roman Donchenko
be88b20154
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor
2013-11-14 14:46:43 +04:00
Roman Donchenko
84da6ca265
Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps
2013-11-14 14:46:06 +04:00
Roman Donchenko
19b3064706
Merge pull request #1790 from ilya-lavrenov:ocl_ref
2013-11-14 14:45:50 +04:00
Ilya Lavrenov
fe76b2116a
added RGBA <-> mRGBA
2013-11-14 12:02:59 +04:00
Ilya Lavrenov
1b7c5b201d
added HLS -> RGB[A][FULL] conversion
2013-11-13 19:35:24 +04:00
Ilya Lavrenov
98915e06bc
added HSV -> RGB[A][FULL] conversion
2013-11-13 19:10:06 +04:00
Ilya Lavrenov
3bdd9626f3
added RGB[A] -> HLS[FULL] conversion
2013-11-13 17:41:40 +04:00
Roman Donchenko
15f4292a1f
Merge pull request #1788 from alalek:perf_test_skip
2013-11-13 17:21:52 +04:00
Ilya Lavrenov
af7c614438
added RGB[A] -> HSV[FULL] conversion
2013-11-13 17:09:05 +04:00
Roman Donchenko
411629a57d
Merge pull request #1786 from SpecLad:cap-images-file-pattern
2013-11-13 17:00:20 +04:00
Roman Donchenko
54ea5bbac7
Merge pull request #1779 from perping:integral_2.4
2013-11-13 15:53:42 +04:00
Roman Donchenko
28e0d3d771
Merge pull request #1784 from SpecLad:ffmpeg-no-png
2013-11-13 15:52:42 +04:00
Alexander Alekhin
fb326a58fc
ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize
2013-11-13 14:17:57 +04:00
Alexander Alekhin
f1873bbca1
perf tests: allow to skip performance tests
2013-11-13 14:17:56 +04:00
Ilya Lavrenov
6770c04073
refactored some functions from ocl arithm
2013-11-13 13:56:49 +04:00
Ilya Lavrenov
c38e4f9639
added eps to ocl::buildWarpPerspectiveMaps perf test
2013-11-13 13:04:02 +04:00
Roman Donchenko
376993be4c
Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn
2013-11-13 12:20:09 +04:00
Michael Pratt
73f1940b03
Add missing limits include
...
Without limits included, several CUDA related files fail to compile with
GCC on Ubuntu:
modules/cudaimgproc/src/hough_lines.cpp:136:9: error: ‘numeric_limits’ is not a member of ‘std’
2013-11-12 22:29:41 -05:00
perping
185059959b
fix haar
2013-11-13 10:19:09 +08:00
perping
1e2fb6de30
fix match_template and haar
2013-11-13 10:09:39 +08:00
Ilya Lavrenov
0bf7350615
fixed compilation of ocl::minMaxLoc for Intel device
2013-11-12 19:14:40 +04:00
huangs
f02ce90559
minX1 should be max(-maxD,0) not max(maxD,0), avoid black band at left
2013-11-12 22:37:23 +08:00
Roman Donchenko
b8e3d3f791
In the image sequence capture, only search for the ordinal in the file name.
...
Searching in directory names can yield confusing results; e.g. if
the input is "jpeg2000/image1.jp2", it will infer the pattern
"jpeg%04d/image1.jp2", which is likely not what the user intended.
If the user really desires for the variable part to be in the
directory name, it can always use an explicit pattern.
2013-11-12 16:26:21 +04:00
Ilya Lavrenov
96121a66c5
kernel warnings on AMD
2013-11-12 15:06:46 +04:00
Roman Donchenko
a81efdbb25
Merge pull request #1775 from ilya-lavrenov:ocl_cvtColor
2013-11-12 14:26:50 +04:00
perping
d6e0ef2710
fix linux warning.
2013-11-12 18:13:44 +08:00
perping
dee584ee15
fix haar
2013-11-12 17:54:03 +08:00
Roman Donchenko
834705490e
Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat
2013-11-12 12:53:34 +04:00
Roman Donchenko
ef4eadd5d3
Merge pull request #1766 from ilya-lavrenov:ocl_remap_linear
2013-11-12 12:40:14 +04:00
Roman Donchenko
46e423d217
Merge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps
2013-11-12 12:26:37 +04:00
perping
8af626d295
fix some bug about haar and match_template.
2013-11-12 13:56:47 +08:00
Ilya Lavrenov
eda6360fa3
added RGB5x5 <-> Gray
2013-11-12 00:32:10 +04:00
Philippe FOUBERT
93120775cd
Using four spaces for indentation.
2013-11-11 20:40:18 +01:00
Roman Donchenko
405227d531
Replaced the image used in the Highgui_Video.ffmpeg_image test.
...
Our prebuilt FFmpeg Windows binaries don't have PNG support enabled
(because that requires zlib), so that makes a PNG image a bad choice
for this test.
When FFmpeg doesn't support PNG, VideoCapture falls back to the
"image sequence" implementation, which doesn't work for single images.
2013-11-11 18:30:04 +04:00
Ilya Lavrenov
daedc6f454
removed 2000x2000, 4000x4000 from test sizes of ocl::adaptiveBilateralFilter
2013-11-11 18:14:44 +04:00
Roman Donchenko
eff53e95f9
Fixed the "image sequence" capture not failing when a pattern isn't found.
...
at can't be a null pointer, so the condition was always false, and
a nonsensical pattern like "image.png%00d" was being inferred.
2013-11-11 18:12:49 +04:00
Ilya Lavrenov
3727168b50
added a performance test for ocl::buildWarpPerspectiveMaps; moved warps to a separate file
2013-11-11 18:07:23 +04:00
Roman Donchenko
ccbd7f8da9
Added a citation which used to be in the gpu module in 2.4.
2013-11-11 18:00:55 +04:00
Roman Donchenko
bfa40e180f
Removed another usage of __func__, following #1763 .
2013-11-11 17:02:50 +04:00
Roman Donchenko
e4dee5b372
Merge pull request #1780 from ilya-lavrenov:ocl_m_pi
2013-11-11 17:00:31 +04:00
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Ilya Lavrenov
1f421fce01
added RGB5x5 <-> RGB conversion
2013-11-11 14:50:44 +04:00
Philippe FOUBERT
05d9375759
Trailing whitespace removal.
2013-11-11 10:26:28 +01:00
perping
73b34e3f85
fix warning.
2013-11-11 15:06:58 +08:00
perping
50579d2524
Make Integral sum support cv_32f, sqsum support cv_64f.
2013-11-11 14:31:02 +08:00
Ilya Lavrenov
5beb887247
replaced custom PI by OpenCL M_PI constant
2013-11-11 00:55:59 +04:00
Ilya Lavrenov
3cc9502c90
added RGB[A] <-> BGR[A] conversion to ocl::cvtColor
2013-11-10 23:14:36 +04:00
Philippe FOUBERT
8b0fc04d93
Fix the build of OpenCV with XIMEA on Windows 64 bits:
...
- crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions)
- the "CMAKE_CL_64" variable is not initialized when using mingw
PR#1039 modified to be able to merge on branch 2.4
2013-11-10 17:46:59 +01:00
Ilya Lavrenov
581a3e444d
added XYZ to RGB conversion to ocl::cvtColor
2013-11-10 14:37:21 +04:00
Ilya Lavrenov
5e02b20482
added RGB -> XYZ conversion to ocl::cvtColor
2013-11-10 13:38:09 +04:00
Ilya Lavrenov
33ae64201c
color.cpp refactoring: created generic interface for toRGB and fromRGB callers
2013-11-10 00:44:37 +04:00
Ilya Lavrenov
a57030a0cd
added YCrCb to RGB, BGR, RGBA, BGRA modes to ocl::cvtColor
2013-11-09 17:03:30 +04:00
Ilya Lavrenov
eba6754b06
fixed ocl::cvtColor for CV_YUV2BGRA and CV_YUV2RGBA
2013-11-09 00:40:45 +04:00
Ilya Lavrenov
8b57893e40
added an accuracy test for ocl::buildWarpPerspectiveMaps
2013-11-08 18:42:13 +04:00
Ilya Lavrenov
4248f82211
added ROI support to ocl::buildWarp*Maps functions
2013-11-08 18:40:53 +04:00
Roman Donchenko
0ac61240c5
Merge pull request #1771 from kiranpradeep:2.4
2013-11-08 17:16:20 +04:00
Kiran Pradeep
5852a913a8
CMake's get_filename_component with NAME_WE parameters, interprets first period as start of extension. For. e.g file name with out extension of 'this.is.a.text.file.txt' will be taken as 'this'. Hence using NAME with regex replacement to get 'this.is.a.text.file'
2013-11-08 14:09:34 +05:30
Roman Donchenko
800d53f76b
Merge pull request #1759 from ilya-lavrenov:ocl_distanceToCenters
2013-11-08 12:39:14 +04:00
Roman Donchenko
0be2752366
Merge pull request #1755 from KonstantinMatskevich:dump_info
2013-11-08 12:31:04 +04:00
Roman Donchenko
0fb629915f
Merge pull request #1763 from SpecLad:cv-func
2013-11-08 12:29:50 +04:00
Michael Pratt
8aafd569c8
Support PyString_AsString() in Python 3 < 3.3
...
In Python 3, version 3.3+, PyUnicode_AsUTF8() provides similar
functionality to Python 2's PyString_AsString().
In older versions of Python 3, there is no public function to provide
the same functionality. However, the "internal" _PyUnicode_AsString()
does provide that functionality, so use it to replace
PyString_AsString().
With this patch, cv2 should compile for Python 3.[0-2].
2013-11-07 23:47:33 -05:00
Baichuan Su
9a0d06247a
Fix the whitespace warning.
2013-11-07 15:04:17 -08:00
Ilya Lavrenov
760b718981
added CV_16SC2 && CV_16UC1 map types support to ocl::remap (INTER_LINEAR mode)
2013-11-08 01:42:48 +04:00
Baichuan Su
99a00d3dd9
Fix merge conflicts
2013-11-07 09:56:59 -08:00
Baichuan Su
befcbf56fe
A minor fix.
2013-11-07 08:52:40 -08:00
Baichuan Su
f0de1a08b8
Fix ocl::calcHarris not support CV_32FC1 bug.
2013-11-07 08:52:39 -08:00
Roman Donchenko
07db81a4bb
Merge pull request #1760 from ilya-lavrenov:ocl_remap_nn
2013-11-07 17:29:16 +04:00
Roman Donchenko
2c38be079e
Enabled CV_Assert and such to print the function name with Visual C++.
...
Also, I made a separate macro for the current function name, which
helps simplify a lot of code that uses it.
2013-11-07 17:22:02 +04:00
Konstantin Matskevich
e9edfd1c54
update
2013-11-07 17:21:56 +04:00
Roman Donchenko
641bb7ac6b
Merge pull request #1737 from vrabaud:2.4
2013-11-07 12:03:30 +04:00
Bo Hu
c88fa27b1d
Removed trailing whitespace in cap_qtkit.mm.
2013-11-06 13:33:17 -08:00
Bo Hu
114579c33b
Added proper testing of the end of quicktime video files.
...
CvCaptureFile::grabFrame() always returns 1 regardless, which causes
dead loop when relying on the return value of VideoCapture::read().
2013-11-06 13:32:11 -08:00
Ilya Lavrenov
fa15769f39
added CV_16SC2 && CV_16UC1 maps support to ocl::remap (nearest neighbour only)
2013-11-06 23:14:04 +04:00
Ilya Lavrenov
56d943388d
speeded up ocl::distanceToCenters
2013-11-06 20:02:31 +04:00
Andrey Pavlenko
296f76a135
Merge pull request #1756 from alalek:ocl_workaround_memory_leaks_with_subbuffer
2013-11-06 18:26:39 +04:00
Harris Gasparakis
a1de91a4fd
Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs
2013-11-06 16:48:50 +04:00
Konstantin Matskevich
5304e9f259
extending openCL info dump
2013-11-06 15:20:05 +04:00
Roman Donchenko
370235c07b
Merge pull request #1711 from SpecLad:cap-broken-mat
2013-11-06 14:53:08 +04:00
Alexander Alekhin
03646e7e01
ocl: workaround for subbuffer memory leaks
2013-11-06 14:02:41 +04:00
Roman Donchenko
b5777efee6
Merge pull request #1716 from ilya-lavrenov:resize_area_sse2_fix
2013-11-06 13:59:44 +04:00
Ilya Lavrenov
e9b54ab844
fixed cv::resize (area fast mode) - it writes outside of array boundary in SSE2 version
2013-11-06 13:53:44 +04:00
Andrey Pavlenko
43c9157220
Merge pull request #1750 from alalek:ocl_update_documentation
2013-11-06 13:32:00 +04:00
Andrey Pavlenko
a3fa7a243d
Merge pull request #1740 from ilya-lavrenov:ocl_corners
2013-11-06 13:31:44 +04:00
Andrey Pavlenko
95767676b7
Merge pull request #1739 from pengx17:2.4_ocl_overload_haar
2013-11-06 13:31:11 +04:00
Roman Donchenko
5c44afa427
Merge pull request #1743 from ilya-lavrenov:ocl_repeat
2013-11-06 13:24:22 +04:00
Roman Donchenko
65389e41db
Revert commit 994e07db0 (PR #1715 ), because it's irrelevant for master.
...
Conflicts:
modules/java/generator/src/cpp/VideoCapture.cpp
2013-11-06 12:32:03 +04:00
peng xiao
53d1873776
Revert back test image.
2013-11-06 11:19:26 +08:00
Alexander Alekhin
3952a0df44
ocl: update comments in ocl.hpp
2013-11-05 23:53:52 +04:00
Alexander Alekhin
5a333bfff4
ocl: update documentation
2013-11-05 23:53:51 +04:00
Andrey Pavlenko
be37d99567
Merge pull request #1752 from alalek:ocl_memory_cleanup_workaround
2013-11-05 23:49:37 +04:00
Andrey Pavlenko
14c3560750
Merge pull request #1751 from ilya-lavrenov:ocl_copyMakeBorder_test_fix
2013-11-05 23:49:12 +04:00
Alexander Alekhin
691d5f4187
ocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory guard
2013-11-05 19:43:07 +04:00
Ilya Lavrenov
e544e34eed
fixed ocl::copyMakeBorder accuracy test
2013-11-05 18:23:34 +04:00
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
Alexander Alekhin
7704dbf866
ocl: svm: restore non BLAS version
2013-11-05 15:15:26 +04:00
Alexander Alekhin
9a63508f50
Revert "disable SVM when AMD BLAS is not available"
...
This reverts commit d63a38e9bf
2013-11-05 15:13:30 +04:00
Vincent Rabaud
0b1df62215
add VERBATIM as advised by @SpecLad
2013-11-05 12:02:22 +01:00
Vincent Rabaud
3b0108e4c1
fix the crash as suggested by @SpecLad
2013-11-05 11:18:20 +01:00
Ilya Lavrenov
e7e7e04dce
came back to relative error
2013-11-05 14:17:31 +04:00
Ilya Lavrenov
2df53d97c5
added ocl::repeat
2013-11-05 12:23:20 +04:00
peng xiao
2a111f7a6c
Let perf/accuracy test of ocl haar uses detectMultiScale api.
...
Fix image to be used by perf test.
2013-11-05 10:40:27 +08:00
Ilya Lavrenov
c89dfd333c
fixed warnings in OpenCL kernels
2013-11-04 15:30:00 +04:00
Ilya Lavrenov
a8426e1c12
fixed ocl::cornerHarris, ocl::cornerMinEigenVal and their accuracy tests
2013-11-04 15:16:00 +04:00
peng xiao
8c1eb5bf0e
Overload detectMultiScale API for ocl::haar.
2013-11-04 14:59:28 +08:00
Vincent Rabaud
e1b2f593d6
fix crash when path has spaces
...
The paths are defined properly with an escape "\ " but you cannot have an escape and
quotes when piping (otherwise, escapes are understood as 2 characters).
So just remove the quotes.
2013-11-01 19:30:58 +01:00
Andrey Pavlenko
dd942df08b
Merge pull request #1736 from alalek:ocl_fix_corner_memory_access
2013-11-01 18:37:35 +04:00
Andrey Pavlenko
2767be9a5e
Merge pull request #1731 from perping:2.4_haar
2013-11-01 16:46:18 +04:00
Roman Donchenko
9d263db8aa
Merge pull request #1734 from asmorkalov:android_manager_version_inc
2013-11-01 16:39:43 +04:00
Alexander Alekhin
99ae9d9cc1
ocl: corner*: fix memory access in kernels; change error check to relative
2013-11-01 16:38:04 +04:00
Andrey Pavlenko
6c21b85fce
Merge pull request #1733 from ilya-lavrenov:cv_remap
2013-11-01 15:53:21 +04:00
Alexander Smorkalov
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
2013-11-01 15:22:34 +04:00
Ilya Lavrenov
5546f4d77f
consistency SSE2 and plain versions of convertMaps and remap
2013-11-01 14:50:41 +04:00
Alexander Alekhin
3b293d6855
ocl: fix testdata for blendLinear
2013-11-01 14:44:13 +04:00
perping
af77111cd6
remove whitespace.
2013-11-01 17:53:35 +08:00
Roman Donchenko
e7e6d9d63c
Merge pull request #1729 from ilya-lavrenov:ocl_moments
2013-11-01 11:56:49 +04:00
Roman Donchenko
a9a39a3aa2
Merge pull request #1730 from ilya-lavrenov:ocl_kern_warn
2013-11-01 11:52:09 +04:00
Roman Donchenko
b1bed14ebc
Merge pull request #1728 from apavlenko:refactor_vcap_jni
2013-11-01 11:39:44 +04:00
perping
af33c118b4
fixed a bug of haar.
2013-11-01 14:07:10 +08:00
Ilya Lavrenov
a8b7573db0
fixed ocl::Moments test
2013-11-01 00:09:11 +04:00
Ilya Lavrenov
1f9ab2e0ca
fixed warnings in ocl kernels
2013-10-31 23:48:02 +04:00
Andrey Pavlenko
dfa5a27bee
Merge pull request #1727 from ilya-lavrenov:ocl_warpPerspective
2013-10-31 15:32:34 +04:00
Andrey Pavlenko
fbabc323ed
Merge pull request #1726 from melody-rain:2.4_tvl1_ocl
2013-10-31 14:03:36 +04:00
Andrey Pavlenko
bf58049d11
Merge pull request #1724 from ilya-lavrenov:ocl_thresh
2013-10-31 13:55:04 +04:00
Andrey Pavlenko
e80f5bed2d
Merge pull request #1710 from melody-rain:2.4_moments_ocl
2013-10-31 13:54:46 +04:00
Ilya Lavrenov
c8aed4996e
fixed ocl::warpPerspective
2013-10-31 13:53:11 +04:00
Andrey Pavlenko
a88360bea6
minor refactoring of Android VideoCapture jni code to make it similar to generated one
2013-10-31 12:42:12 +04:00
Jin Ma
3dbcd05407
fixed a typo.
2013-10-31 16:25:50 +08:00
Jin Ma
145ece8f9c
removed test for double since not all platforms support double, thus the sanity check cannot pass on all the platforms.
2013-10-31 16:21:08 +08:00
Jin Ma
599cf6bea0
Resolved a bug and used ocl::multiply.
2013-10-31 16:09:33 +08:00
Ilya Lavrenov
1d5f5d2364
vectorized ocl::threshold for single channel images
2013-10-31 12:00:53 +04:00
Jin Ma
1bb47f4bdf
modified the copyright info.
2013-10-31 08:47:59 +08:00
Andrey Pavlenko
ef9f690598
Merge pull request #1709 from ilya-lavrenov:ocl_cornerharris
2013-10-31 00:22:37 +04:00
Andrey Pavlenko
5795bb326d
Merge pull request #1723 from ilya-lavrenov:ocl_norm
2013-10-31 00:21:29 +04:00
Andrey Pavlenko
ead37e4a29
Merge pull request #1721 from alalek:ocl_fix_filter2D_64F_kernel
2013-10-31 00:21:10 +04:00
Andrey Pavlenko
68c916aa26
Merge pull request #1719 from ilya-lavrenov:ocl_gaussianBlur
2013-10-31 00:20:51 +04:00
Andrey Pavlenko
089cf423a0
Merge pull request #1717 from alalek:ocl_adjust_worksize
2013-10-31 00:20:34 +04:00
Andrey Pavlenko
9751b3204d
Merge pull request #1715 from asmorkalov:android_java_bincompat_fix
2013-10-31 00:04:03 +04:00
Roman Donchenko
2f4d68c746
Merge pull request #1718 from SpecLad:have-opencv-ocl
2013-10-30 17:33:03 +04:00
Ilya Lavrenov
16df5b007d
disabled upload and download perf tests
2013-10-30 17:08:57 +04:00
Ilya Lavrenov
c674d3cf49
fixed ocl::norm (with NORM_RELATIVE specified) when norm(src2) == 0
2013-10-30 16:48:12 +04:00
Alexander Alekhin
0104f59feb
ocl: filter2D: fix processing of kernel with double datatype
2013-10-30 16:27:46 +04:00
Roman Donchenko
c70fbb95a3
Merge pull request #1712 from alalek:ocl_split
2013-10-30 16:18:50 +04:00
Ilya Lavrenov
8dfde47f89
changed eps in ocl::GaussianBlur test
2013-10-30 16:04:48 +04:00
Alexander Alekhin
7b0f018a74
ocl: adjust worksize for filter2D and boxFilter
2013-10-30 15:30:47 +04:00
Roman Donchenko
4bc105c40b
Merge pull request #1652 from nghiaho12:kalman
2013-10-30 15:11:26 +04:00
Alexander Alekhin
50d2c1066b
ocl: split: update tests and implementation
2013-10-30 14:08:37 +04:00
Roman Donchenko
d07e7897a0
Fixed building with OpenCL, but without the ocl module.
...
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
2013-10-30 14:07:34 +04:00
Alexander Smorkalov
994e07db07
Bug #3276 Java bindings binary compatibility is broken in branch 2.4 fixed.
...
New version of Java wrappers' generator uses different wrappers for VideoCapture
on Android and desktop to prevent binary compatibility issues.
2013-10-30 12:51:49 +04:00
Roman Donchenko
d11921f1a4
Merge pull request #1675 from krodyush:opencl-optimization
2013-10-30 12:28:31 +04:00
Jin Ma
7469c2eb9d
fixed a bug when double is not supported.
2013-10-30 14:37:13 +08:00
Ilya Lavrenov
bf6b5ee925
fixed extrapolation for ocl::cornerMinEigenVal and ocl::cornerHarris; enabled CV_32FC1 for the first function
2013-10-29 19:59:21 +04:00
Roman Donchenko
d6a7a6d503
VideoCapture: copy the captured frame, to avoid dangling Mats
...
Previously, VideoCapture::retrieve would return a Mat that referenced
the internal IplImage. Since the latter is rewritten every time a
frame is captured, it means that if the user captures two frames in a row,
the first frame would reference nothing. Similar if a user captures a frame,
then destroys the VideoCapture instance.
Note that the other branch of the if isn't affected, since flip allocates
a new Mat.
2013-10-29 18:47:08 +04:00
Roman Donchenko
03bbee327b
Merge pull request #1486 from nzjrs:cv2-logpolar
2013-10-29 16:15:57 +04:00
Roman Donchenko
f68b73f831
Merge pull request #1521 from nailbiter:optimCG
2013-10-29 16:14:32 +04:00
Roman Donchenko
334292083e
Merge pull request #1629 from lluisgomez:er_tree_clean_bug_fix
2013-10-29 16:03:51 +04:00
Jin Ma
b6b190df5c
Rewrote moments of opencl version.
2013-10-29 18:05:29 +08:00
Roman Donchenko
75087580de
Merge pull request #1704 from SpecLad:merge-2.4
2013-10-29 13:13:05 +04:00
Andrey Pavlenko
616db74e49
Merge pull request #1663 from vpisarev:ocl_experiments3
2013-10-29 11:14:16 +04:00
Andrey Pavlenko
c5e8a9a29b
Merge pull request #1702 from alalek:ocl_memory_corruption_check
2013-10-29 11:07:04 +04:00
Andrey Pavlenko
c6a01f2641
Merge pull request #1688 from alalek:ocl_fix_filters
2013-10-29 11:05:10 +04:00
Andrey Pavlenko
ea64589164
Merge pull request #1687 from bitwangyaoyao:2.4_fix
2013-10-29 11:03:34 +04:00
Andrey Pavlenko
f4b8babbc8
Merge pull request #1677 from pengx17:patch-1
2013-10-29 11:00:26 +04:00
Andrey Pavlenko
42c4f91ef4
Merge pull request #1495 from StevenPuttemans:bugfix_3282
2013-10-29 10:51:01 +04:00
Andrey Pavlenko
9bfa346c38
Merge pull request #1544 from ilya-lavrenov:ocl_blendLinear
2013-10-29 10:49:46 +04:00
Andrey Pavlenko
e52459a324
Merge pull request #1708 from ilya-lavrenov:ocl_threshold
2013-10-29 10:43:44 +04:00
Andrey Pavlenko
106d5eda5f
Merge pull request #1700 from ilya-lavrenov:ocl_bitwise_perf
2013-10-29 10:43:27 +04:00
Andrey Pavlenko
acadfcff2d
Merge pull request #1707 from ilya-lavrenov:ocl_morph
2013-10-29 10:38:23 +04:00
Andrey Pavlenko
2b05dc7d1e
Merge pull request #1699 from ilya-lavrenov:ocl_minMax
2013-10-29 10:35:58 +04:00
Andrey Pavlenko
5fa6d70ab0
Merge pull request #1695 from ilya-lavrenov:ocl_showDiff
2013-10-29 10:35:42 +04:00
Ilya Lavrenov
c49c3e0a91
fixed and generalized ocl::blendLinear
2013-10-28 23:56:40 +04:00
Ilya Lavrenov
58be2546ca
fixed OpenCL morph operations for case when kernel does not have zero element
2013-10-28 20:09:49 +04:00
Alexander Alekhin
b10e1e5c7e
ocl: filters: update documentation
2013-10-28 20:09:49 +04:00
Alexander Alekhin
98f73705df
ocl: fix morph filters
2013-10-28 20:09:49 +04:00
Alexander Alekhin
0f95f0d8b3
ocl: rewrite filter2D
2013-10-28 20:09:49 +04:00
Alexander Alekhin
0bf9ece998
ocl: rewrite boxFilter
2013-10-28 20:09:49 +04:00
Alexander Alekhin
cb6ea8bfa1
ocl: update filter tests
2013-10-28 20:09:49 +04:00
Roman Donchenko
529f086b62
Merge pull request #1691 from SpecLad:ffmpeg-test
2013-10-28 19:35:08 +04:00
Alexander Alekhin
447c052e59
ocl: memory corruption check
2013-10-28 19:33:00 +04:00
Andrey Pavlenko
95bd32b516
Merge pull request #1705 from ilya-lavrenov:ocl_flip
2013-10-28 19:02:24 +04:00
Andrey Pavlenko
bb15c00665
Merge pull request #1703 from bitwangyaoyao:2.4_fix1480
2013-10-28 19:01:51 +04:00
Andrey Pavlenko
d3c0b36cd0
Merge pull request #1701 from alalek:ocl_fix_canny
2013-10-28 19:01:13 +04:00
Andrey Pavlenko
1cc58f9770
Merge pull request #1698 from ilya-lavrenov:ocl_warp
2013-10-28 18:59:08 +04:00
Ilya Lavrenov
7afbae57ba
fixed ocl::minMax for FP-types
2013-10-28 18:49:16 +04:00
Ilya Lavrenov
eb2f8a2948
ocl tests: show diff when cv::countNonZero(diff) > 0
2013-10-28 18:20:02 +04:00
Ilya Lavrenov
1f7f9c9682
rewrote and generalized ocl::threshold
2013-10-28 18:11:24 +04:00
Ilya Lavrenov
e70dfe5a50
fixed OpenCL morph operations for case when kernel does not have zero element
2013-10-28 16:46:41 +04:00
Ilya Lavrenov
cf5df1a7e7
fixed ocl::flip
2013-10-28 13:57:29 +04:00
Roman Donchenko
d3bcf609f1
Merge pull request #1657 from KonstantinMatskevich:ocldistanceToCenters
2013-10-28 13:46:32 +04:00
Roman Donchenko
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
yao
0fd872bfa9
fix bug #1480
2013-10-28 17:36:43 +08:00
yao
632452cdd8
fix the mismatch running on cpu devices
2013-10-28 16:32:46 +08:00
Roman Donchenko
88f5ef9acc
Merge pull request #1696 from apavlenko:fix_typo_GpuMaterials
2013-10-28 12:18:42 +04:00
Peng Xiao
ab2bd58f5c
Fixed a missing barrier.
2013-10-28 14:17:59 +08:00
konstantin
973137c78e
fix bugs on host and device sides for imgprog_sobel3.cl
2013-10-28 00:14:07 +04:00
Alexander Alekhin
eb4f50ca59
ocl: Canny: port CUDA-based implementation of edgesHysteresisLocal
2013-10-28 00:10:47 +04:00
Ilya Lavrenov
900c303636
added performance tests for ocl::bitwise_or and ocl::bitwose_xor
2013-10-27 20:08:50 +04:00
Alexander Alekhin
9e527fc9f4
ocl: Canny: replace unsafe buffer to oclMat
2013-10-27 18:55:42 +04:00
Ilya Lavrenov
839245e420
fixed tests for ocl::warpAffine and ocl::warpPerspective
2013-10-27 14:49:37 +04:00
konstantin
ddd2b106fb
rename imageproc_sobel2.cl -> imageproc_sobel3.cl for consistency
2013-10-25 21:44:01 +04:00
Andrey Pavlenko
66e5be2d64
Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
2013-10-25 19:47:38 +04:00
Andrey Pavlenko
fc64a4071c
Merge pull request #1689 from ilya-lavrenov:ocl_bilateralFilter
2013-10-25 19:41:56 +04:00
Andrey Pavlenko
4e57f92e6e
Merge pull request #1692 from ilya-lavrenov:ocl_separableFilter
2013-10-25 19:39:21 +04:00
Andrey Pavlenko
d60924f4f2
Merge pull request #1694 from apavlenko:fix_typo
2013-10-25 19:35:19 +04:00
Andrey Pavlenko
2e5db6e56c
fixing typo
2013-10-25 18:53:24 +04:00
Andrey Pavlenko
2b6fca68bf
fixing typo
2013-10-25 18:00:46 +04:00
Ilya Lavrenov
e1596d69cc
fixed extrapolation in ocl::adaptiveBilateralFilter
2013-10-25 17:29:21 +04:00
Ilya Lavrenov
b33a62beb0
fixed separable filter extrapolation
2013-10-25 17:08:44 +04:00
Vadim Pisarevsky
485d36d3c0
changed InputArray's enumeration constant for UMat, since it may potentially conflict with existing OpenCL module. refactored Kernel's setArg API (now UMat is passed to a kernel as a structure, as Alexander A suggested). removed Kernel's cleanup callback from the external API; now each kernel keeps track of used matrices and they are dereferenced after it's complete.
2013-10-25 16:46:03 +04:00
Roman Donchenko
36b5180aa1
Another FFmpeg fix from master.
...
From commit dd74a851
2013-10-25 16:08:14 +04:00
peng xiao
68a8a11161
Rewrite distanceToCenters.
...
It supports NORM_L1 distance types now and can
use user provided indices.
Also fixed a bug of kmeans where distance pointers should be float instead
of double.
NORM_L2 changed to NORM_L2SQR, Accuracy and Perf tests are added
added ROI support in accuracy test of distanceToCenters
2013-10-25 15:02:00 +04:00
Roman Donchenko
1188894133
Fixed indentation in CV_FFmpegWriteBigVideoTest::run.
2013-10-25 14:37:54 +04:00
Roman Donchenko
2ca49eef37
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
(cherry picked from commit dfe07df87b
2013-10-25 14:34:02 +04:00
Roman Donchenko
5a5d569d72
Changed MPEG-2 resolution in the FFmpeg test.
...
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
(cherry picked from commit 424a7b0ab0
2013-10-25 14:31:27 +04:00
Roman Donchenko
260c2e0b08
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
...
(cherry picked from commit 3f3ae33327
2013-10-25 14:29:37 +04:00
Ilya Lavrenov
9ea6001d08
enabled ocl::bilateralFilter ROI testing
2013-10-25 13:32:35 +04:00
Andrey Pavlenko
f177e65871
Merge pull request #1683 from alalek:ocl_restore_showdiff
2013-10-25 13:19:02 +04:00
yao
dd0fa63ca8
fix the bug of ocl::bruteForceMatcher
2013-10-25 16:01:41 +08:00
Vadim Pisarevsky
6416c33020
fixed some bugs in OpenCL branch of UMat implementation; maybe now the tests will finally pass?! (please ;( )
2013-10-25 11:19:40 +04:00
Vadim Pisarevsky
ace0d4bad0
hopefully, the last test failures are fixed now
2013-10-24 23:31:00 +04:00
Vadim Pisarevsky
5920bd4f2e
fixed whitespace errors
2013-10-24 23:18:05 +04:00
Vadim Pisarevsky
caa33b2242
added first very simple test for UMat<=>Mat conversion
2013-10-24 22:33:41 +04:00
Roman Donchenko
3b08bf6b62
Merge pull request #1682 from SpecLad:Wmissing-declarations
2013-10-24 22:19:17 +04:00
Leszek Swirski
6e4fb8f275
Replace $(Configuration) with $<CONFIGURATION>
2013-10-24 18:20:16 +01:00
Roman Donchenko
496859a944
Merge pull request #1643 from alalek:cmake_fix_java_link_rules
2013-10-24 19:38:43 +04:00
Alexander Alekhin
4b17d073c0
cmake: fix linker dependencies for opencv_java
...
Linker dependencies to all OpenCV modules are invalid.
We should not include other bindings in this list (like "opencv_python").
2013-10-24 19:04:59 +04:00
Roman Donchenko
f51e490bad
Fixed a Wmissing-declarations warning when compiling with MinGW.
2013-10-24 18:35:08 +04:00
Vadim Pisarevsky
b1aa4a4913
yet another attempt to fix test failures
2013-10-24 18:00:15 +04:00
Vadim Pisarevsky
e14171fd33
fixed crash in Python bindings
2013-10-24 17:37:33 +04:00
Roman Donchenko
7e1ded0ebd
Merge pull request #1664 from SpecLad:merge-2.4
2013-10-24 17:27:30 +04:00
Vadim Pisarevsky
a9065b7d0c
trying to fix failures in tests
2013-10-24 17:23:48 +04:00
Vadim Pisarevsky
303df78cca
removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now
2013-10-24 16:08:15 +04:00
Roman Donchenko
dfe07df87b
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
2013-10-24 14:09:08 +04:00
Ilya Lavrenov
dab3000778
fixed bug in ocl::equalizeHist
2013-10-24 13:59:25 +04:00
Andrey Pavlenko
2279c209c8
Merge pull request #1676 from ilya-lavrenov:ocl_resize_test
2013-10-24 11:23:55 +04:00
Andrey Pavlenko
931a2ae14f
Merge pull request #1673 from ilya-lavrenov:ocl_norm
2013-10-24 11:23:36 +04:00
Andrey Pavlenko
e7f39eb46e
Merge pull request #1672 from ilya-lavrenov:ocl_arithm
2013-10-24 11:23:19 +04:00
Andrey Pavlenko
4cf598a862
Merge pull request #1669 from ilya-lavrenov:ocl_copyMakeBorder
2013-10-24 11:23:01 +04:00
Peng Xiao
4b712eeded
Update imgproc_canny.cl
...
Reordering condition checking.
2013-10-24 12:07:54 +08:00
Alexander Alekhin
133d889e33
ocl: show diff
2013-10-24 03:44:56 +04:00
konstantin
9f0995fbe0
try to made compatible with mac
2013-10-23 23:56:22 +04:00
Ilya Lavrenov
5864895ec6
fixed ocl::copyMakeBorder
2013-10-23 23:52:05 +04:00
konstantin
ebb2c3e01f
try to fix build error
2013-10-23 23:18:21 +04:00
Ilya Lavrenov
7c1443cbdd
fixed an accuracy test for ocl::resize (in some cases dsize.area() was equal to 0)
2013-10-23 22:13:18 +04:00
konstantin
2f62940a0e
Added few opencl optimizations (as Intel platform codepath):
...
1. HaarDetetctor: repack nodes to reduce memory footprint
2. cornerMinEigVal: 4 ocl kernels are fused into 1 for sobel calculation
2013-10-23 20:38:11 +04:00
Ilya Lavrenov
29499ed51a
moved to relative errors in ocl::norm tests
2013-10-23 19:53:04 +04:00
Ilya Lavrenov
87fc3441f2
workaround for cv::multiply bug
2013-10-23 18:42:55 +04:00
Roman Donchenko
424a7b0ab0
Changed MPEG-2 resolution in the FFmpeg test.
...
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
2013-10-23 17:42:00 +04:00
Roman Donchenko
3f3ae33327
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
...
This should actually remove the need for the workaround from
the previous commit.
2013-10-23 14:56:37 +04:00
Roman Donchenko
eb86d37b26
Removed some dubious FFmpeg hack that no longer works.
2013-10-23 14:56:37 +04:00
Vadim Pisarevsky
5a34272150
fixed build on Windows
2013-10-23 00:17:18 +04:00
Vadim Pisarevsky
de521fc9fa
fixed some more compile bugs (including Python bindings)
2013-10-22 23:34:16 +04:00
Roman Donchenko
bb461fab34
Merge pull request #1649 from asandwhich:2.4
2013-10-22 19:16:09 +04:00
Vadim Pisarevsky
d3076c5014
hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors
2013-10-22 17:41:28 +04:00
Roman Donchenko
779acfa715
Suppressed -Wundef in bioinspired, because of OpenCL headers.
2013-10-22 15:16:22 +04:00
Roman Donchenko
4036f6a3d0
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
2013-10-22 14:28:00 +04:00
Vadim Pisarevsky
d8c8339bec
the first draft of transparent API and new UMat class. more files
2013-10-22 14:05:15 +04:00
Vadim Pisarevsky
278fb617d2
the first draft of transparent API and new UMat class.
2013-10-22 14:04:49 +04:00
Roman Donchenko
6640846e95
Merge pull request #1653 from jlblancoc:master
2013-10-22 13:53:12 +04:00
Roman Donchenko
1e556e08dc
Merge pull request #1661 from look4pritam:my-branch
2013-10-22 13:45:25 +04:00
look4pritam
8c121d372a
Small OpenCV-CUDA bugs are fixed.
2013-10-22 12:08:43 +05:30
Jose-Luis Blanco-Claraco
80e667b647
Minimized the number of arguments required to workaround the MSVC2013 compiler bug.
2013-10-21 21:43:26 +02:00
Jose-Luis Blanco-Claraco
77023e2366
Added comment to features2d_init.cpp explaining the reason for the extra parameters.
2013-10-21 21:17:15 +02:00
Alexander Alekhin
e7fd053478
ocl: fix FFT initialization
2013-10-21 19:48:36 +04:00
Alexander Alekhin
9acca12d2d
ocl: workaround for ProgramCache cleanup issue, use RAII to print kernel build error
2013-10-21 19:16:33 +04:00
Jose-Luis Blanco-Claraco
c33ca77838
Undo changing whitespace.
2013-10-21 15:59:26 +02:00
Jose-Luis Blanco-Claraco
bec35eeddb
Avoid duplicated variable declarations.
2013-10-21 15:57:11 +02:00
Roman Donchenko
29f37fc130
Merge pull request #1575 from jet47:gpu-buffer-pool
2013-10-21 16:35:14 +04:00
Roman Donchenko
21233656bd
Merge pull request #1540 from jet47:gpuarithm-cudev
2013-10-21 16:34:45 +04:00
Roman Donchenko
e290436a4c
Merge pull request #1492 from jet47:gpucodec-cudev
2013-10-21 16:30:15 +04:00
Roman Donchenko
f25b77ff1e
Merge pull request #1534 from jet47:fix-cuda-5.0-build
2013-10-21 16:29:37 +04:00
Andrey Pavlenko
aec7d9c1db
Merge pull request #1647 from ilya-lavrenov:ocl_tests_demonstrative
2013-10-21 16:06:36 +04:00
Andrey Pavlenko
0ad04d66e3
Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix
2013-10-21 16:00:13 +04:00
Andrey Pavlenko
e82fd12a67
Merge pull request #1644 from ilya-lavrenov:ocl_matrix_operations
2013-10-21 15:59:19 +04:00
Andrey Pavlenko
bd1a1cc031
Merge pull request #1633 from ilya-lavrenov:ocl_imgproc
2013-10-21 15:59:00 +04:00
Ilya Lavrenov
9d923b50ac
fixed ocl::Laplacian for case when scale != 1
2013-10-21 14:27:34 +04:00
Ilya Lavrenov
6085c416a7
missed initialization of kernel size
2013-10-21 14:27:14 +04:00
Roman Donchenko
599d51ec14
Merge pull request #1651 from ilya-lavrenov:misprint
2013-10-21 14:00:23 +04:00
peng xiao
7285341083
1. Let btvRegWeights to be constant per process call.
...
2. Let Farneback to be the default optical flow method.
3. Fix a timing method bug for ocl path.
4. Remove useless finish operation in farneback
5. Refactor buffer usage.
2013-10-21 10:21:37 +08:00
Jose-Luis Blanco-Claraco
52a904e17b
Fixed MSVC 2013 build errors and workaround for an internal compiler crash.
2013-10-20 17:28:45 +02:00
Nghia Ho
2238e711b5
Copied errorCovPre to errorCovPost. This allows the correct behaviour of the uncertainty to grow when there is missing data for each predict step.
2013-10-20 13:00:11 +11:00
Ilya Lavrenov
4f68f35a78
added reflect, reflect101, replicate, wrap border types to ocl::remap
2013-10-19 23:38:50 +04:00
Ilya Lavrenov
bebc1c9330
misprint
2013-10-19 22:59:47 +04:00
Kevin
8f995fac88
Change intrinsic camera matrix initialization
...
In the function cvInitIntrinsicParams2D the principal point for
normalized image coordinates is set to 0/0. This updates the function
to initialize the principal point at 0.5/0.5.
2013-10-19 02:10:20 -05:00
Ilya Lavrenov
e9cef2990e
made more demonstrative message about test fails
2013-10-19 01:17:46 +04:00
Andrey Pavlenko
d50f0d2ed2
Merge pull request #1587 from alalek:opencl_khronos_headers
2013-10-18 18:41:13 +04:00
Roman Donchenko
83b36dcbcf
Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix
2013-10-18 18:39:08 +04:00
Roman Donchenko
d700cc60be
Merge pull request #1641 from jet47:imshow-opengl-fix
2013-10-18 18:23:00 +04:00
Ilya Lavrenov
022b5d6c74
refactored ocl matrix operations accuracy tests
2013-10-18 17:36:38 +04:00
Ilya Lavrenov
b3e1a4598c
enabled double in copyMakeBorder kernel
2013-10-18 16:46:51 +04:00
Ilya Lavrenov
2681cef5d7
rewrote ocl::remap
2013-10-18 16:41:09 +04:00
Ilya Lavrenov
3fe74ad124
fixed ocl::copyMakeBorder
2013-10-18 16:39:47 +04:00
Ilya Lavrenov
36342eb425
added ROI support to ocl::convolve
2013-10-18 16:36:11 +04:00
Ilya Lavrenov
110a92c126
added ROI support to ocl::columnSum
2013-10-18 16:33:48 +04:00
Ilya Lavrenov
60f9ba0c64
added ROI support to ocl::CLAHE
2013-10-18 16:31:52 +04:00
Ilya Lavrenov
4a81be7d0b
refactored all the tests in ocl/test/test_imgproc.cpp
2013-10-18 16:29:10 +04:00
Alexander Alekhin
fd4e705b14
ocl: update autogenerated code
2013-10-18 15:47:11 +04:00
Alexander Alekhin
6344da9ac3
ocl: force to use Khronos OpenCL headers
2013-10-18 15:47:11 +04:00
Andrey Pavlenko
4cbf0cb31e
Merge pull request #1640 from alalek:ocl_fix_exp_test
2013-10-18 13:45:12 +04:00
Andrey Pavlenko
97dfd65007
Merge pull request #1626 from ilya-lavrenov:ocl_filters
2013-10-18 13:44:41 +04:00
Vladislav Vinogradov
fa70f95272
fix imshow under Windows with OpenGL support:
...
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
2013-10-17 20:58:33 +04:00
Alexander Alekhin
4bfeeb0738
ocl: perf: use RELATIVE_ERROR in SANITY_CHECK for exp/log/pow
2013-10-17 19:00:36 +04:00
Roman Donchenko
578e984739
OpenCV 2.4.6.2 (Tegra detection and native camera update)
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iF4EABEIAAYFAlIxuvoACgkQdDiF7KIeJGrdaQEA0cMV6JhnsWSnZbRCd3RzyXD7
8mf7qrSjIV9ty1UL9AMA/0d4iUIm/iEiBIEP0DbsshX+trN5kXsH5woriScbZMGS
=WeoS
-----END PGP SIGNATURE-----
Merge tag '2.4.6.2' into 2.4
OpenCV 2.4.6.2 (Tegra detection and native camera update)
2013-10-17 17:19:04 +04:00
Roman Donchenko
fb7b4d2d60
Merge pull request #1636 from ilya-lavrenov:ocl_loop_times
2013-10-17 17:00:45 +04:00
Roman Donchenko
88cc054f10
Merge pull request #1369 from StevenPuttemans:fix_featuretracker
2013-10-17 15:42:38 +04:00
Ilya Lavrenov
07aee1a25c
made LOOP_TIMES as a command line option with default value=1
2013-10-17 12:40:16 +04:00
Roman Donchenko
d411041c53
Merge pull request #1637 from SpecLad:run-py-java-fix
2013-10-17 12:25:31 +04:00
Ilya Lavrenov
da3b7c79b8
refactored filters in the ocl module; added an accuracy tests for ocl::medianFilter
2013-10-17 12:23:56 +04:00
Andrey Pavlenko
7605426dc3
Merge pull request #1613 from alalek:ocl_cvtcolor
2013-10-17 12:07:20 +04:00
Alexander Alekhin
ce0647c9b6
ocl: rewrite CvtColor tests, added roi support
2013-10-16 22:46:21 +04:00
Roman Donchenko
5bb6949bd6
Fix running Java tests with run.py on everything other than Windows.
...
Previously, run.py would assume that the opencv_java library is in the
same directory as the tests, which is only true on Windows.
The library path depends on the build configuration, which may not be
known until the actual build (e.g. with the Visual Studio generators),
so it can't be stored in the CMake cache for run.py to read. I didn't
want to hardcode into run.py where the library is on each platform,
either. So that's why I used the current scheme with the properties
file. It also makes running the tests without run.py a little easier.
2013-10-16 19:22:01 +04:00
Alexander Alekhin
2a9d24323c
cmake: add opencv_java into list of exported targets (fix for android)
2013-10-16 17:23:44 +04:00
lluis
b50185e160
Fix a bug in the er tree clean-up process (see discussion in https://github.com/Itseez/opencv/pull/1520 ). It's not necessary to walk the er tree in order to clean up the memory since it's possible to cleanup the regions in the stack just by iterating over the er_stack vector instead of walking the tree structure. This turns out to be safer because the tree structure of those regions may have been modified previously in er_save function.
2013-10-15 19:44:08 +02:00
Alexander Alekhin
e845184843
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
...
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Roman Donchenko
b420c0b160
Merge pull request #1630 from SpecLad:java-deprecated-assert
2013-10-15 18:36:15 +04:00
Roman Donchenko
a61d1e6494
Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.
...
We don't use it, anyway.
2013-10-15 17:10:12 +04:00
Roman Donchenko
7ff91665cf
In Java bindings, wrap version constants into functions to prevent inlining.
...
Java inlines static finals if they're defined with a constant expression. In
case of version constants we don't want that to happen, since they obviously
change from version to version. If the user substitutes a different OpenCV
jar without recompiling, we want user code to still have relevant values for
the version constants.
This arranges that by turning constant values into function calls, which no
longer count as a constant expression.
2013-10-15 15:44:26 +04:00
Roman Donchenko
7fb18a2311
Merge pull request #1620 from SpecLad:record-build-type
2013-10-15 14:59:53 +04:00
Ilya Lavrenov
741e0242b3
replaced to_string by cv::format
2013-10-15 13:26:01 +04:00
Roman Donchenko
cf71ff0845
Record OpenCV build type among the test properties.
...
Because apparently I love running performance tests for debug builds.
2013-10-15 12:09:31 +04:00
Roman Donchenko
1eb322fa5d
Merge pull request #1622 from a0byte:2.4
2013-10-15 11:51:40 +04:00
Andrey Pavlenko
97da1419e1
Merge pull request #1573 from alalek:perf_simple_strategy
2013-10-14 19:28:49 +04:00
Andrey Pavlenko
7f15ec9d54
Merge pull request #1617 from ilya-lavrenov:ocl_info
2013-10-14 19:27:01 +04:00
Han Qiang
88f68a3fe0
Fixed typo in document.
...
Signed-off-by: Han Qiang <a0byte@gmail.com>
2013-10-14 23:23:59 +08:00
Ilya Lavrenov
ca26028415
demonstrative device info output
2013-10-14 17:18:25 +04:00
Andrey Pavlenko
9e12306d95
Merge pull request #1614 from ilya-lavrenov:ocl_svm_misprint
2013-10-14 16:43:18 +04:00
Andrey Pavlenko
e90a9e810d
Merge pull request #1612 from alalek:ocl_fix_string_info
2013-10-14 16:41:43 +04:00
Andrey Pavlenko
ae56eaa563
Merge pull request #1609 from ilya-lavrenov:ocl_some_optimization
2013-10-14 16:41:25 +04:00
Roman Donchenko
3f8db9d708
Merge pull request #1450 from adrians:neon-pull3
2013-10-14 15:08:37 +04:00
Ilya Lavrenov
28f566b843
misprint in disabling ocl::svm
2013-10-13 23:54:09 +04:00
Ilya Lavrenov
b18101b15a
some optimization of binary ocl::bitwise operations
2013-10-13 23:25:59 +04:00
Ilya Lavrenov
da607c6711
ocl::cvtColor works with ROI properly
2013-10-13 23:09:14 +04:00
Alexander Alekhin
376cd8f84f
perf: added simple collection strategy
2013-10-12 18:05:57 +04:00
Alexander Alekhin
f617c0d4a2
ocl: fix for get string info from OpenCL
2013-10-12 16:56:21 +04:00
Andrey Pavlenko
c5afaa4e8d
Merge pull request #1610 from alalek:ocl_fix_perf_kalman
2013-10-12 16:31:02 +04:00
Andrey Pavlenko
19dca324ae
Merge pull request #1608 from alalek:fix_warn_upd_haar
2013-10-12 16:24:04 +04:00
Andrey Pavlenko
f9fe1b9b09
Merge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup
2013-10-12 16:12:05 +04:00
Andrey Pavlenko
a55cc60136
Merge pull request #1606 from ilya-lavrenov:ocl_imgproc
2013-10-12 16:10:04 +04:00
Andrey Pavlenko
9f5cda799f
Merge pull request #1602 from alalek:ocl_test_dump_info
2013-10-12 16:08:24 +04:00
Andrey Pavlenko
4e31a3df24
Merge pull request #1603 from ilya-lavrenov:ocl_disable_svm_noblas
2013-10-12 16:04:05 +04:00
Kyrylo Shegeda
d37d46d279
Fix a typo in kernel size
2013-10-11 23:31:31 -04:00
Alexander Alekhin
4413bee693
ocl: reverted type of perf test params for Kalman filter
2013-10-12 02:36:53 +04:00
Ilya Lavrenov
dfbea3518a
refactored ocl/src/imgproc.cpp
2013-10-11 23:39:41 +04:00
Ilya Lavrenov
5a309e8f6e
fft cleanup ignoring
2013-10-11 20:25:03 +04:00
ilya-lavrenov
d63a38e9bf
disable SVM when AMD BLAS is not available
2013-10-11 19:25:34 +04:00
Alexander Alekhin
723af15228
ocl: fix warnings from GCC 4.8, update Haar
2013-10-11 18:42:17 +04:00
Alexander Alekhin
1980aad8d7
ocl: dump device info in tests
2013-10-11 18:24:59 +04:00
Alexander Alekhin
3b0823db7e
ocl: fix CV_EXPORTS usage (misplaced in functions declarations)
2013-10-11 18:07:38 +04:00
Alexander Alekhin
ce1177151e
ocl: fix cleanup in static builds
2013-10-11 18:07:38 +04:00
Alexander Alekhin
57120c1a60
ocl: remove support_image2d(): we target on OpenCL 1.1 (with image2d support by default)
2013-10-11 17:16:03 +04:00
ilya-lavrenov
ca32583fdd
fixed ocl optical flow: sparse and tvl1
2013-10-11 13:55:49 +04:00
Andrey Pavlenko
171e0e62ec
Merge pull request #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
2013-10-11 12:40:12 +04:00
Andrey Pavlenko
b7f1edccfb
Merge pull request #1595 from alalek:cl_code_cleanup
2013-10-11 12:37:42 +04:00
Alexander Alekhin
238550cdad
ocl: code cleanup, fix .clb files
2013-10-11 01:19:46 +04:00
Andrey Pavlenko
dfbd5021fd
Merge pull request #1598 from alalek:ocl_fix_build_mac
2013-10-11 00:40:06 +04:00
Ilya Lavrenov
1be77dd2f3
enabled accuracy tests for the functions that use inside AMD Blas/Fft
2013-10-11 00:37:52 +04:00
Alexander Alekhin
0760fdcbdb
ocl: fix build on Mac
2013-10-10 23:11:48 +04:00
Ilya Lavrenov
1f51e6c0de
fixed kernel compilation warnings on MacOSX
2013-10-10 22:56:39 +04:00
Adrian Stratulat
3561bc1bbc
rename vBinOp64f to vBinOp64, minor fixups
2013-10-10 21:28:05 +03:00
Ilya Lavrenov
39c1e5ff73
added perf tests for min, max, abs
2013-10-10 21:54:38 +04:00
Andrey Pavlenko
ad1ba56fcf
Merge pull request #1597 from alalek:ocl_fix_cleanup
2013-10-10 19:02:29 +04:00
Andrey Pavlenko
c820777967
Merge pull request #1596 from alalek:test_fix_run_py
2013-10-10 19:02:10 +04:00
Andrey Pavlenko
3b1c53fa8d
Merge pull request #1551 from alalek:cmake_install_win
2013-10-10 18:20:35 +04:00
Alexander Alekhin
3eba2011b9
test: run.py: return valid errorCode in case of the single test run
2013-10-10 17:17:10 +04:00
Alexander Alekhin
6b9f74ae84
ocl: fix cleanup on Windows platform (for clAmdBlas/clAmdFft)
2013-10-10 16:58:45 +04:00
Adrian Stratulat
cb445d697c
Refactor vectorized arithmetical operations
2013-10-10 15:52:48 +03:00
Andrey Pavlenko
d5723480e1
Merge pull request #1592 from alalek:ocl_program_cache_update
2013-10-10 15:55:58 +04:00
Andrey Pavlenko
a351161fd7
Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h
2013-10-10 15:55:13 +04:00
Ilya Lavrenov
9d1636daa6
catching OpenCL double not supported exceptions
2013-10-10 12:45:55 +04:00
Alexander Alekhin
d26f62569d
ocl: fix compilation warnings, update openCLExecuteKernelInterop
2013-10-10 00:15:02 +04:00
Alexander Alekhin
43c638d07d
ocl: remove cl.hpp dependency (it is missed on Nvidia SDK and on some platforms)
2013-10-09 23:53:25 +04:00
Alexander Alekhin
bc089bb18c
cmake: update java module install rules
2013-10-09 17:49:11 +04:00
Alexander Alekhin
4adede4246
cmake: python module updates
2013-10-09 17:49:11 +04:00
Alexander Alekhin
555c505b70
update cmake 'install' target for Windows platform
...
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
2013-10-09 17:49:10 +04:00
Ilya Lavrenov
d57a7008f1
fixed cmd parser when arg is like -+
2013-10-09 17:42:36 +04:00
Ilya Lavrenov
fccd37de7e
changes eps for NORM_L1
2013-10-09 14:18:07 +04:00
Ilya Lavrenov
488e6aafaf
fixed the PR 1582
2013-10-09 14:16:36 +04:00
Andrey Pavlenko
6b69a66c3c
Merge pull request #1579 from ilya-lavrenov:ocl_norm
2013-10-09 13:52:20 +04:00
Andrey Pavlenko
ff8e5a04a4
Merge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix
2013-10-09 13:49:34 +04:00
Roman Donchenko
3d4ec7ad98
Merge pull request #1583 from SpecLad:name-enum-2
2013-10-09 13:45:40 +04:00
Roman Donchenko
dfb698dc64
Merge pull request #1581 from SpecLad:merge-2.4
2013-10-09 12:33:50 +04:00
Alexander Alekhin
076eeffd4d
ocl: fix CL_RUNTIME_EXPORT for master branch
2013-10-08 19:13:58 +04:00
Ilya Lavrenov
245ff93544
ocl setto fix for windows
2013-10-08 19:11:32 +04:00
Ilya Lavrenov
bdd5038da4
ocl setto fix for windows
2013-10-08 18:52:32 +04:00
Sebastian Krmer
3696174b14
fix documentation warning
2013-10-08 16:49:20 +02:00
Ilya Lavrenov
c404da784f
fixed ocl::norm (previously the function used double as a work type)
2013-10-08 18:43:49 +04:00
Roman Donchenko
cc7a13ea57
Named GraphCutSeamFinderBase to allow its usage in makePtr.
...
Sequel to bcb6f038
2013-10-08 18:13:56 +04:00
Roman Donchenko
f07769e9d8
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectOpenCL.cmake
cmake/OpenCVModule.cmake
modules/imgproc/src/floodfill.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_programcache.hpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/mssegmentation.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/stereo_csbp.cpp
modules/ocl/src/stereobm.cpp
modules/ocl/test/main.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/stereo_match.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-08 17:57:23 +04:00
Sebastian Krämer
4ffd3fb905
add ocl::abs
2013-10-08 15:23:24 +02:00
Sebastian Krämer
c844bbdd82
documentation update for ocl::min and ocl::max
2013-10-08 15:23:18 +02:00
Sebastian Krämer
33df7131ae
add ocl::min and ocl::max (includes accuracy tests update)
2013-10-08 15:23:13 +02:00
Vladislav Vinogradov
342e007dc6
now Allocator accepts GpuMat* instead of 3 pointers
2013-10-08 17:21:25 +04:00
Vladislav Vinogradov
3b412b51ac
moved BufferPool management functions to public
2013-10-08 17:21:22 +04:00
Vladislav Vinogradov
5ea8085220
added BufferPool class
2013-10-08 17:20:29 +04:00
Vladislav Vinogradov
988ab79acb
added BufferAllocator
2013-10-08 17:20:20 +04:00
Roman Donchenko
ae851af648
Merge pull request #1574 from alalek:svm_workaround
2013-10-08 15:31:42 +04:00
Roman Donchenko
65ec9f77d9
Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12
2013-10-08 15:15:31 +04:00
Roman Donchenko
bc3669bfb1
Merge pull request #1576 from alalek:ocl_fix_cl_double
2013-10-08 14:20:11 +04:00
Roman Donchenko
685eceb68a
Merge pull request #1567 from ilya-lavrenov:warn_fix
2013-10-08 13:50:49 +04:00
Roman Donchenko
895308a811
Merge pull request #1538 from StevenPuttemans:bugfix_3283
2013-10-08 13:00:39 +04:00
Roman Donchenko
ec409a436d
Merge pull request #1545 from alalek:ocl_test_fix_rng
2013-10-08 12:59:50 +04:00
Ilya Lavrenov
32f11e6f40
enabled OpenCL 1.2 branch in oclMat::setTo
2013-10-08 12:49:29 +04:00
Ilya Lavrenov
35d9ce0c0c
fixed warnings
2013-10-08 12:46:43 +04:00
Roman Donchenko
95b3a344d9
Merge pull request #1570 from ilya-lavrenov:ipp_warn_fix
2013-10-08 12:32:57 +04:00
Alexander Alekhin
1d6327ba2a
ocl: fix Context::CL_* usage
2013-10-08 12:23:46 +04:00
Alexander Alekhin
f63b0dfaf4
svm: disable failed tests
2013-10-07 18:17:10 +04:00
Roman Donchenko
b08233a3ca
Merge pull request #1569 from ilya-lavrenov:ocl_hough_circles
2013-10-07 17:47:41 +04:00
Roman Donchenko
920e15b41d
Merge pull request #1572 from emchristiansen:includeLimits
2013-10-07 16:59:24 +04:00
Roman Donchenko
f91f8663b6
Merge pull request #1568 from ilya-lavrenov:ocl_pyrlk
2013-10-07 15:53:20 +04:00
Roman Donchenko
801054d611
Merge pull request #1566 from SpecLad:Wshadow-openni
2013-10-07 15:48:40 +04:00
Vladislav Vinogradov
e5188c7e94
added GpuMat::Allocator interface
2013-10-07 09:42:43 +04:00
Greg Hale
88b1847d09
add include limits, for compilers that dont add it implicitly
2013-10-06 01:21:43 -04:00
Eric Martin Christiansen
c8a3a85e26
adds include to fix build
2013-10-05 15:52:19 -07:00
Ilya Lavrenov
036e99d03a
fixed ipp-related warnings
2013-10-05 14:54:00 +04:00
Ilya Lavrenov
8c82decf5b
added plain branch to HoughCircle perf test
2013-10-04 19:51:26 +04:00
Roman Donchenko
46eeb106e2
Merge pull request #1564 from alalek:cl_runtime_fix_32bit
2013-10-04 18:29:04 +04:00
Roman Donchenko
0a13510293
Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update
2013-10-04 18:25:44 +04:00
Ilya Lavrenov
72c35d3a89
fixed mog2
2013-10-04 18:19:01 +04:00
Roman Donchenko
744f4b1609
Merge pull request #1565 from SpecLad:cmake-new-ptr
2013-10-04 18:14:34 +04:00
Roman Donchenko
2660f4bc59
Merge pull request #1562 from ilya-lavrenov:ocl_integral
2013-10-04 18:12:43 +04:00
Ilya Lavrenov
fb73e7b4bd
fixed pyrlk optical flow
2013-10-04 17:56:02 +04:00
Roman Donchenko
aa80250a3d
Merge pull request #1532 from alalek:stereo_csbp
2013-10-04 16:43:51 +04:00
Roman Donchenko
cca2e5d8b1
Merge pull request #1536 from asmorkalov:android_ndk_r9_master
2013-10-04 16:36:44 +04:00
Roman Donchenko
1b51270617
Merge pull request #1558 from SpecLad:Wparentheses-equality
2013-10-04 16:32:09 +04:00
Roman Donchenko
f04cade607
Merge pull request #1559 from SpecLad:Wnull-conversion
2013-10-04 16:08:54 +04:00
Alexander Alekhin
de0f310e81
ocl: tests: RNG usage refactoring
2013-10-04 15:39:39 +04:00
Roman Donchenko
3cfad385ec
Fix a -Wshadow warning in cap_openni.cpp.
2013-10-04 14:23:06 +04:00
Roman Donchenko
ca65fe4548
Merge pull request #1535 from asmorkalov:android_ndk_r9
2013-10-04 14:14:20 +04:00
Roman Donchenko
b03c19a8ac
Merge pull request #1554 from pablospe:fix_viz_module_compilation
2013-10-04 14:02:17 +04:00
Roman Donchenko
32630dbf61
Adapt cap_openni.cpp to the new Ptr.
2013-10-04 13:51:58 +04:00
StevenPuttemans
2f474db27f
Fix of bug #3283 and bug #3301
...
Added extra information for fitEllipse, minAreaRect and addapted ellipse &
ellipse2Poly parameter description.
2013-10-04 11:19:45 +02:00
Alexander Alekhin
90df620deb
ocl: stereo_csbp: divUp -> roundUp
2013-10-04 12:48:26 +04:00
Alexander Alekhin
2d1a6687f9
autogenerated code
2013-10-04 12:40:08 +04:00
Alexander Alekhin
2fdfa37ea5
ocl: runtime, fix 32-bit builds
2013-10-04 12:40:08 +04:00
Ilya Lavrenov
10d60f99dc
fixed ocl::integral and enabled perf test for it
2013-10-04 12:33:14 +04:00
Ilya Lavrenov
5f81988699
refactored arithm binary operations in order to make them more scalable
2013-10-04 12:13:22 +04:00
Alexander Alekhin
d74ca7b39d
ocl: update module documentation
2013-10-03 23:26:06 +04:00
Alexander Alekhin
7f0680fc8b
ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp
2013-10-03 23:26:06 +04:00
Alexander Alekhin
8beb514ecf
ocl: merge with upstream/2.4
2013-10-03 23:26:06 +04:00
Alexander Alekhin
16adbda4d3
ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable
2013-10-03 19:50:14 +04:00
Alexander Alekhin
dd9ff587dc
ocl: file-based ProgramCache refactoring
2013-10-03 19:50:14 +04:00
Alexander Alekhin
b00f79ac5f
ocl: move program names into opencl_kernels.hpp
2013-10-03 19:50:14 +04:00
Alexander Alekhin
e8d9ed8955
ocl: split initialization.cpp into 3 files: context, operations, programcache
2013-10-03 19:50:14 +04:00
Ilya Lavrenov
dafd4da031
removed ocl::minMax_buf, updated doc (operation on matrices)
2013-10-03 18:19:15 +04:00
Roman Donchenko
1817a07a5e
Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp.
2013-10-03 12:11:50 +04:00
Roman Donchenko
fa9d092c43
Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp.
2013-10-03 12:04:57 +04:00
Roman Donchenko
a1e239d2bf
Merge pull request #1527 from vpisarev:shape_module
2013-10-03 11:54:41 +04:00
Alexander Smorkalov
1aaeb52a4c
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:36:12 +04:00
Alexander Smorkalov
ccb48ddee0
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:23:50 +04:00
Ilya Lavrenov
adca219f18
fixed convertC3C4 and convertC4C3 functions in case cols == 1
2013-10-03 10:45:15 +04:00
Pablo Speciale
f47afe5799
Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)
2013-10-03 02:10:27 +02:00
Andrey Pavlenko
88419f8923
Merge pull request #1507 from pengx17:2.4_fix_test
2013-10-02 19:52:12 +04:00
Andrey Pavlenko
73744904a2
Merge pull request #1542 from alalek:cl_runtime
2013-10-02 19:50:35 +04:00
Alexander Alekhin
12eb340a4e
removed invalid comment
2013-10-02 19:35:21 +04:00
Roman Donchenko
447e03bc28
Merge pull request #1543 from SpecLad:name-enum
2013-10-02 19:22:35 +04:00
Andrey Pavlenko
b396916cdb
Merge pull request #1549 from ilya-lavrenov:ocl_perf_norm
2013-10-02 19:14:16 +04:00
Andrey Pavlenko
b2fe053f4d
Merge pull request #1548 from ilya-lavrenov:ocl_bitwise_not
2013-10-02 19:14:00 +04:00
Alexander Alekhin
5ab49c4cc2
ocl: cl_runtime: added autogenerated code
2013-10-02 18:32:33 +04:00
Alexander Alekhin
212ad97100
ocl: dynamic load of OpenCL libraries
...
Support functions from OpenCL 1.1 / OpenCL 1.2
2013-10-02 18:32:33 +04:00
Ilya Lavrenov
e8b93040d6
enabled ocl::norm perf test
2013-10-02 16:57:15 +04:00
Roman Donchenko
d019344c9d
Merge pull request #1547 from SpecLad:gtest-1.7
2013-10-02 16:46:19 +04:00
Roman Donchenko
58da54cb7a
Cherry-picked mariusmuja/flann@8c8b0e0cb8 .
...
Original author: me.
2013-10-02 16:09:45 +04:00
Ilya Lavrenov
a613a1a1da
fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2
2013-10-02 16:09:29 +04:00
Roman Donchenko
4c19e0273a
Cherry-picked mariusmuja/flann@b615f26947 .
...
Original author: Alex Wilson.
2013-10-02 16:06:56 +04:00
Roman Donchenko
78c4ffec99
Revert "Fixed a bug in FLANN resulting in uninitialized accesses."
...
This reverts commit a9975b144a
2013-10-02 16:02:11 +04:00
Roman Donchenko
e65eb4e042
Updated Google Test to 1.7.0.
2013-10-02 14:41:00 +04:00
Roman Donchenko
30d7e1c33d
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
2013-10-02 13:37:33 +04:00
Roman Donchenko
4c7ecf20d8
Merge pull request #1529 from vpisarev:polyfit_accuracy_2
2013-10-02 12:52:33 +04:00
Roman Donchenko
1ac1b9ae35
Merge pull request #1474 from f-morozov:for_pr
2013-10-02 11:49:54 +04:00
Andrey Pavlenko
75d89f4331
Merge pull request #1533 from alalek:perf_test_update_relative_error_message
2013-10-01 20:17:52 +04:00
Andrey Pavlenko
154fe4f657
Merge pull request #1519 from ilya-lavrenov:ocl_minMax
2013-10-01 20:16:48 +04:00
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
Roman Donchenko
bcb6f0386e
Named FastFeatureDetector::Type to allow its use in makePtr.
...
It has actually worked before (likely because it's inside a class),
but C++03 does disallow unnamed types as template arguments,
and there's a report that at least in one version of GCC it's
enforced: <http://code.opencv.org/issues/3278 >.
2013-10-01 18:22:03 +04:00
Ilya Lavrenov
4322c47bb2
removed test_norm.cpp from ocl tests
2013-10-01 17:53:14 +04:00
Roman Donchenko
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
2013-10-01 17:37:05 +04:00
Alexander Alekhin
a8ac3ec72a
ocl: perf test: disable MOG2 (random hungs), enable upload/download
2013-10-01 16:49:11 +04:00
Alexander Alekhin
66e4aead97
perf tests: added SANITY_CHECK_NOTHING()
2013-10-01 16:49:11 +04:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Vladislav Vinogradov
8ed47c01b7
used new device layer for cv::cuda::norm
2013-10-01 15:28:51 +04:00
Vladislav Vinogradov
23cc31e041
used new device layer for cv::cuda::LUT
2013-10-01 15:24:17 +04:00
Nghia Ho
61f5176bad
Removed trailing whitespace
2013-10-01 21:03:54 +10:00
Nghia Ho
d7bf71c24a
Merge remote-tracking branch 'upstream/master'
2013-10-01 19:56:47 +10:00
Ilya Lavrenov
065b40c6c3
fixed and extended ocl::norm
2013-10-01 13:21:43 +04:00
Vladislav Vinogradov
06f07944c8
removed dependecy from cudalegacy
2013-10-01 12:18:40 +04:00
Vladislav Vinogradov
7839dbd2c4
used new device layer for cv::gpu::integral
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
224f18b06c
bitwise operation optimization
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
eb449968b6
removed unroll_detail.hpp
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
1ef211b889
used new device layer for cv::gpu::reduce
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
31a7814395
used new device layer for cv::gpu::countNonZero
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
020624c481
used new device layer for cv::gpu::minMaxLoc
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
e1aa2fd06c
added gridMinMaxLoc function
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
3fb9c52272
cast to reference
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
bbd519be42
fixed warnings
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
045a856c24
used new device layer for cv::gpu::minMax
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
b705e0d886
used new device layer for cv::gpu::sum
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
9fe92e2111
renamed grid/glob_reduce.hpp -> grid/reduce.hpp
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
e820c5c65f
used new device layer for cv::gpu::mulSpectrums
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
3f62e78592
used new device layer for cv::gpu::copyMakeBorder
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
7b3bbcea71
used new device layer for cv::gpu::transpose
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
6dbb32a05d
switched to new device layer in split/merge
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
3ab7f4b26a
removed arithm_func_traits.hpp
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
7c8c836a7b
switched to new device layer in polar <-> cart
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
5522f43b18
used new device layer for cv::gpu::threshold
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
e83be009a3
used new device layer for cv::gpu::addWeighted
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
c7a3a7d4d9
switched to new device layer in min/max
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
b11cccaaca
switched to new device layer in bitwize operations
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
fdfffa5291
fixed warnings
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
ef9917ecf1
used new device layer for cv::gpu::compare
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
43e811118b
fixed assertion
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
766d950ff3
used new device layer in math per element operations
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
7628e57fc6
used new device layer for cv::gpu::absdiff
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
574ff47146
used new device layer for cv::gpu::divide
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
e7dba695b3
used new device layer for cv::gpu::multiply
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
156f86ea0b
used new device layer for cv::gpu::subtract
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
9c5da2ea22
used new device layer for cv::gpu::add
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
32d578f5f0
fixed gridTransform overloads problems
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
f4fb7fe1be
fixed compilation error "ambiguous symbol" on CUDA 5.0:
...
disabled Texture Reference API for old CUDA toolkits
2013-10-01 12:15:30 +04:00
Roman Donchenko
e0f5a2e532
Merge pull request #1512 from Exocoder:pre-gtk3
2013-10-01 12:09:17 +04:00
John Stowers
51341738ba
Add cv::logPolar, cv::linearPolar, and a python example
2013-09-30 22:31:19 +02:00
Tony
0d06b1dced
Change true for TRUE
...
The second parameter of gtk_widget_set_realized is of type gboolean
(gint). This is to ensure compatibility on alternative compilers and
platforms.
2013-09-30 21:04:43 +01:00
Alexander Alekhin
958604a68e
perf test: update error message about relative error
2013-09-30 20:11:39 +04:00
Vadim Pisarevsky
c810d03d5c
some more attempts to fix compile bug on Android
2013-09-30 19:28:11 +04:00
Roman Donchenko
e35bc11504
Merge pull request #1457 from pengx17:2.4_oclsvm
2013-09-30 17:50:29 +04:00
Roman Donchenko
a4b3aa9e1e
Merge pull request #1477 from nzjrs:python-gethardwaresupport
2013-09-30 17:44:45 +04:00
Ilya Lavrenov
a562b5c985
fixed ocl::meanStddev and created accuracy test for this function
2013-09-30 17:37:19 +04:00
Roman Donchenko
54c902dccd
Merge pull request #1509 from perping:2.4_docs
2013-09-30 17:37:19 +04:00
Nghia Ho
c41a5b9c2c
Merge remote-tracking branch 'upstream/master'
2013-09-30 22:59:29 +10:00
Ilya Lavrenov
7379152afb
fixed ocl::setIdentity
2013-09-30 16:54:09 +04:00
Vadim Pisarevsky
c3748a5f95
fixed the trailing whitespaces
2013-09-30 16:06:48 +04:00
Ilya Lavrenov
7edcefb2be
fixed ocl::phase
2013-09-30 16:02:14 +04:00
Vadim Pisarevsky
ca0956a7e2
this is rewrite of the github patch #674 by chouclee; the goal is to improve polyfit accuracy
2013-09-30 16:00:39 +04:00
Ilya Lavrenov
b864f48274
fixed ocl::sum, ocl::sqrSum, ocl::absSum
2013-09-30 15:12:38 +04:00
Vadim Pisarevsky
bc1f9d6268
fixed description of createLineSegmentDetector
2013-09-30 15:07:32 +04:00
Vadim Pisarevsky
cd84742556
attempts to fix build errors on Android
2013-09-30 14:53:48 +04:00
Alex Leontiev
0324932fb3
Added the copyright statements
...
Added the copyrights missing in all files that required so.
2013-09-30 18:53:32 +08:00
Juan Manuel Perez
f6fc39ce8f
Putting definitions of SCD and SCDMatcher separated from sc_dis.cpp file
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
4672a70c1f
Replaced dynamic_cas with Ptr::dynamicCast<>, and & with &&
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
1bf4298251
Macro removal
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
aa73dafbbb
2 Compile error fix for Win
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
752d88f5d2
Compile error fix for Win
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
5a1e9876fc
Corrected compilation errors Win
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
ead966709d
Remove ~ file
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
fe7bab499f
Corrections for compiling issues in Win, And and Doc
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
61c27ac81e
Shape module added
2013-09-30 14:39:17 +04:00
Vadim Pisarevsky
851a8a1cd0
fixed whitespace error
2013-09-30 14:31:39 +04:00
Alexander Mordvintsev
20fe614c2f
createLineSegmentDetectorPtr -> createLineSegmentDetector in tests and samples
2013-09-30 14:30:01 +04:00
Alexander Mordvintsev
0a8d62e5fd
createLineSegmentDetectorPtr -> createLineSegmentDetector
2013-09-30 14:30:01 +04:00
Alexander Mordvintsev
f0b050fa88
exposed LineSegemntDetector to python
2013-09-30 14:30:00 +04:00
StevenPuttemans
f6c802b563
Applied fix suggested in bug 3282 and shortened code
2013-09-30 11:48:01 +02:00
peng xiao
315c054379
Fix new blank line at EOF.
2013-09-30 16:20:43 +08:00
peng xiao
422396ef6a
fix build error
2013-09-30 16:17:20 +08:00
peng xiao
f69ccfa43d
Add opencl svm.
2013-09-30 16:17:19 +08:00
Alex Leontiev
3ac3ba0415
Minor fixes
...
Fix failed builds that opencv's buildbot has got.
2013-09-28 22:33:13 +08:00
Alex Leontiev
891bcd8491
Finish implementing the Nonlinear Conjugate Gradient
...
Now everything is prepared for the pull request.
2013-09-28 15:20:45 +08:00
lluis
047b568f6d
erGrouping now uses a classifier for group validation instead of a set of heuristical ifos.
...
Updated documentation and sample to use the new function API
2013-09-27 19:19:45 +02:00
Ilya Lavrenov
b54228fb83
fixed ocl::countNonZero
2013-09-27 17:35:06 +04:00
Ilya Lavrenov
9dca7555b4
fixed ocl::minMax
2013-09-27 16:25:10 +04:00
Alexander Smorkalov
8cb0921252
pr #1464 reverted as breaking the build for Linux without libv4l library.
2013-09-27 12:17:55 +04:00
perping
1bc20ae6f8
fix warning about addWeighted and remove magnitudeSqr().
2013-09-27 09:50:37 +08:00
Tony
97fc1e10a7
Replace obsolete Gtk symbols
...
This update replaces depreciated Gtk1.x symbols with Gtk2.x symbols in
preparation for adding Gtk3 support. These edits aim to be fully
compatible with Gtk2.x, allowing backward compatibility.
The following symbols have been replaced in this commit:
Gtk symbols that have been moved to the Gdk library:
- GtkType -> Gtype
- GTK_CHECK_CAST -> G_TYPE_CHECK_INSTANCE_CAST
- GTK_CHECK_TYPE -> G_TYPE_CHECK_INSTANCE_TYPE
- gtk_signal_connect -> g_signal_connect
- GTK_SIGNAL_FUNC -> G_CALLBACK
- gtk_type_class -> g_type_class_peek
- gtk_type_new-> g_object_new
- GtkTypeInfo -> GtypeInfo (Not required for
g_type_register_static_simple)
- gtk_type_unique -> g_type_register_static_simple
- gdk_draw_image_rgb -> replaced by gdk_cairo_source_pixbuf
NB: This requires porting to use cairo contexts and GdkPixbufs.
The following gtk symbols are changed for their modern equivalent:
- GTK_WIDGET_REALIZED -> gtk_widget_get_realized
- GTK_OBJECT_FLAGS -> gtk_widget_set_realized
Symbols without replacement:
- gtk_range_set_update_policy -> No replacement; as default policy is
set to continuous we can delete this line.
2013-09-26 18:31:44 +01:00
Fedor Morozov
c9ace38897
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
Nghia Ho
5921c77613
Merge remote-tracking branch 'upstream/master'
2013-09-26 23:08:23 +10:00
Andrey Pavlenko
0a695eb314
hortening the file names (HighDynamicRange -> HDR)
2013-09-26 17:06:06 +04:00
Alexander Smorkalov
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
Andrey Pavlenko
3e91350a31
Merge pull request #1503 from ilya-lavrenov:ocl_arithm
2013-09-26 15:50:54 +04:00
Nghia Ho
357e5d55f6
Removed trailing whitespaces
2013-09-26 19:14:59 +10:00
Nghia Ho
e6a9c22b9d
Merge remote-tracking branch 'upstream/master'
2013-09-26 19:13:01 +10:00
Alexander Smorkalov
26a1a93295
Merge pull request #1464 from StevenPuttemans:bugfix_3186_second
2013-09-26 12:16:02 +04:00
perping
074f9e33cb
fix three warning about mog, mog2 and KNearestNeighbour.
2013-09-26 15:30:44 +08:00
Alexander Smorkalov
0d49206a98
Merge pull request #1485 from vpisarev:ipp_fixes
2013-09-26 11:09:59 +04:00
perping
f65286d3c6
Update the OpenCL documents.
2013-09-26 14:04:11 +08:00
Alexander Smorkalov
241aa6e5a8
Merge pull request #1497 from jet47:fix-bug-3277
2013-09-26 09:31:06 +04:00
peng xiao
28ac23c1a1
If device does not support double, returns immediately.
...
Double floating points are not default supported by OpenCL.
2013-09-26 12:59:21 +08:00
Ilya Lavrenov
f5af3ab851
changes in OpenCL matrix operations docs
2013-09-25 19:47:15 +04:00
Alexander Smorkalov
c6ab8cb6ee
Merge pull request #1471 from ozantonkal:master
2013-09-25 17:19:39 +04:00
Ilya Lavrenov
c8821bd909
replaced manually new/delete by AutoBuffer
2013-09-25 15:28:12 +04:00
Ilya Lavrenov
0faac595a8
fixed minMaxLoc kernel (removed compilation errors)
2013-09-25 15:14:10 +04:00
Ilya Lavrenov
544c02407e
reverted and generalized original ocl::transpose
2013-09-25 14:22:37 +04:00
Jin Ma
c7c0a41e17
Resolved the bug that the work group size is not valid.
2013-09-25 17:42:56 +08:00
Alexander Smorkalov
6057414a93
Merge pull request #1199 from devernay:2.4-qtkit
2013-09-24 15:36:16 +04:00
Vladislav Vinogradov
e675684c81
fix bug #3277 (findCirclesGrid failures):
...
findHomagraphy can return empty Mat in master branch
2013-09-24 14:45:13 +04:00
Ilya Lavrenov
c87d2d414d
removed arithm_absdiff.cl
2013-09-24 14:18:42 +04:00
Ilya Lavrenov
8aa3eb817d
refactored arithm.cpp. Extended param list for all the tests
2013-09-24 14:13:10 +04:00
Ilya Lavrenov
b4ad128218
refactoed and extended ocl::transpose
2013-09-24 14:07:54 +04:00
Ilya Lavrenov
799afab23b
refactored and extended ocl::exp and ocl::log
2013-09-24 14:02:01 +04:00
Ilya Lavrenov
0730963576
refactored and extended ocl::compare
2013-09-24 13:58:18 +04:00
Ilya Lavrenov
8e0e352d77
refactored and extended binary bitwise operations
2013-09-24 13:54:46 +04:00
Ilya Lavrenov
161674bff2
refactored and extended ocl::addWeighted
2013-09-24 13:51:37 +04:00
Ilya Lavrenov
b20bd470fe
refactored and extended ocl::LUT
2013-09-24 13:49:38 +04:00
shawke
720241de87
Make similar default typedefs for Point_, Size_ and Rect_
...
Currently, there are different default typedefs for Point_, Size_, and Rect_. This pull request at least makes sure that default typedefs exist for int, float and double variants of each of these types.
2013-09-24 11:48:04 +02:00
Ilya Lavrenov
311a7233c2
removed comments from filtering.cpp and imgproc.cpp in ocl module
2013-09-24 13:46:08 +04:00
Ilya Lavrenov
bd36e556a1
removed ocl::magnitudeSqr
2013-09-24 13:39:07 +04:00
Ilya Lavrenov
0ad03162df
refactored and extended arithm operations add/sub/mul/div/absdiff
2013-09-24 13:34:55 +04:00
Ilya Lavrenov
5ff5fdd73d
marked some methods of ocl::Context as const
2013-09-24 13:17:09 +04:00
Ilya Lavrenov
d64fb235f7
removed needless arithm_2_mat.cl file
2013-09-24 13:15:05 +04:00
StevenPuttemans
1b1fb131b3
Attempt at fixing bug 3186
2013-09-23 16:51:02 +02:00
Nghia Ho
b4ffb0878d
Merge remote-tracking branch 'upstream/master'
2013-09-23 20:05:51 +10:00
Alexander Smorkalov
b5f3709ab9
Merge pull request #1484 from lluisgomez:scene_text_detection_documentation
2013-09-23 14:00:08 +04:00
Alexander Smorkalov
d6d8e96003
Merge pull request #1489 from melody-rain:2_4_knearest_neighbor
2013-09-23 13:34:39 +04:00
Alexander Smorkalov
0cd3d1f4d6
Merge pull request #1482 from ilya-lavrenov:ocl_setTO
2013-09-23 12:56:20 +04:00
lluis
5670e4f6cd
fixed typos
2013-09-23 10:17:47 +02:00
Vladislav Vinogradov
776c0cb08c
switched to new device layer in gpucodec module
2013-09-23 12:16:57 +04:00
Jin Ma
b88f5302e2
Removed unused constructor.
2013-09-23 15:10:00 +08:00
Alexander Smorkalov
298a1d50d2
Merge pull request #1299 from jet47:gpu-cuda-rename
2013-09-23 10:31:51 +04:00
Jin Ma
1bfe39f485
Added knearest neighbor of OpenCL version.
...
It includes the accuracy/performance test and the implementation of KNN.
2013-09-22 10:23:54 +08:00
Jin Ma
06c33df307
Added knearest neighbor of OpenCL version.
...
It includes the accuracy/performance test and the implementation of KNN.
2013-09-22 10:22:09 +08:00
Alex Leontiev
581d454536
Refined interface for Conjugate Gradient
...
Some interface was refined (most notably, the method for returning
Hessian was removed and the method for getting gradient was added as
optional to base Solver::Function class) and basic code for
setters/getters was added. Now is the time for the real work on an
algorithm.
2013-09-22 00:27:00 +08:00
Csaba Kertesz
6fb3b4f41c
Fix a memory leak in CvNormalBayesClassifier::train()
2013-09-20 22:36:49 +02:00
lluis
5556f051f1
added rst documentation for the Class-specific Extremal Regions for Scene Text Detection
2013-09-20 21:39:11 +02:00
John Stowers
14d225134d
Redefine CPU_xx constants in cv::namespace
...
This makes them visible from the python bindings
2013-09-20 20:04:33 +02:00
Nghia Ho
4171767d19
Merge remote-tracking branch 'upstream/master'
2013-09-21 02:20:25 +10:00
Vadim Pisarevsky
8e7eb79f6e
fixed compile errors and warnings when building master branch with IPP enabled
2013-09-20 16:02:15 +04:00
Ilya Lavrenov
362a67a695
fixed ocl::oclMat::setTo for 2-channel images
2013-09-20 15:57:38 +04:00
Alex Leontiev
eb1333d0a8
Initial commit for Conjugate Gradient method
...
Implementation is based on
http://www.cs.cmu.edu/~quake-papers/painless-conjugate-gradient.pdf
So far we only have basic interface and empty test. But it compiles at
least.
2013-09-20 15:12:48 +08:00
Alexander Smorkalov
1445a29e1c
Merge pull request #1469 from lluisgomez:scene_text_detection_erGrouping
2013-09-20 10:54:53 +04:00
Ovidiu Parvu
2bf36c312f
Removed static variables which were not read-only and used more function parameters instead.
2013-09-19 18:32:03 +01:00
Ovidiu Parvu
e324446c70
Changed the signature of the minEnclosingTriangle function such that it returns the area automatically. Moreover, the overloaded function was no longer required so it was removed. Sample code, documentation and unit tests were updated correspondingly.
2013-09-19 16:22:30 +01:00
Ovidiu Parvu
52cdae6e2b
Removed the cvMinEnclosingTriangle function since the C API will be deprecated starting with OpenCV 3.0
2013-09-19 15:37:10 +01:00
Ovidiu Parvu
21390d806f
Removed non-ASCII characters from the comments
2013-09-19 15:12:07 +01:00
Nghia Ho
8e8ff4dd33
Merge remote-tracking branch 'upstream/master'
2013-09-19 23:58:19 +10:00
Alexander Smorkalov
0ecd7913f8
Merge pull request #1472 from alalek:master_fix_debug_builds_on_win
2013-09-19 14:41:55 +04:00
lluis
2837bfd9fa
Added erGrouping function: Find groups of Extremal Regions that are organized as text blocks. Updated sample/cpp to use the complete text detection pipeline
2013-09-19 10:30:25 +02:00
Alexander Smorkalov
c550e452f9
Merge pull request #1384 from hbristow:matlab_public
2013-09-19 10:25:02 +04:00
Fedor Morozov
f99be6bda6
Mergin itseez
2013-09-18 18:55:12 +04:00
Ovidiu Parvu
73f476bd4b
Added a namespace and prefixed global variables with "G_" in order to prevent variable shadowing problems.
2013-09-18 15:51:10 +01:00
Fedor Morozov
90b6af1496
Merge new changes
2013-09-18 18:21:45 +04:00
Fedor Morozov
b1af5cc478
Remove ghost removal
2013-09-18 18:15:51 +04:00
Ozan Tonkal
5780b418c9
delete duplicate bunny.ply, remove tabs and extra lines
2013-09-18 13:46:43 +01:00
Ovidiu Parvu
737c5fe781
Updated the return type of the cvMinEnclosingTriangle function in the documentation
2013-09-18 13:09:55 +01:00
Alexander Alekhin
81ac97c6bd
fix for broken debug builds (MSVS2010/2012)
2013-09-18 16:05:21 +04:00
Ozan Tonkal
8de46e1f81
removed trailing spaces
2013-09-18 12:50:55 +01:00
Ovidiu Parvu
dc64dd7315
Made the following changes after code inspection (min_enclosing_triangle.cpp):
...
* Corrected minor typos in comments/function signatures
* Added new details to copyright statement
* Removed unreferenced macros
* Removed the assert statement which was checking the type of the OutputArray triangle
* When returning results using Mat::copyTo instead of Mat::convertTo
* Changed C-style casts to static_casts
* Added division by zero check to distanceFromPointToLine() function
* Updated reference webpages last access dates
* Moved the declaration of the gammaOfA variable outside the while loop in moveAIfLowAndBIfHigh() function for efficiency reasons
2013-09-18 12:21:24 +01:00
hbristow
d84ab09ab7
Updated documentation
2013-09-18 18:52:23 +10:00
Ozan Tonkal
824c28a588
Merge remote-tracking branch 'itseez/master'
2013-09-18 08:44:37 +01:00
hbristow
1dd017e9d0
Fixed a memory leak in mxarray
2013-09-18 17:10:54 +10:00
Alexander Smorkalov
99a43257d5
Merge pull request #1465 from jet47:cudev-old-cc
2013-09-18 10:39:53 +04:00
Alexander Alekhin
f1b5cbc8fe
ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp
2013-09-18 01:14:41 +04:00
Alexander Smorkalov
3fa3722641
Merge pull request #1458 from look4pritam:my-branch
2013-09-17 22:50:48 +04:00
Ozan Tonkal
a117400577
ignore viz tutorials when BUILD_opencv_viz is not set
2013-09-17 18:55:10 +02:00
Ozan Tonkal
e3e5fd5baa
Merge remote-tracking branch 'itseezstream/master'
2013-09-17 17:50:14 +02:00
Andrey Pavlenko
ad404ef44f
Merge pull request #1446 from lluisgomez:scene_text_detection_NM_fix2
2013-09-17 17:50:46 +04:00
Vladislav Vinogradov
20f636fcee
fixed cudev compilation for old pre-Fermi archs
2013-09-17 17:43:12 +04:00
Alexander Smorkalov
6fae07ba88
Merge pull request #1460 from ilya-lavrenov:ocl_divUp
2013-09-17 15:37:44 +04:00
Alexander Smorkalov
14951dc387
Merge pull request #1461 from ilya-lavrenov:ocl_dataOperations
2013-09-17 15:21:34 +04:00
Alexander Smorkalov
d437183388
Merge pull request #1439 from ilya-lavrenov:convertTo
2013-09-17 15:12:02 +04:00
Alexander Smorkalov
9cf301e257
Merge pull request #1449 from SpecLad:dc1394-095
2013-09-17 14:36:30 +04:00
Alexander Smorkalov
8853d19e74
Merge pull request #1452 from alalek:fix_cv_export_templates
2013-09-17 14:35:40 +04:00
Andrey Pavlenko
b3bb42773b
Merge pull request #1454 from ilya-lavrenov:ocl_pyrUp
2013-09-17 14:03:40 +04:00
Alexander Smorkalov
2dceb68a21
Merge pull request #1455 from ilya-lavrenov:ocl_test_output
2013-09-17 13:18:52 +04:00
Fedor Morozov
89508bf7ab
NO exr now
2013-09-17 00:46:15 +04:00
Fedor Morozov
76c6fa9348
No EXR in tests
2013-09-17 00:39:22 +04:00
Ilya Lavrenov
6a26c4483f
added performance tests for data transfer operations
2013-09-16 23:51:36 +04:00
Ilya Lavrenov
58b84c2fc0
removed needless divUp
2013-09-16 15:48:30 +04:00
Alexander Smorkalov
06a7a1ac47
Bug #1890 Opencv 2.4.0 with QT 4.7.4 and cvcreatebutton exception fixed.
...
QVector range check exception fixed.
2013-09-16 13:42:15 +04:00
look4pritam
a430abd02e
The thin prism distortion coefficient related small bug is fixed.
2013-09-16 13:39:11 +05:30
Ovidiu Parvu
b570a4ac47
Added the C interface function signature and the overloaded minEnclosingTriangle Python function to the documentation.
2013-09-15 23:40:40 +01:00
Ovidiu Parvu
130b4d8e26
Changed the return type of cvMinEnclosingTriangle to CVAPI(void). Added the implementation of the function to the min_enclosing_triangle.cpp source file.
2013-09-15 23:25:36 +01:00
Ovidiu Parvu
7ac768651f
Added the signature cvMinEnclosingTriangle (C version) to the imgproc_c.h header
2013-09-15 22:40:57 +01:00
Ovidiu Parvu
0117d77cd1
Added the tests for the minEnclosingTriangle function in the existing test_convhull.cpp file.
2013-09-15 22:25:58 +01:00
Ilya Lavrenov
e0325fe057
removed useless output
2013-09-15 22:04:22 +04:00
Ilya Lavrenov
a5c9d83617
fixed ocl::pyrUp for 2-byte types
2013-09-15 19:56:05 +04:00
Ozan Tonkal
3165b526f2
merge with Itseez/opencv
2013-09-15 17:51:27 +02:00
Ozan Tonkal
c31fb8ffff
rename widgets from *Widgets to W*
2013-09-15 16:26:53 +02:00
Ovidiu Parvu
caaa9e0f2d
- Wrote the documentation for the minEnclosingTriangle function (+1 extra picture depicting a sample output)
2013-09-15 15:07:17 +01:00
Alexander Alekhin
0ee47502d9
remove CV_EXPORT from templates
2013-09-15 13:48:54 +04:00
Ozan Tonkal
f570b3e18d
cmake check if VTK version is lower than 5, and give fatal error if it is
2013-09-15 11:24:20 +02:00
hbristow
86b7e3d15d
Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1)
2013-09-15 17:36:13 +10:00
lluis
d25309f82e
first parameter of createERFilterNM1/createERFilterNM2 is now mandatory. changed the sample program to use the new prototypes
2013-09-13 16:29:21 +02:00
lluis
75fdfba281
renamed getDefaultClassifierNM{1,2}() to loadClassifierNM{1,2}() and added "const std::string& filename" parameter (mandatory).
2013-09-13 16:19:52 +02:00
Roman Donchenko
671e5e39b1
Dropped the HAVE_DC1394_095 configuration macro.
...
We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.
Note that 1.0 doesn't have the do_extra_buffering parameter.
2013-09-13 17:25:21 +04:00
Roman Donchenko
eff21788a8
Merge pull request #1445 from vpisarev:stereocalib_quick_fix
2013-09-13 15:01:14 +04:00
lluis
95d92c099c
functions getDefaultClassifierNM1() and getDefaultClassifierNM2() allow to implicitly load the default classifiers when creating a ERFilter object
2013-09-13 12:54:23 +02:00
Vadim Pisarevsky
84022b0c19
fix thin-prism coefficients at 0's in the stereo calibration function unless the flag CALIB_THIN_PRISM_MODEL is explicitly set
2013-09-13 13:32:42 +04:00
Roman Donchenko
c511d5d649
Merge pull request #1414 from lluisgomez:scene_text_detection_computeNMChannels
2013-09-13 13:31:14 +04:00
Roman Donchenko
0033d453f2
Merge pull request #1426 from nailbiter:optimPD
2013-09-13 13:27:02 +04:00
Roman Donchenko
e3b92a9591
Merge pull request #1441 from look4pritam:prism-stereo
2013-09-13 13:17:06 +04:00
Ilya Lavrenov
9311f84109
disabled MOG tests if no video input support
2013-09-13 12:47:25 +04:00
hbristow
530ad447bc
Added fixes to CMakeLists.txt
2013-09-13 17:22:12 +10:00
Ovidiu Parvu
8bada4c751
Overloaded the minEnclosingTriangle function such that there is an alternative function with the same name which does not require the output parameter ``area''.
...
Changed the sample source file minarea.cpp to use the overloaded version of the function.
Updated some comments in the min_enclosing_triangle.cpp source file.
2013-09-12 23:47:48 +01:00
Ozan Tonkal
3f27ba54e0
re-render the scene after changing camera properties
2013-09-12 19:23:05 +02:00
Mathieu Barnachon
0934344a3d
Update sample and code with external computation of HOG detector.
2013-09-12 18:38:49 +02:00
Ovidiu Parvu
0ed2f6201d
Optimised one assert statement in the min_enclosing_triangle.cpp file. Added the minEnclosingTriangle functionality to the existing minarea.cpp sample file.
2013-09-12 15:01:21 +01:00
Ovidiu Parvu
9902affae6
Added some assert statements to constrain the type of the input and output parameters. Convert the input set of points to vector<Point2f> before passing it to the findMinimumAreaEnclosingTriangle function.
2013-09-12 14:34:08 +01:00
Roman Donchenko
e3710488a8
Merge pull request #1434 from melody-rain:Added_perf_kalman_cpp
2013-09-12 16:54:21 +04:00
Roman Donchenko
d669559ec3
Bumped version to 3.0.
2013-09-12 16:40:14 +04:00
Roman Donchenko
b525c28244
Updated the Java bindings and docs to support the version status.
2013-09-12 16:39:14 +04:00
Ovidiu Parvu
4fce8e6b0e
Changed the semantics of the minEnclosingTriangle function such that:
...
1. The function receives a set of points as input instead of a convex polygon with more than three vertices
2. The convex hull P is computed inside the function
3.1. If the number of vertices of P is greater than three then the algorithm which was implemented before executes
3.2. Otherwise the vertices of the triangle are picked from the vertices of the given polygon and the area computed
2013-09-12 13:29:10 +01:00
Roman Donchenko
887825e831
Added an additional version component - the development status.
...
This will allow us to distinguish between regular releases, prereleases
and development versions.
2013-09-12 16:20:09 +04:00
Roman Donchenko
dee2a65978
Merge pull request #1440 from SpecLad:wcast-align
2013-09-12 13:56:23 +04:00
look4pritam
7fd7bbc9f1
The prism distortion coefficients are added for the stereo calibration.
2013-09-12 15:17:11 +05:30
Ovidiu Parvu
510ad8e779
- Changed the type of the minEnclosingTriangle function parameters by using proxy classes InputArray/OutputArray instead of std::vector<T>
...
- Adapted the source code to accommodate this change
2013-09-12 10:11:38 +01:00
Roman Donchenko
ad52dd37a9
Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186"
...
This reverts commit 41b8479d03531471b0aa
2013-09-12 12:58:10 +04:00
Roman Donchenko
ac9bc6423a
Merge pull request #1428 from ilya-lavrenov:ocl_pyr
2013-09-12 12:48:45 +04:00
Ilya Lavrenov
f20cc2bce8
extended ocl::convertTo
2013-09-12 12:39:03 +04:00
Roman Donchenko
fec697b390
Silenced a few -Wcast-align warnings in the headers.
...
We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.
2013-09-12 12:33:56 +04:00
Roman Donchenko
f31d06f980
Merge pull request #1418 from vpisarev:24_ipp_sepfilter_dft
2013-09-12 12:19:37 +04:00
Jin Ma
f4d0c9b13c
Revised the code according to the feedback of the community.
2013-09-12 09:43:30 +08:00
Ovidiu Parvu
e6b58c4e79
- Added the minEnclosingTriangle function declaration to the imgproc header
...
- Added the source code for the function in the separate file min_enclosing_triangle.cpp
2013-09-11 18:07:19 +01:00
Ozan Tonkal
620d92824c
hide VizMap and VizPair from public interface
2013-09-11 13:23:57 +02:00
Roman Donchenko
caf9fdbdc3
Merge pull request #1432 from SpecLad:unseq
2013-09-11 13:50:36 +04:00
Roman Donchenko
6fcd9e3830
Merge pull request #1431 from asmorkalov:android_recording_hint
2013-09-11 13:50:03 +04:00
Vladislav Vinogradov
6bbac2a7d9
Merge branch 'master' into gpu-cuda-rename
2013-09-11 09:41:23 +04:00
Jin Ma
b9d7e67589
Removed whitespace.
2013-09-11 11:28:36 +08:00
Jin Ma
2e0f613c38
Added performance for Kalman Filter.
2013-09-11 10:19:02 +08:00
Roman Donchenko
6a21eca7e7
Merge pull request #1421 from ilya-lavrenov:ocl_bilateral
2013-09-10 18:59:41 +04:00
Roman Donchenko
acc2ca484c
Merge pull request #1425 from pengx17:master_retina_ocl_fix
2013-09-10 18:29:25 +04:00
Roman Donchenko
242e4254f3
Merge pull request #1427 from SpecLad:merge-2.4
2013-09-10 18:28:20 +04:00
Alexander Smorkalov
98cb1dcc9a
MediaRecorder hint enabled for all Android devices with API level 14 and above.
...
It increases performance on some devices like Nexus4.
Target Android SDK version increased up to 14.
2013-09-10 18:05:45 +04:00
Roman Donchenko
51ed1873de
Eliminated unsequenced assignments to temp3 from dpstereo.cpp.
...
They're unsequenced if CV_IMIN3 or CV_IMAX3 are invoked more than once
in a single expression.
2013-09-10 18:05:23 +04:00
Ilya Lavrenov
6b9c451938
added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown
2013-09-10 17:36:18 +04:00
Roman Donchenko
7238479813
Merge pull request #1415 from znah:sfm_py
2013-09-10 11:37:05 +04:00
Roman Donchenko
747f7178ca
Merge pull request #1417 from ilya-lavrenov:merge_fix
2013-09-10 11:33:25 +04:00
Roman Donchenko
68901ab471
Merge pull request #1420 from ilya-lavrenov:ocl_perf_hog
2013-09-10 11:32:35 +04:00
Roman Donchenko
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
Roman Donchenko
260b283fb3
Merge pull request #1413 from melody-rain:2.4_kalman_filter
2013-09-10 11:28:22 +04:00
peng xiao
8767c47463
Fix whitespaces.
2013-09-10 15:13:53 +08:00
pengxiao
a92721b569
Fix retina ocl on NV.
...
Previously we incorrectly assumed data was aligned in 16 bytes, which should be 32.
2013-09-10 14:33:23 +08:00
Alex Leontiev
a29863ee7b
Eliminate use of 32-bit floating pt type
...
Replace all "float" by "double" (64-bit) to avoid "lose precision"
warnings.
2013-09-10 13:53:26 +08:00
Alex Leontiev
1207cd132b
Minor fixes
...
Fixed integer vs unsigned integer comparison in .cpp test source and
trailing whitespaces in source code
2013-09-10 13:53:26 +08:00
Alex Leontiev
11fa0651c6
Minor fixes
...
As the opencv's build-bot did not want to compile this revision, I had
to do some changes. In particular,
1) Removed unsigned int vs int comparisons, that were treated as errors
2) Removed unused variables and functions
3) Removed functions without previous declaration
4) Fixed whitespaces
2013-09-10 13:53:26 +08:00
Alex Leontiev
ccc71ac190
Primal-dual algorithm
...
This is an implementation of primal-dual algorithm, based on the C++
source code by Vadim Pisarevsky. It was extended to handle the denoising
based on multiple observations. It also contains documentation and
tests.
2013-09-10 13:53:26 +08:00
lluis
ad94628038
Using cv::magnitude instead of custom loop and Mat<float> instead of Mat<double> to compute gradient magnitude channel.
2013-09-09 18:37:55 +02:00
Roman Donchenko
4ee5599d4b
Merge pull request #1381 from 23pointsNorth:master
2013-09-09 19:53:56 +04:00
Roman Donchenko
41b8479d03
Merge pull request #1376 from StevenPuttemans:bugfix_3186
2013-09-09 18:33:11 +04:00
Ilya Lavrenov
16357418d5
increased time limit for bilateral filter performance tests
2013-09-09 18:16:53 +04:00
Roman Donchenko
d5aaab745f
Merge pull request #1282 from nailbiter:optimDS
2013-09-09 18:10:13 +04:00
Nghia Ho
0e06465a23
Merge remote-tracking branch 'upstream/master'
2013-09-09 23:23:12 +10:00
Ilya Lavrenov
b07b9aca5a
fixed HOG perf test
2013-09-09 17:16:47 +04:00
Roman Donchenko
531471b0aa
Merge pull request #1412 from jet47:gpu-match-template-nocuda
2013-09-09 16:49:33 +04:00
Roman Donchenko
84435ba741
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
2013-09-09 16:46:33 +04:00
Vadim Pisarevsky
61f2107829
added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions.
2013-09-09 16:13:39 +04:00
Ilya Lavrenov
7d8bde3330
fixed ocl::merge in case of 2 and types CV_32S and CV_32F
2013-09-09 16:12:01 +04:00
Alexander Mordvintsev
79d51c3398
expose findEssentialMat, decomposeEssentialMat and recoverPose to Python
2013-09-09 14:02:05 +04:00
lluis
e8d3732aaf
added computeNMChannels helper function to compute the diferent channels to be processed independently in the N&M algorithm.
2013-09-09 11:37:58 +02:00
Jin Ma
a4ab3f4ea8
Removed whitespace.
2013-09-09 17:00:33 +08:00
Vladislav Vinogradov
1036ce807c
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudaimgproc/src/gftt.cpp
modules/objdetect/include/opencv2/objdetect/erfilter.hpp
modules/objdetect/src/erfilter.cpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-09 12:57:35 +04:00
Roman Donchenko
cb0fc230f1
Merge pull request #1387 from vpisarev:ipp_imgwarp
2013-09-09 12:54:32 +04:00
Roman Donchenko
45512a93e0
Merge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp
2013-09-09 12:39:12 +04:00
Roman Donchenko
77a2529eb7
Merge pull request #1408 from jet47:new-ptr-fixes
2013-09-09 12:27:27 +04:00
Jin Ma
2d5a1dacd0
Added Kalman Filter of OpenCL version.
2013-09-09 16:08:23 +08:00
Roman Donchenko
74578f56a9
Merge pull request #1403 from lluisgomez:scene_text_detection_NM_fix
2013-09-09 12:05:57 +04:00
Roman Donchenko
a03c6decaf
Merge pull request #1409 from SpecLad:imgproc-test-memerr
2013-09-09 12:03:58 +04:00
Vladislav Vinogradov
6ad72bfcb4
removed detail:: prefix int video_reader
...
it conflicts with cv::detail
2013-09-09 10:57:51 +04:00
Vladislav Vinogradov
a0771630b0
restored original behaviour or release functions for (Buffer and Texture)
2013-09-09 10:57:45 +04:00
Vladislav Vinogradov
c439702f0c
added missing gpu::matchTemplate implementation for non-CUDA build
2013-09-09 10:51:44 +04:00
Ozan Tonkal
9895093524
check if vtk 5.10.0 exists, if not require 6.0.0
2013-09-08 19:41:35 +02:00
Ozan Tonkal
56f9168ac1
support VTK 6.0.0: cmakelist.txt might need to be refactored
2013-09-08 19:07:15 +02:00
Ozan Tonkal
26005a19bd
add license headers
2013-09-08 19:05:24 +02:00
Ozan Tonkal
c773061457
updated documentation
2013-09-08 19:03:55 +02:00
Ozan Tonkal
3bdb55e1ef
another constructor for CameraPositionWidget for displaying image by also using field of view instead of intrinsic matrix
2013-09-08 19:03:55 +02:00
Ozan Tonkal
2170559bed
text3dwidget offers now users to decide whether it should face the camera or not
2013-09-08 19:03:54 +02:00
Ozan Tonkal
286f81f305
fix crucial bug in get method, hide add and remove methods from user
2013-09-08 19:03:54 +02:00
Ozan Tonkal
fcf437cf69
combine representation methods to one as setRepresentation
2013-09-08 19:03:54 +02:00
Ozan Tonkal
94ca5d65d0
remove VIZ prefix from rendering properties, fix setRenderingProperties and getRenderingProperties methods
2013-09-08 19:03:54 +02:00
Ozan Tonkal
fdbf20c172
delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial
2013-09-08 19:03:54 +02:00
Jin Ma
2fb0d23104
Removed unnecessary process for conversion to 4-channel format.
2013-09-07 10:40:30 +08:00
lluis
cd33ca0009
changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.
2013-09-06 19:10:53 +02:00
Anatoly Baksheev
9a91a12fb2
VIZ disabled by default, VTK search is performed iff BUILD_opencv_viz is enabled
2013-09-06 19:50:47 +04:00
Anatoly Baksheev
477ca067f0
compilation for macos
2013-09-06 19:32:35 +04:00
Anatoly Baksheev
eed7bf6902
compilation for windows
2013-09-06 18:43:14 +04:00
Fedor Morozov
a7bcf63765
Robertson docs
2013-09-06 18:21:59 +04:00
Fedor Morozov
c118f3c529
Robertson update
2013-09-06 17:30:43 +04:00
Roman Donchenko
ff1eb0d582
Merge pull request #1407 from ilya-lavrenov:ocl_test_mog
2013-09-06 16:58:21 +04:00
Roman Donchenko
4f109d1292
Fixed a memory access error in CV_Remap_Test::generate_test_data.
...
begin_x[1] is not the second component of the element, but the element
after the one pointed to begin_x. When begin_x points to the last
element, that line overwrites data past the end of the allocation, which,
during my tests, happened to contain the reference count for the matrix.
Hilarity ensues.
2013-09-06 16:02:41 +04:00
lluis
6ef1d456dd
fixed rebase conflicts
2013-09-06 14:00:11 +02:00
Roman Donchenko
2de8487e58
Fixed a few tests that use uninitialized inputs.
2013-09-06 15:53:42 +04:00
Vladislav Vinogradov
b7eff94137
fixed compilation issues with new Ptr
2013-09-06 15:52:07 +04:00
Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
Fedor Morozov
deeaddb0a9
Doc update
2013-09-06 14:49:19 +04:00
Fedor Morozov
f4792f8a44
Doc update
2013-09-06 14:43:04 +04:00
lluis
512111af9c
removed blank line at EOF
2013-09-06 12:32:10 +02:00
lluis
1cc6502db3
removed unnecessary commented block
2013-09-06 12:32:10 +02:00
lluis
04913f5af7
removed trailing whitespaces
2013-09-06 12:32:10 +02:00
lluis
f4d01175b8
fixed a bug in the calculation of the number of inflexion points feature
2013-09-06 12:31:49 +02:00
lluis
765921cc25
fixed a typo error in the default min_Probability param of CreateERFilterNM2
2013-09-06 12:30:22 +02:00
lluis
dba336c0e3
fixed a bug in the non-max-suppression filter procedure
2013-09-06 12:27:19 +02:00
ilya-lavrenov
27947474ec
fixed data path
2013-09-06 13:25:56 +04:00
Roman Donchenko
7d62fdc62c
GPU resize: removed a few parameter names to avoid unused parameter warnings.
2013-09-06 12:46:58 +04:00
Roman Donchenko
439e90f4f4
retina_ocl.cpp: removed two unused arrays.
2013-09-06 12:34:37 +04:00
Roman Donchenko
af594c8e44
retina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning.
2013-09-06 12:33:54 +04:00
hbristow
74accbd969
Added <algorithm> to mxarray.hpp, which seems to be needed explictly by some compilers
2013-09-06 16:42:32 +10:00
Jin Ma
172242a94e
Revised performance test according to the feedback of the community.
2013-09-06 13:39:41 +08:00
hbristow
6964f6aacc
Removed unused Dynamic from matlab namespace - clashing with Eigen
2013-09-06 15:26:05 +10:00
Ozan Tonkal
5eed0d6bef
remove common.h include from widgets.hpp
2013-09-05 21:03:40 +02:00
Ozan Tonkal
31501ebf4f
replace tabs by spaces
2013-09-05 21:03:39 +02:00
Ozan Tonkal
a5b75769a3
initial documentation
2013-09-05 21:03:39 +02:00
Ozan Tonkal
2822845ba6
set get RenderingProperty id comes first
2013-09-05 21:03:39 +02:00
Ozan Tonkal
9d4fe6984b
remove setWindowName method to avoid complications
2013-09-05 21:03:39 +02:00
Ozan Tonkal
21be9796ae
comments on widgets where constructors might be confusing
2013-09-05 21:03:39 +02:00
ozantonkal
2705113bc4
remove common.cpp, remove commented code in common.h
2013-09-05 21:03:39 +02:00
ozantonkal
ffbb5e9524
resetCamera, resetViewpoint in Viz3d
2013-09-05 21:03:39 +02:00
ozantonkal
4aa61dee50
minor refactoring interactor_style
2013-09-05 21:03:39 +02:00
ozantonkal
af8a918e04
fix minor bug, minor cleaning, cv_assert with messages
2013-09-05 21:03:39 +02:00
ozantonkal
69f135ec57
fix memory leak in viz3d
2013-09-05 21:03:39 +02:00
ozantonkal
6c0c217562
removed reference counter in widgets, fixed memory leak
2013-09-05 21:03:39 +02:00
ozantonkal
4b443059ec
reverted widget reference count in order to avoid memory leak
2013-09-05 21:03:39 +02:00
ozantonkal
8007e07ad2
load mesh function is finalized: color range is always 0-255 and RGB due to vtkPLYReader limitations
2013-09-05 21:03:39 +02:00
ozantonkal
e4b13f2ef0
update reader after setting file name
2013-09-05 21:03:39 +02:00
ozantonkal
3da7dd9849
fix yellow and magenta color bgr codes
2013-09-05 21:03:39 +02:00
ozantonkal
9086cf5d79
remove unused includes and libraries from linking
2013-09-05 21:03:39 +02:00
ozantonkal
3038ffb886
setDesiredUpdateRate implementation in Viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
ed0162ad0b
remove reference counting in widgets
2013-09-05 20:56:33 +02:00
ozantonkal
08917908f3
remove eigen dependency
2013-09-05 20:56:33 +02:00
ozantonkal
f98614ece0
remove cloudactormap, shapeactormap. only vtkProp is stored and view transformation can be obtained using GetUserMatrix of vtkProp3D
2013-09-05 20:56:33 +02:00
ozantonkal
f6e1a093cd
implement window relevant methods in Viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
4f416352e1
implemented actor representation methods in viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
cf36b8f817
rendering properties in Widget and Viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
b032b4dded
move frompolyfile to widget class as static method, remove addpolygon and its alikes
2013-09-05 20:56:33 +02:00
ozantonkal
0bbaf5d47a
removeAllWidgets implementation, removed other remove methods
2013-09-05 20:56:33 +02:00
ozantonkal
e106dcc606
remove include vtk headers from outside of precomp.hpp
2013-09-05 20:56:32 +02:00
Ilya Lavrenov
be98cd2f7f
replaced explicit __stdcall by CV_STDCALL
2013-09-05 19:25:03 +04:00
Roman Donchenko
86b841563b
Added tests for Ptr.
2013-09-05 19:03:00 +04:00
Roman Donchenko
c7d2fdc4b2
Fixed some dubious uses of tbb::task_scheduler_init.
2013-09-05 19:03:00 +04:00
Roman Donchenko
a97ffe6513
Rewrote the documentation for Ptr to fit the new implementation.
2013-09-05 19:03:00 +04:00
Roman Donchenko
a50d75d362
Made Filestorage able to not own its CvFileStorage instance.
...
This allows to get rid of the last remaining Ptr<T>::addref calls.
2013-09-05 19:03:00 +04:00
Roman Donchenko
3e189a2b41
Replaced calls to Ptr<T>::ptr to ::dynamicCast.
2013-09-05 19:03:00 +04:00
Roman Donchenko
24dee16b12
Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.
...
Also changed the static functions to inline, to stop GCC complaining
about unused functions.
2013-09-05 19:03:00 +04:00
Roman Donchenko
dadee3752c
Adapt Python bindings to the new Ptr.
2013-09-05 19:03:00 +04:00
Roman Donchenko
2f942efdf7
Java: removed usages of Ptr<T>::addref().
...
Now the features2d class wrappers use composition instead of inheritance.
2013-09-05 19:03:00 +04:00
Roman Donchenko
eaa7fcc3e6
Boring changes - legacy.
2013-09-05 19:02:59 +04:00
Roman Donchenko
34127ba80f
Boring changes - contrib.
2013-09-05 19:02:59 +04:00
Roman Donchenko
3bca57ac25
Boring changes - ocl.
2013-09-05 19:02:59 +04:00
Roman Donchenko
fc0e835762
Boring changes - gpuwarping.
2013-09-05 19:02:59 +04:00
Roman Donchenko
d33ff4bb11
Boring changes - gpustereo.
2013-09-05 19:02:59 +04:00
Roman Donchenko
d6146e9543
Boring changes - gpulegacy.
2013-09-05 19:02:59 +04:00
Roman Donchenko
a007c7b980
Boring changes - gpuimgproc.
2013-09-05 19:02:58 +04:00
Roman Donchenko
b165016ba7
Boring changes - gpufilters.
2013-09-05 19:02:58 +04:00
Roman Donchenko
a57f93ee92
Boring changes - gpucodec.
2013-09-05 19:02:58 +04:00
Roman Donchenko
2c033251db
Boring changes - gpubgsegm.
2013-09-05 19:02:58 +04:00
Roman Donchenko
f8f0685397
Boring changes - gpuarithm.
2013-09-05 19:02:58 +04:00
Roman Donchenko
57595a8308
Boring changes - gpu.
2013-09-05 19:02:58 +04:00
Roman Donchenko
0dcb4f1f66
Boring changes - videostab.
2013-09-05 19:02:58 +04:00
Roman Donchenko
808e0cf10b
Boring changes - video.
2013-09-05 19:02:58 +04:00
Roman Donchenko
93f757f8a2
Boring changes - superres.
2013-09-05 19:02:58 +04:00
Roman Donchenko
f21851f0f4
Boring changes - stitching.
2013-09-05 19:02:58 +04:00
Roman Donchenko
cce0f48d3e
Boring changes - softcascade.
2013-09-05 19:02:58 +04:00
Roman Donchenko
32205d3c5b
Boring changes - photo.
2013-09-05 19:02:58 +04:00
Roman Donchenko
b12894d95a
Boring changes - objdetect.
2013-09-05 19:02:58 +04:00
Roman Donchenko
de6a934f66
Boring changes - nonfree.
2013-09-05 18:26:44 +04:00
Roman Donchenko
345bc633cc
Boring changes - ml.
2013-09-05 18:26:44 +04:00
Roman Donchenko
1eacb485c5
Boring changes - features2d.
2013-09-05 18:26:44 +04:00
Roman Donchenko
bd70a033fc
Boring changes - calib3d.
2013-09-05 18:26:43 +04:00
Roman Donchenko
711fb6bd92
Boring changes - bioinspired.
2013-09-05 18:26:43 +04:00
Roman Donchenko
beeb932d22
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
Roman Donchenko
254d4ae429
Boring changes - imgproc.
2013-09-05 18:26:43 +04:00
Roman Donchenko
8200a95ced
Boring changes - core.
...
This and several following commits contain the "boring" changes required
to support the new Ptr. These are changes like:
* new T -> makePtr<T> or .reset(new T) or Ptr<T>(new T)
(depending on the situation)
* p.empty() -> !p
* delete_obj -> DefaultDeleter::operator()
and similar changes that are numerous, but primitive.
2013-09-05 18:26:43 +04:00
Jin Ma
1366df8250
MOG&MOG2: Modified the performance test according to the feedback of the community.
2013-09-05 19:33:27 +08:00
Roman Donchenko
461c98fa86
Replaced Ptr with my new implementation.
2013-09-05 14:54:20 +04:00
Fedor Morozov
e33a4f79f8
Merge branch 'devel' of https://github.com/f-morozov/opencv into devel
2013-09-05 14:49:18 +04:00
Fedor Morozov
85eb52b8af
Debevec Calibrate
2013-09-05 14:41:35 +04:00
fm
cb27740de4
Linux compilation
2013-09-05 14:26:21 +04:00
Fedor Morozov
0f703b8162
Calibrate Debevec changes
2013-09-05 14:10:53 +04:00
Roman Donchenko
70711ac6c2
Merge pull request #1400 from ilya-lavrenov:ocl_test_mog
2013-09-05 11:58:52 +04:00
Roman Donchenko
ecc51817d9
Merge pull request #1399 from pengx17:master_retina_ocl_fix
2013-09-05 11:57:46 +04:00
Roman Donchenko
b9ae8623b2
Merge pull request #1398 from ilya-lavrenov:ocl_perf_gemm
2013-09-05 11:56:24 +04:00
Mathieu Barnachon
464985205c
Update PR after mdim review.
2013-09-05 16:05:54 +12:00
Daniel Angelov
25c0d5978c
Update on the compare lines method.
2013-09-05 00:02:24 +03:00
ilya-lavrenov
722bdc52a0
enabled gemm and dft erf test
2013-09-04 20:02:02 +04:00
ilya-lavrenov
0f8f489658
changed data path and eps
2013-09-04 18:46:46 +04:00
Roman Donchenko
6ebfa87181
Delete a bunch more trailing whitespace that slipped through the cracks.
2013-09-04 16:13:27 +04:00
Daniel Angelov
b5e1eb7d48
Removed IOArray constness.
2013-09-04 14:59:57 +03:00
Roman Donchenko
33d8d8ffd1
Merge pull request #1392 from SpecLad:flann-uninit
2013-09-04 15:49:14 +04:00
Nghia Ho
cc15898353
Merged with HEAD and removed C interface to rotatedRectangleIntersection
2013-09-04 20:45:10 +10:00
Roman Donchenko
a9975b144a
Fixed a bug in FLANN resulting in uninitialized accesses.
...
This is fixed upstream in mariusmuja/flann@b615f26 , but that fix
would break binary compatibility, so I had to make a different one.
Since the bug isn't quite obvious, here's an explanation. In the const
version of any::cast, if policy is a small_any_policy, its get_value
returns its input argument. So r becomes a pointer to obj, and the
return value is a reference to a local variable, which is invalidated
when the function exits.
2013-09-04 14:06:34 +04:00
pengxiao
e45f92a9e1
Fix a bug of ocl retina on NVIDIA platform.
2013-09-04 16:38:36 +08:00
Roman Donchenko
fd3b2326b4
Merge pull request #1373 from abidrahmank:pykeypoints
2013-09-04 11:53:33 +04:00
Vladislav Vinogradov
f46b7fcf86
fixed warnings in resize.cu
2013-09-04 11:15:18 +04:00
Jin Ma
dd73016c8b
Removed whitespace.
2013-09-04 15:00:36 +08:00
Jin Ma
e528f39def
Added the performance test for mog and mog2.
2013-09-04 14:37:46 +08:00
Vladislav Vinogradov
1ad4592bfc
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp
2013-09-04 09:58:32 +04:00
Roman Donchenko
009919872f
Merge pull request #1389 from SpecLad:merge-2.4
2013-09-03 19:42:06 +04:00
Abid K
0902f183ca
alignment of parameters as per speclad
2013-09-03 21:12:03 +05:30
Roman Donchenko
79457f8f49
Merge pull request #1224 from mbarnach:pca_io
2013-09-03 18:43:54 +04:00
Roman Donchenko
c42d61e464
Merge pull request #1283 from melody-rain:new_mog_mog2
2013-09-03 18:43:03 +04:00
Roman Donchenko
b3e73cf7d6
Merge pull request #1388 from bitwangyaoyao:2.4_CLAHE
2013-09-03 18:30:15 +04:00
Alexander Shishkov
e354fa3fd1
fixed test data in highgui test for HDR
2013-09-03 14:24:14 +04:00
Alexander Shishkov
924f7ce373
small changes for compilation
2013-09-03 14:05:14 +04:00
Roman Donchenko
e7f83619c5
Merge pull request #1378 from StevenPuttemans:bugfix_3115
2013-09-03 12:07:24 +04:00
Roman Donchenko
f50a829943
Merge pull request #1383 from pengx17:2.4_clblas
2013-09-03 12:05:01 +04:00
yao
a70bdfc13f
a little fix to tests and sample
2013-09-03 15:02:18 +08:00
pengxiao
ea16539448
Fix a crash of ocl program if clAmdBlas is not linked.
2013-09-03 10:30:37 +08:00
peng xiao
7b3e3f69fb
Modify according to @alalek.
2013-09-03 09:31:13 +08:00
hbristow
7e5bbec895
Removing trailing whitespace and expanded tabs
2013-09-03 10:14:45 +10:00
Anatoly Baksheev
35e7952909
simplify modules/viz/CMakeLists.txt
2013-09-03 01:59:00 +04:00
Roman Donchenko
18bb951574
Nuked the rest of the precomp.cpp files.
...
Consider this a part of merging #1357 .
2013-09-02 19:53:45 +04:00
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Vadim Pisarevsky
e85e4d3ab9
fixed bug in IPP-accelerated morphology; added several IPP imgwarp functions (by Klim)
2013-09-02 18:34:50 +04:00
kdrobnyh
e6ec3dd17f
Add IPP support in resize, warpAffine, warpPerspective functions
2013-09-02 18:04:06 +04:00
Roman Donchenko
757e7f842b
Merge pull request #1300 from kdrobnyh:FilterBilateral
2013-09-02 17:01:38 +04:00
Roman Donchenko
99043f6fc2
Merge pull request #1385 from asmorkalov:winrt_glob_fix
2013-09-02 16:05:15 +04:00
Fedor Morozov
e15eabe3fa
Ghostbusters
2013-09-02 16:03:10 +04:00
Alexander Smorkalov
6d3102141c
Globbing accuracy test fail on Windows RT fixed.
2013-09-02 04:31:58 -07:00
Roman Donchenko
188d3f02ee
Merge pull request #1302 from kdrobnyh:compare
2013-09-02 15:11:20 +04:00
Vladislav Vinogradov
ba4bf04c6c
fixed incorrect GPUs -> CUDAs replacement
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
a41006754e
fix documentation
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
429bfad225
removed precomp.cpp files
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
cbe437571e
fixed docs
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
f936c1283b
fixed sanity test for cuda module
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
fd88654b45
replaced GPU -> CUDA
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
3c34b24f1f
replaced gpu->cuda in files names
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
ae94256edc
renmaed gpu module -> cuda
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
29386f1449
renamed gpubgsegm -> cudabgsegm
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
259ceb7eaa
renamed gpufeatures2d -> cudafeatures2d
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
5660d6a680
renamed gpuoptflow -> cudaoptflow
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
a0ae602bb7
renamed gpuimgproc -> cudaimgproc
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
219b662127
renamed gpufilters -> cudafilters
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
71d61e07b1
renamed gpustereo -> cudastereo
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
d4901a99ea
renamed gpuwarping -> cudawarping
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dcd600cc47
renamed gpuarithm -> cudaarithm
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
6d216d78d9
renamed gpulegacy -> cudalegacy
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dbeb3e2968
renamed gpucodec -> cudacodec
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
cfe4a71dc6
renamed gpu* source to cuda* in core module
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
91dd44e7fa
removed compatibility headers
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
fef646d4f8
removed mark_nvidia.py script
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
a6308118b4
removed perf4au test
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
5a85f1b6da
renamed gpucodec namespace -> cudacodec
2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
8282f6ebc1
renamed gpu::cudev namespace -> cuda::device
...
cudev is used for new device layer
2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
e12496d150
removed gpu name usage from ocl module
2013-09-02 14:00:41 +04:00
StevenPuttemans
7e638cb0b5
Bugfix 3115: Added not to documentation for python version for
...
facerecognizer interface + white + whitespaces remove
2013-09-02 11:59:35 +02:00
Roman Donchenko
bd7930ada1
Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt
2013-09-02 13:09:22 +04:00
hbristow
c112c9aa00
Made binding compilation less verbose
2013-09-02 16:43:58 +10:00
hbristow
31c95ff7f8
Added new OpenCV definitions to bridge
2013-09-02 14:29:46 +10:00
hbristow
cf078be3d6
Merge branch 'matlab' into matlab_public
...
Conflicts:
CMakeLists.txt
README.md
samples/
2013-09-02 14:23:11 +10:00
peng xiao
3c2a8912ee
Let clAmdBlas library initialize once during program lifetime.
2013-09-02 10:06:01 +08:00
hbristow
1d25e5f1ba
manually added optical flow header to build
2013-09-01 17:10:44 +10:00
Daniel Angelov
24e916059f
Added LineSegmentDetector documentation and an output image.
2013-08-31 13:46:24 +03:00
Daniel Angelov
9d78b8003e
Update on LSD no to use any Mat* (IOArrays instead).
...
Updated to new license.
2013-08-31 13:46:24 +03:00
Roman Donchenko
7e4c0ac4d6
Merge pull request #1371 from HapeMask:fix-png-warnings
2013-08-30 17:56:06 +04:00
Roman Donchenko
46d74d7c6b
Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect
2013-08-30 17:55:07 +04:00
Gabe Schwartz
b2bedef26f
Added interlace handling to PNG decoder.
...
libpng 1.5+ recommends a call to png_set_interlace_handling() if you use
png_read_update_info and png_read_image. It will generate a warning
without it.
2013-08-30 09:49:24 -04:00
Gabe Schwartz
e2441e0034
Removed incorrect iCCP chunks from GUI resources.
...
Also removed malformed tEXt chunk from a logo PNG.
2013-08-30 09:49:24 -04:00
Alex Leontiev
af74ec6044
Minor fixes
...
In response to the pull request comments by Vadim Pisarevsky. In
particular, the following was done:
*)cv::reduce use instead of custom code for calculating
per-coordinate sum
*) naming style of private methods is made consisted with overall --
mixed-case style
*) irrelevant create()'s were removed -- I did not know that copyTo()
method itself calls create
2013-08-30 21:37:27 +08:00
Alex Leontiev
f2fd0ad153
Fixed .rst indentation
...
This caused warnings.
2013-08-30 21:37:27 +08:00
Alex Leontiev
b92c88ddd1
Removed trailing spaces
...
Continuation of work done in previous commit.
2013-08-30 21:35:47 +08:00
Alex Leontiev
b1f029ccc5
Removed trailing spaces
...
This caused warnings.
2013-08-30 21:35:47 +08:00
Alex Leontiev
554e002747
Prepare Downhill Simplex for pull request
...
This is an implementation of so-called downhill simplex method
(https://en.wikipedia.org/wiki/Nelder%E2%80%93Mead_method )
Please, let me know if you have any comments, whoever you'd be.
2013-08-30 21:35:47 +08:00
Roman Donchenko
42b4d830e8
Merge pull request #1266 from kdrobnyh:core_stat_functions
2013-08-30 17:26:20 +04:00
Roman Donchenko
96a0afce50
Merge pull request #1236 from pengx17:2.4_fix_retina_color_param
2013-08-30 17:25:07 +04:00
StevenPuttemans
e7921c3fe7
Added changes suggested by bug #3186 : fixing the unplugging of webcam
2013-08-30 13:16:18 +02:00
StevenPuttemans
15f1a48ec4
Updated with comments of speclad
2013-08-30 12:50:06 +02:00
abidrahmank
7fd8a19fe8
warning corrections
2013-08-30 15:58:10 +05:30
Roman Donchenko
114bec52fe
Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests
2013-08-30 12:24:24 +04:00
hbristow
a64c34c3ec
Updated cv help to include reference to named arguments
2013-08-30 16:48:41 +10:00
hbristow
d16d637eb2
Fixed handling of optional arguments under ArgumentParser. Fixed default constructor error in MxArray
2013-08-30 16:10:32 +10:00
hbristow
25ee1f9099
Improved error messages for incorrect arguments
2013-08-30 15:48:20 +10:00
abidrahmank
14af369640
Python bindings for KeyPoint methods
...
Usage:
import numpy as np
import cv2
img = cv2.imread('messi5.jpg',0)
sift = cv2.SIFT()
kp = sift.detect(img)
pts = cv2.KeyPoint_convert(kp)
kps = cv2.KeyPoint_convert(pts.reshape(-1,1,2))
overlap = cv2.KeyPoint_overlap(kp[0],kp[1])
2013-08-30 11:11:06 +05:30
hbristow
a780c3a7d1
Swapped out function assertions in favour of ArgumentParser
2013-08-30 15:06:57 +10:00
hbristow
8f62a52b9b
Brought matlab module into cv namespace
2013-08-30 12:39:01 +10:00
hbristow
bc93edac34
Removed all OpenCV-specific functionality from mxarray into bridge. mxarray is now standalone
2013-08-30 11:18:08 +10:00
kdrobnyh
f4aa7ff919
Add IPP support in meanStdDev, minMaxIdx, norm functions
2013-08-29 21:09:19 +04:00
hbristow
153549c7f6
Added LICENSE and Americanizations
2013-08-30 01:09:29 +10:00
hbristow
33c377b305
complete rewrite of ArgumentParser
2013-08-30 01:04:43 +10:00
Alexander Smorkalov
114e04ee12
OpenCV version++. Current OpenCv version 2.4.6.2
2013-08-29 19:00:13 +04:00
Alexander Smorkalov
ba26f6d48a
Native camera libraries updated.
...
Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
(cherry picked from commit fff91eef0b
2013-08-29 18:46:45 +04:00
ilya-lavrenov
a6084d2970
enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal
2013-08-29 18:39:09 +04:00
ilya-lavrenov
968c095403
gpu -> ocl
2013-08-29 18:32:06 +04:00
StevenPuttemans
caaf440bd8
Added fix in CMakeLists.txt for contrib module.
2013-08-29 16:09:48 +02:00
kdrobnyh
7a7aa148d4
Add IPP support in compare function
2013-08-29 17:55:57 +04:00
Roman Donchenko
fc37df05ec
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix
2013-08-29 16:35:38 +04:00
Roman Donchenko
86f4cd253a
Merge pull request #1309 from pengx17:master_retina_ocl
2013-08-29 16:26:55 +04:00
Alexander Smorkalov
5af2cc6223
AutoBuffer with initial zero size fixed.
2013-08-29 15:03:53 +04:00
Jin Ma
114f3266d8
Removed performance test.
2013-08-29 17:35:47 +08:00
Jin Ma
4f3349ffe4
Added perf namespace.
2013-08-29 16:24:26 +08:00
Jin Ma
0233c4c198
Removed whitespace.
2013-08-29 15:49:02 +08:00
Jin Ma
14e083f1e0
Removed trailing whitespace
2013-08-29 14:09:00 +08:00
Jin Ma
5728612f95
Removed the trailing whitespace
2013-08-29 14:06:03 +08:00
yao
ab235cda74
fix warnings
2013-08-29 11:59:19 +08:00
yao
26b5eb3e39
add adaptive bilateral filter (cpp and ocl version)
2013-08-29 10:48:15 +08:00
hbristow
d5abe79f74
untracked io for initial pull request
2013-08-29 10:49:15 +10:00
hbristow
9726346bc9
removed unused files from repo
2013-08-29 10:44:27 +10:00
hbristow
57505b9af9
Added LICENSE preamble to include files
2013-08-29 10:20:53 +10:00
Vadim Pisarevsky
f12702be24
fixed bugs in rectangular morphology case
2013-08-28 19:53:40 +04:00
Roman Donchenko
11dcd4f4f3
Merge pull request #1356 from SpecLad:homography-uninit
2013-08-28 18:05:10 +04:00
Vadim Pisarevsky
771feb61c2
fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches)
2013-08-28 17:00:26 +04:00
Roman Donchenko
2b90b20be2
Merge pull request #1357 from SpecLad:less-precomps
2013-08-28 14:52:28 +04:00
Roman Donchenko
e59c74e1c7
Merge pull request #1348 from SpecLad:merge-2.4
2013-08-28 13:41:41 +04:00
Roman Donchenko
cdf6cf2cd8
Merge pull request #1213 from kdrobnyh:color
2013-08-28 13:31:09 +04:00
Roman Donchenko
122d0f8685
Deleted the now-empty ocl perf_precomp.cpp.
...
See pull request #1241 for why.
2013-08-28 13:26:30 +04:00
Roman Donchenko
5e4ebf3403
Fixed incomplete matrix initialization in HomographyRefineCallback.
2013-08-28 13:20:14 +04:00
Roman Donchenko
8bb9994094
Merge pull request #1349 from ilya-lavrenov:ocl_perf_finish
2013-08-28 12:46:01 +04:00
peng xiao
9f0a88c1d6
Remove trailing whitespace.
2013-08-28 16:23:46 +08:00
Roman Donchenko
10cb9a0c4a
Merge pull request #1342 from nevion:master
2013-08-28 12:00:39 +04:00
hbristow
569e8006e3
updated README.md formatting
2013-08-28 17:58:08 +10:00
hbristow
2a0e357cd0
updated syntax highlighting
2013-08-28 17:56:39 +10:00
hbristow
b87197dc37
updated syntax highlighting
2013-08-28 17:53:25 +10:00
hbristow
eb83a9ed9f
Enabled syntax highlighting
2013-08-28 17:49:20 +10:00
Roman Donchenko
1840fd5f00
Merge pull request #1248 from vkocheganov:chi_square_alt
2013-08-28 11:44:41 +04:00
hbristow
2ac31a87c9
Added tutorial for writing your own mex files
2013-08-28 17:40:20 +10:00
hbristow
78dc2c5423
Upadated include tree to match the rest of opencv. Added install configuration for custom mex compiler
2013-08-28 17:06:19 +10:00
hbristow
52dc51a62c
Added custom OpenCV mex compiler
2013-08-28 12:01:34 +10:00
peng xiao
287c8a3330
Let ocl::context only be initialized once in retina_ocl test.
2013-08-28 09:17:05 +08:00
Fedor Morozov
9f9873017c
HDR test changes
2013-08-28 02:17:49 +04:00
ilya-lavrenov
3c86aa4ae1
appended ocl::finish to test_cycle defines
2013-08-28 00:39:58 +04:00
Roman Donchenko
2d6f35d6ed
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
Roman Donchenko
dd25f416a6
War on Whitespace, master edition: tabs.
2013-08-27 17:13:53 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
4d06c4c7b6
Merge commit '43aec5ad^' into merge-2.4
...
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
2013-08-27 13:23:26 +04:00
Roman Donchenko
45a0b39a73
Merge pull request #1339 from mdim:ml_cpp_wrappers_fix
2013-08-27 12:37:33 +04:00
Jason Newton
affab4f156
correct range computations, it is difficult to do the more efficient single pass 3N/2 implementations correctly in this particular setting without costing more than they save
2013-08-27 00:34:22 -07:00
Vladislav Vinogradov
bff0fad6c3
gpu TVL1 Optical Flow optimization:
...
do not calculate sum of error in every round of iteration;
instead the error will be summed every 2nd times or more,
if the previous sum of error is too far away from threshold.
2013-08-27 11:21:41 +04:00
peng xiao
040b3b8265
Remove trailing whitespace.
2013-08-27 13:02:34 +08:00
peng xiao
c74c517ce3
Fix build error.
2013-08-27 11:56:11 +08:00
peng xiao
168d1dc18c
Make some tweaks to make sum operations less frequently
2013-08-27 11:42:54 +08:00
Roman Donchenko
525b6eca2e
Merge pull request #1311 from leszekhanusz:png_palette_alpha
2013-08-26 16:59:45 +04:00
Roman Donchenko
b43890a7e1
Merge pull request #1326 from ilya-lavrenov:perf_ocl
2013-08-26 16:54:59 +04:00
Roman Donchenko
0daac6fd9d
Merge pull request #1327 from alalek:ocl_master_tests_fix
2013-08-26 16:44:37 +04:00
Roman Donchenko
d44adcd6e8
Merge pull request #1336 from jet47:gpu-resize
2013-08-26 16:40:50 +04:00
Fedor Morozov
833f8d16fa
Robertson and tutorial
2013-08-26 15:23:37 +04:00
ilya-lavrenov
d02ccc9590
the code was refactored and old test system code was removed
2013-08-26 12:36:31 +04:00
ilya-lavrenov
4c28a6f0f6
most of the performance tests was rewritten in google-test manner
2013-08-26 11:43:44 +04:00
ozantonkal
d83be1dccc
fixes based on the feedback: window name prefix is automatically added when it is not there, singleton class returns reference instead of pointer, destructor is private, release function implemented
2013-08-23 18:49:21 +02:00
Roman Donchenko
67ae438dae
Refactored NumPy detection.
...
Most importantly, added support for multiple include directores,
but also did some general cleanup.
2013-08-23 18:46:54 +04:00
Maria Dimashova
989be02562
fixed cpp wrappers of ML tree-based models
2013-08-23 18:13:10 +04:00
Vladislav Vinogradov
21c4753fed
used global memory access for up-scaling
2013-08-23 18:08:06 +04:00
Roman Donchenko
3182e68b8a
Merge pull request #1334 from MarkBelmont:bugfix_1
2013-08-23 16:49:51 +04:00
Roman Donchenko
cae4480834
Merge pull request #1332 from pengx17:2.4_fix_parallel
2013-08-23 14:47:49 +04:00
Vladislav Vinogradov
d1f6a23abf
improved texture usage:
...
* use explicit extrapolation only for sub-matrixes
* use built-in interpolation for INTER_NEAREST mode
2013-08-23 13:57:12 +04:00
Vladislav Vinogradov
241cc417f9
added custom implementation for nearest and linear interpolation
2013-08-23 13:57:12 +04:00
Vladislav Vinogradov
3b05acf936
reorganize code for further modifiction
2013-08-23 13:56:35 +04:00
MarkBelmont
cf34b3d65b
Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span."
2013-08-23 16:39:39 +08:00
Vladislav Vinogradov
f826bd8bce
removed NPP implementation
2013-08-23 12:16:41 +04:00
peng xiao
2519a21935
Fix a potential bug of ParallelLoopBodyWrapper::operator(Range)
...
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.
2013-08-23 15:35:55 +08:00
Alexander Alekhin
7685b983db
OCL: tests: repair moments implementation in master branch, enable tests
2013-08-22 23:37:06 +04:00
Fedor Morozov
e2e604eb18
HDR writing bug fix
2013-08-22 21:13:50 +04:00
Roman Donchenko
6fed0e85c2
Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
...
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
2013-08-22 18:17:19 +04:00
Ilya Lavrenov
6c4ad9b597
fixer error with incorrect condition
2013-08-22 17:38:55 +04:00
Ilya Lavrenov
ec461a2ff0
added a test for ocl::norm
2013-08-22 17:37:48 +04:00
Alexander Alekhin
b7b584984e
OCL: tests: repair/disable failed tests in ocl module
2013-08-22 17:06:47 +04:00
Roman Donchenko
20bf1aa244
Merge pull request #1321 from asmorkalov:winrt_mode_warn_fix
2013-08-22 12:46:00 +04:00
Roman Donchenko
fe4c7ae4ae
Merge pull request #1317 from jet47:gpu-tvl1-optimization
2013-08-22 11:55:24 +04:00
Roman Donchenko
43aec5ad4a
Merge pull request #1318 from SpecLad:wow
2013-08-22 11:49:45 +04:00
Jin Ma
1e8194fd3c
Optimized mog and mog2, which have much better performance.
2013-08-22 15:42:07 +08:00
Alexander Smorkalov
8aae54b7f4
WindowsRT mode build warning fix.
2013-08-21 23:59:27 -07:00
Mathieu Barnachon
4fbd5707f7
Fix warning on precision lost due to double to float conversion.
2013-08-22 17:34:31 +12:00
Mathieu Barnachon
7f3273c77f
Adding an export for HOGDetector compatibility.
...
An SVM train with HOG could export a single vector for HOGDetector.
2013-08-22 15:00:32 +12:00
Roman Donchenko
9c60a2c24c
Merge pull request #1316 from asmorkalov:winrt_c4447_fix
2013-08-21 19:24:25 +04:00
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
ebb6c842f9
Merge pull request #1295 from asmorkalov:winrt_ptr_usage_fix
2013-08-21 18:28:36 +04:00
Alexander Smorkalov
b15addec70
C4447 warning about main function format suppressed.
2013-08-21 07:24:46 -07:00
Alexander Smorkalov
d62c98527a
Invalid usage of cv::Ptr for arrays fixed.
2013-08-21 07:20:35 -07:00
Vladislav Vinogradov
de214950c4
minor gpu TVL1 optical flow optimization:
...
don't calc diff term if it is not used for epsilon criterion
2013-08-21 18:17:45 +04:00
Roman Donchenko
1a7c2eefb8
Merge pull request #1306 from jet47:gpu-bitwize-fix
2013-08-21 16:18:31 +04:00
Roman Donchenko
893e8b4371
Merge pull request #942 from achalddave:patch-1
2013-08-21 16:06:31 +04:00
Hanusz Leszek
32635a6834
using unsigned char instead of uint8_t to compile under windows
2013-08-21 12:33:51 +02:00
Roman Donchenko
84a9755597
Merge pull request #1215 from jet47:cuda-5.5-sanity
2013-08-21 13:25:28 +04:00
peng xiao
9b20b51389
Fix build error on Mac
2013-08-21 14:23:10 +08:00
Vladislav Vinogradov
2899d558ac
record cuda gpu name to output report
2013-08-21 10:12:44 +04:00
Vladislav Vinogradov
b7ec673001
added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros
2013-08-21 10:00:40 +04:00
Hanusz Leszek
cf39ba5801
Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel
...
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
2013-08-21 05:31:44 +02:00
peng xiao
3cccded86d
Fix build error when WITH_OPENCL is disabled.
2013-08-21 11:18:02 +08:00
ozantonkal
6bc393676d
cv::viz::get(window_name) implementation
2013-08-20 20:22:14 +02:00
ozantonkal
c37f091cc5
remove redundant statement
2013-08-20 18:18:01 +02:00
Roman Donchenko
a1b633e28e
Merge pull request #1298 from jet47:gpu-eliminate-doubles
2013-08-20 18:04:54 +04:00
Vladislav Vinogradov
cb2985c526
fixed gpu bitwize operation:
...
incorrect types for template instantiation
2013-08-20 16:28:45 +04:00
Roman Donchenko
beada19ad0
Merge pull request #1297 from SpecLad:merge-2.4
2013-08-20 14:10:22 +04:00
ozantonkal
669abd58bc
initial shared pointer implementation for Viz3d, singleton VizAccessor, cv::viz::get function initial implementation
2013-08-19 20:09:47 +02:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Alexander Smorkalov
e37f7a4c73
Typo in Java generator fixed.
...
Typo breaks debug build for Android platform.
2013-08-19 16:27:06 +04:00
Vladislav Vinogradov
cd2b7448f4
eliminate unnecessary double arithmetics in CUDA
2013-08-19 15:56:45 +04:00
kdrobnyh
c1de14c27a
Fix bilateralFilter function
2013-08-19 15:52:34 +04:00
Roman Donchenko
0b270e2b08
Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master
2013-08-19 14:26:12 +04:00
Roman Donchenko
70fffa48e5
Merge pull request #1293 from jet47:gpu-cvtcolor-fix
2013-08-19 14:14:22 +04:00
Vladislav Vinogradov
7bda6992e5
fixed gpu BGR <-> YUV color conversion
2013-08-19 13:17:55 +04:00
Vladislav Vinogradov
9f33de7071
added cvconfig.hpp header file to gpu tests
...
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
2013-08-19 12:46:57 +04:00
Roman Donchenko
473ca0849d
Merge pull request #1285 from SpecLad:enum-compare
2013-08-19 12:00:18 +04:00
Vladislav Vinogradov
cfbd791465
fixed gpu cvtColor for BGR <-> YUV
2013-08-19 11:56:58 +04:00
Mathieu Barnachon
43c9818895
Adding class for BOW image matcher (Feature #3005 ).
...
Same prototype as BOWImgDescriptorExtractor, but do only the matching.
If the feature is accepted, the BOWImgDescriptorExtractor and BOWImgDescriptorMatcher should probably refactor with inheritance.
Add a class to compute the keypoints, descriptors and matching from an image should be added to.
2013-08-18 11:32:04 +12:00
kdrobnyh
3c9f307193
macros -> template in IPP support cvtColor
2013-08-17 20:04:03 +04:00
Nghia Ho
c6858c3fb0
Buffer is accessed out of bounds.
2013-08-17 20:32:13 +10:00
Nghia Ho
d36dbe6ad6
Merge https://github.com/Itseez/opencv
2013-08-17 20:07:37 +10:00
Roman Donchenko
449b99a6d7
Merge pull request #1286 from SpecLad:optflow-sf-init
2013-08-16 19:59:26 +04:00
Roman Donchenko
7919bcef70
Merge pull request #1277 from NCBee:2.4
2013-08-16 19:59:12 +04:00
Roman Donchenko
7d768d2159
In calcOpticalFlowSF, fixed several uninitialized uses of matrices.
...
This should fix that pesky test failure that pops up from time to time.
I don't actually know if the default values should be zeros, but the tests
pass, so...
2013-08-16 14:43:18 +04:00
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
Roman Donchenko
47b3e7855f
Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix
2013-08-16 14:05:39 +04:00
Roman Donchenko
a3bbb3dd3d
Merge pull request #1279 from asmorkalov:ocv_opt_tabs
2013-08-16 13:58:14 +04:00
Roman Donchenko
2304a561ca
Fixed a -Wenum-compare warning in cudev.
2013-08-16 13:53:37 +04:00
Jin Ma
1bcd1fd3a2
Used perf_precomp.hpp instead of precomp.hpp for test.
2013-08-16 17:39:17 +08:00
Roman Donchenko
46fb737bdc
Merge pull request #1152 from StevenPuttemans:bugfix_2795
2013-08-16 12:52:48 +04:00
Roman Donchenko
ac8506db32
Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix
2013-08-16 12:22:18 +04:00
Alexander Smorkalov
a3dd13450c
All optimized function tables wrapped to getters to change its
...
initialization time.
2013-08-16 12:10:07 +04:00
Jin Ma
a3aa7966ae
Resolved compiling errors under Linux.
2013-08-16 16:07:53 +08:00
Roman Donchenko
35cb59bb22
Merge pull request #1258 from apavlenko:java_video_capture
2013-08-16 12:05:13 +04:00
Jin Ma
916b92bc3b
Resolved a compiling warning under Windows.
2013-08-16 15:33:43 +08:00
Jin Ma
8feaadc69f
Resolved a compiling error under Linux.
2013-08-16 15:25:11 +08:00
Jin Ma
3fb0bf6e99
Added MOG and MOG2.
2013-08-16 14:19:46 +08:00
Andrey Pavlenko
5a9bd3f080
restoring binary compatibility
2013-08-15 23:49:32 +04:00
Roman Donchenko
95143fdc13
Merge pull request #1275 from rdm12:bug_1922
2013-08-15 19:12:23 +04:00
Alexander Smorkalov
9af2c1661a
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
...
for libpng added.
2013-08-15 06:42:00 -07:00
Dmitry Retinskiy
ab8c0fde52
applied comments after review
2013-08-15 16:18:01 +04:00
Nghia Ho
d194bb6143
Merge https://github.com/Itseez/opencv
2013-08-15 21:51:36 +10:00
Roman Donchenko
556028eff5
Merge pull request #1253 from kamjagin:fixingCompilationOnOSX
2013-08-15 11:54:55 +04:00
Bahram Dahi
83e21568ee
Minor bug fix, missing const in method signature
2013-08-14 15:54:13 -07:00
Bahram Dahi
6cf9070b9a
Added ability to read several opencv types (Size, Point, etc.) to FileStorage. Solves issue #3196
2013-08-14 15:08:34 -07:00
kamjagin
ed29d91d42
adding std to cstdint typedef of uint32_t
2013-08-14 17:16:52 +02:00
Miroslav Kobetski
b595d73d6d
defined uint for non-windows platforms too. replaced isnan for cvIsNaN.
2013-08-14 17:16:52 +02:00
Roman Donchenko
d09c89c63e
Merge pull request #1265 from abidrahmank:misc_docs2
2013-08-14 19:03:45 +04:00
Roman Donchenko
7b95bb20f7
Merge pull request #1272 from kamjagin:fixingQTKitPublic2.4
2013-08-14 18:50:26 +04:00
Roman Donchenko
902aa309f8
Merge pull request #1270 from rdm12:bugfix_3094
2013-08-14 18:49:38 +04:00
Dmitry Retinskiy
f013baf739
bug #1922 : restored most of the class definitions in basic_structures.rst
2013-08-14 17:37:59 +04:00
Roman Donchenko
6ae9870de4
Merge pull request #1254 from pengx17:2.4_filter2d_
2013-08-14 17:27:18 +04:00
Roman Donchenko
8e245f8a3a
Merge pull request #1186 from SpecLad:dont-export-templates
2013-08-14 17:25:01 +04:00
Nghia Ho
2c9c4188ae
Merge https://github.com/Itseez/opencv
2013-08-14 22:38:39 +10:00
kamjagin
69287c936b
missed # in if defined
2013-08-14 14:25:46 +02:00
kamjagin
c24c1a5926
added HAVE_QTKIT to tests
2013-08-14 13:40:50 +02:00
kamjagin
7ff07e94a3
Fix for bug Bug #3215 . Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME
2013-08-14 13:34:34 +02:00
Dmitry Retinskiy
4eb85189e5
bug #3094 : added CV_Assert to PyrDown_ to check if source matrix is not empty
2013-08-14 15:30:35 +04:00
Roman Donchenko
7992402ecf
Merge pull request #1149 from jet47:generalized-hough-refactoring
2013-08-14 13:26:24 +04:00
Roman Donchenko
bcba3fc6b8
Merge pull request #1263 from abidrahmank:pyCLAHE_24
2013-08-14 12:10:22 +04:00
Roman Donchenko
18358521f2
Merge pull request #1162 from jet47:cudev-integration
2013-08-14 12:00:34 +04:00
Achal Dave
0bc609257d
Comparing rejected stage index with minimum required neighbors does not make sense
...
As described here, http://code.opencv.org/issues/3064 , the test before
led to a case where we compared the index of the latest stage at which a
rectangle was rejected with the minimum number of neighbors required as
specified in `detectMultiScale`. Please see the issue for more
information.
2013-08-13 20:42:04 -07:00
peng xiao
124ede611b
Update with apavlenko's suggestions.
2013-08-14 10:00:09 +08:00
abidrahmank
1b93ecfae8
docs changes
2013-08-13 22:07:44 +05:30
abidrahmank
92d04d439e
docs changes
2013-08-13 21:58:49 +05:30
abidrahmank
96c1df14f4
CLAHE Python bindings
2013-08-13 19:51:32 +05:30
Roman Donchenko
43c7a8ae93
Merge pull request #1259 from pengx17:2.4_fix_cvtcolor
2013-08-13 16:34:19 +04:00
Andrey Pavlenko
f3b1933a92
LinkedList -> ArrayList
2013-08-13 15:51:37 +04:00
Nghia Ho
79965c9ee9
Replaced isfinite() with cvIsInf and cvIsNan
2013-08-13 21:26:21 +10:00
Nghia Ho
723bc3cae9
Merge https://github.com/Itseez/opencv
2013-08-13 19:50:43 +10:00
Andrey Pavlenko
4902db1c42
also fixing JNI library name in JUnit tests
2013-08-13 13:18:01 +04:00
peng xiao
2fb2ac8836
Apply bugfix #3121 for OCL.
2013-08-13 17:17:07 +08:00
Roman Donchenko
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
peng xiao
29eefe52bb
Add OpenCL accelerated implementation for Retina.
2013-08-13 16:27:12 +08:00
Andrey Pavlenko
d4e098f401
enabling of VideoCapture(String) [fixing issue #3207 ]
...
- enable auto-wrap of VideoCapture;
- minor refactoring of generated code templates.
2013-08-13 12:04:36 +04:00
peng xiao
7fe8403074
Let ocl::filter2D support kernel size >= 3.
2013-08-13 13:58:55 +08:00
Roman Donchenko
390b67e5a0
Merge pull request #1251 from StevenPuttemans:bugfix_3209
2013-08-12 18:56:35 +04:00
Roman Donchenko
dc06d47f1c
Merge pull request #1241 from SpecLad:redundant-precomps
2013-08-12 17:19:53 +04:00
Roman Donchenko
d8c6e89a54
Merge pull request #1238 from SpecLad:cmake-min-ver
2013-08-12 15:50:23 +04:00
Roman Donchenko
57c1e8f333
Merge pull request #1242 from asmorkalov:android_native_cam
2013-08-12 14:47:48 +04:00
Roman Donchenko
504ebda7c4
Merge pull request #1235 from WonderRico:bugfix_dshow
2013-08-12 14:33:30 +04:00
kocheganovvm
086db9d6db
Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison
...
There's some disagreement about the correct formula.
has its supporters, however, for texture analysis, the newly introduced formula became
standard. The commit enables both uses without breaking backward compatibility.
First contributor of this commit was sperrholz.
2013-08-12 13:51:52 +04:00
StevenPuttemans
fd056235d3
Added bugfix 3209 : anchor point (-1,1) changed to (-1,-1)
2013-08-12 11:44:38 +02:00
WonderRico
d067749c21
fix _index / index
2013-08-12 11:19:53 +02:00
Roman Donchenko
98cd04c191
Merge pull request #1163 from kdrobnyh:Morphology
2013-08-12 12:06:31 +04:00
StevenPuttemans
1a42dd905c
Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2
2013-08-12 10:04:15 +02:00
StevenPuttemans
d11746e56d
Added fix mentioned in bug #3206
...
VideoWriter memory leak solved.
2013-08-12 09:49:19 +02:00
ozantonkal
b69a97bef3
access focal length and principal point in camera
2013-08-12 09:07:50 +02:00
hbristow
ef2c1e1a24
Changed bad cast in MxArray
2013-08-12 11:38:59 +10:00
hbristow
fb41d7bf4e
Commenting spree no.2
2013-08-12 00:52:27 +10:00
hbristow
bfa88384c7
Updated documentation
2013-08-11 16:12:05 +10:00
hbristow
e63369fe64
Updated nest list in markdown
2013-08-11 15:14:09 +10:00
hbristow
1e78a187db
Updated nest list in markdown
2013-08-11 14:49:33 +10:00
hbristow
7786ed7bcb
Updated nest list in markdown
2013-08-11 14:48:29 +10:00
hbristow
a269e3216e
Updated nest list in markdown
2013-08-11 14:46:28 +10:00
hbristow
542c88c60b
Updated nest list in markdown
2013-08-11 14:44:25 +10:00
hbristow
5ed9365bac
Updated nest list in markdown
2013-08-11 14:43:15 +10:00
hbristow
115a1471ae
Updated nest list in markdown
2013-08-11 14:42:30 +10:00
hbristow
6f811f5cb3
Documentation spree no.1
2013-08-11 14:36:50 +10:00
WonderRico
a048387376
fix formating
2013-08-09 16:13:40 +02:00
Alexander Smorkalov
fff91eef0b
Native camera libraries updated.
...
Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
2013-08-09 17:43:21 +04:00
ozantonkal
4a1573de9b
principal point is always set even though the intrinsic parameters are not given (center of window), fixed computation mistakes in setWindowSize in camera class
2013-08-09 10:39:30 +02:00
Roman Donchenko
167abf0dae
Merge pull request #1244 from vkocheganov:bugfix_3179
2013-08-09 11:49:27 +04:00
hbristow
7aaefd4dce
Improved escaped character formatting in docs
2013-08-09 15:15:08 +10:00
kocheganovvm
e4b201be25
Fix unsequenced modifications (Bug #3179 ).
2013-08-08 18:55:47 +04:00
Roman Donchenko
4dc63273f0
Renamed ocl tests' precomp files according to convention.
...
Also, added the missing include guard to perf_precomp.hpp.
This should fix the build.
2013-08-08 18:18:54 +04:00
ozantonkal
bb057491ea
create camera from projection matrix (used for getCamera in viz)
2013-08-08 12:14:27 +02:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
kdrobnyh
7da5fa01d4
Removed extra {} in erosion and dilation functions
2013-08-08 12:30:28 +04:00
Roman Donchenko
168e2a4ccb
Removed CMake version checks that we don't need anymore.
2013-08-08 12:03:41 +04:00
Roman Donchenko
79b6f68f54
Merge pull request #1233 from vpisarev:24_ipp_78
2013-08-08 12:00:52 +04:00
hbristow
a659562c36
Changed command-line separator from module:file to module=file so that it works cross-platform
2013-08-08 05:26:56 +10:00
hbristow
3bf41c2832
Formatted URLs in the documentation so that they are redirected to the system browser instead of the builtin Matlab browser
2013-08-08 04:46:45 +10:00
Vadim Pisarevsky
d5539975d7
polished the patch
2013-08-07 22:34:29 +04:00
hbristow
fad7b35b9a
Updated documentation formatting
2013-08-08 03:51:44 +10:00
Andrey Pavlenko
1c55096c01
Merge pull request #1232 from StevenPuttemans:fix_wrong_documentation
2013-08-07 21:05:43 +04:00
hbristow
059d63cceb
Added diagnostic/build information function
2013-08-08 02:42:17 +10:00
Nghia Ho
95ee02ba8e
Added extra comment to test buildbot
2013-08-08 01:33:21 +10:00
ozantonkal
71dc5f8291
simulate real cameras by working around vtkUserTransform to set projection matrix
2013-08-07 16:20:23 +02:00
ozantonkal
422b967e9a
fix computeProjectionMatrix in Camera class, also check if there is principal point defined
2013-08-07 15:52:24 +02:00
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
2013-08-07 14:49:33 +02:00
Roman Donchenko
e23f31311d
xls-report.py: separated image width and height for easier analysis.
2013-08-07 13:43:03 +04:00
hbristow
f705020348
Linked online documentation now opens a browser window to the exact function reference using div tags
2013-08-07 19:28:58 +10:00
Roman Donchenko
95bdd4b670
Merge pull request #1189 from pengx17:2.4_sort_by_key
2013-08-07 11:41:23 +04:00
ozantonkal
5335489daa
viz getWindowSize, setWindowSize
2013-08-07 09:28:39 +02:00
Fedor Morozov
19082e0504
Documentation update
2013-08-07 11:15:41 +04:00
peng xiao
5aaed77cbc
Fix a bug of retinaParameters.
...
When colorMode is set to 0 via Retina::_init method, _retinaParameters's
colorMode variable is not correctly assigned.
2013-08-07 14:36:24 +08:00
hbristow
3483bf14b9
Added auto-generated docs to all OpenCV functions
2013-08-07 16:34:30 +10:00
Nghia
18e7aa5d19
Update intersection.cpp
...
Added #ifdef _WIN32 for finite number testing
2013-08-07 14:57:12 +10:00
Andrey Pavlenko
04c86f28b1
Merge pull request #1228 from vkocheganov:bug_3191
2013-08-06 21:01:40 +04:00
Andrey Pavlenko
a7da129984
Merge pull request #1187 from kdrobnyh:mean_and_sum
2013-08-06 20:54:52 +04:00
WonderRico
7e7fb0b75d
Bug #3201 fix
2013-08-06 18:35:49 +02:00
hbristow
faeb0aa92a
Now using python ArgumentParser to parse command line arguments in preparation for adding doc generation
2013-08-07 01:41:10 +10:00
hbristow
c5ffd1fdea
Updated main Matlab help string
2013-08-07 01:10:51 +10:00
Vadim Pisarevsky
10fde1ca5c
disabled 64f IPP DFT; added IPP Gaussian filter; added IPP GetRectSubPix; added IPP BilateralFilter (temporarily disabled)
2013-08-06 18:31:06 +04:00
hbristow
7ef3be3429
By default, all function now export at least one return value back into the Matlab workspace, even if none are requested. This is in line with Matlab's calling convention, where functions called without an lvalue or a semicolon have their first output printed to the terminal
2013-08-07 00:14:13 +10:00
Fedor Morozov
3725c1fb4c
Documentation updates
2013-08-06 18:13:34 +04:00
Roman Donchenko
48a6edbdfe
Fixed compilation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
8bed7bb5f9
Fixed documentation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
2f780ed994
Fix whitespace errors.
2013-08-06 18:07:00 +04:00
Roman Donchenko
131458847b
Make ts always static.
...
This allows us to forget about the GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
macros and to get rid of the dependency on cvconfig.h.
2013-08-06 17:56:25 +04:00
Fedor Morozov
e914fc2471
Merge branch 'master' of https://github.com/f-morozov/opencv
2013-08-06 17:49:29 +04:00
Fedor Morozov
4a4c5190f0
Documentation updates
2013-08-06 17:49:02 +04:00
Alexander Shishkov
3c218717a9
Merge branch 'master' of https://github.com/f-morozov/opencv
2013-08-06 15:41:39 +04:00
Alexander Shishkov
c4fb0e9dbb
few changes for compilation
2013-08-06 15:41:32 +04:00
Fedor Morozov
bef8d8192e
Minor fixes, new MergeDebevec
2013-08-06 15:24:01 +04:00
hbristow
8f92973b8c
Started documentation skeleton
2013-08-06 21:16:38 +10:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
kocheganovvm
e9b9a6fc03
Fix unsequenced assignment (Bug #3191 ).
2013-08-06 08:08:13 +04:00
hbristow
b654413567
Added mixed-precision check when attempting to link to an OpenCV version with different bitness. Bindings now compiling and linking on my Windows 7 VM with VS2012 and Matlab R2013a
2013-08-06 13:01:57 +10:00
ozantonkal
731a931c0c
field of views are in radians
2013-08-05 19:35:20 +02:00
ozantonkal
32985aa724
fix camera constructor, add tentative KinectCamera method
2013-08-05 19:22:43 +02:00
ozantonkal
9c20e77013
fix conversion functions to use appropriate vtk function
2013-08-05 18:39:36 +02:00
Fedor Morozov
4c0f7f9e59
Tonemapping documentation update
2013-08-05 20:35:48 +04:00
Fedor Morozov
cb999a231e
Mantiuk's tonemapping
2013-08-05 19:31:10 +04:00
Fedor Morozov
17609b90c7
Mantiuk's tonemapping
2013-08-05 19:22:42 +04:00
hbristow
48aac747ca
removed pkg_resources (setuptools) dependency from jinja. Matlab module now has no python dependencies beyond the core python libs
2013-08-06 00:40:57 +10:00
ozantonkal
f8ad3c0204
fix field of view computation in setWindowSize
2013-08-05 16:06:02 +02:00
ozantonkal
119d97f1f6
remove old camera, rename new camera
2013-08-05 15:37:08 +02:00
ozantonkal
f060eee5a5
fix window_size setter, remove camera related old methods from viz3d
2013-08-05 15:10:17 +02:00
ozantonkal
439ba98e0a
initial implementation of projection matrix, 3D to window coordinates, window coordinates to 3D ray (not yet tested)
2013-08-05 13:01:21 +02:00
Roman Donchenko
b2d1d87ed1
Merge pull request #1225 from apavlenko:fix_format_security
2013-08-05 12:58:37 +04:00
Roman Donchenko
4fb2e9a85a
Merge pull request #1196 from rdm12:bugfix_3121_cvtcolor
2013-08-05 12:52:15 +04:00
Andrey Pavlenko
7b0734caf9
fixing java test after fix in OpenCV library
2013-08-05 11:45:17 +04:00
hbristow
d00f4e267b
Added Windows dll versioning and Debug library postfix checks. Dependent libraries now being found by linker :)
2013-08-05 17:37:48 +10:00
Andrey Pavlenko
a06891851d
fixing compilation with -Werror=format-security enabled
2013-08-05 11:11:54 +04:00
Andrey Pavlenko
4c03afe006
Merge pull request #1079 from AlexeySpizhevoy:master
2013-08-05 10:54:44 +04:00
Andrey Pavlenko
6483754860
Merge pull request #1220 from asmorkalov:msmf_sizet_fix
2013-08-05 10:26:39 +04:00
Andrey Pavlenko
af8a03e17f
Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
2013-08-05 10:20:25 +04:00
Andrey Pavlenko
487ff4f3aa
Merge pull request #1151 from jet47:gpubgsegm-refactoring
2013-08-05 10:20:00 +04:00
hbristow
ecb506842b
Added Windows-specific configuration lookup for linker paths
2013-08-05 14:49:12 +10:00
Mathieu Barnachon
ff85575b28
Adding read/write functions to PCA class. Update PCA test.
2013-08-05 12:06:55 +12:00
Alexander Smorkalov
aada5f7844
Difference in method definition and declaration fixed (Bug #3189 ).
2013-08-04 22:34:36 +04:00
Alexander Smorkalov
2243118fc0
NEON instruction set enabled for WIN32 on ARM by default.
2013-08-04 08:47:42 -07:00
ozantonkal
0bb89e767a
fix field of view formula in camera class, implement get camera
2013-08-04 17:01:41 +02:00
hbristow
dfda79e673
Added passthrough of CXX FLAGS to mex compiler
2013-08-05 00:44:38 +10:00
ozantonkal
f445f76213
initial setCamera implementation
2013-08-03 16:33:11 +02:00
ozantonkal
4953786de1
remove boost include (caused by Kdevelop autocomplete)
2013-08-03 15:42:10 +02:00
ozantonkal
e4e9ed876f
spheres trajectory widget implementation
2013-08-03 15:40:36 +02:00
ozantonkal
a76cc9ef88
initial camera implementation (camera2), fix bug (zeros method)
2013-08-03 15:24:15 +02:00
ozantonkal
8fa6b6a6ef
initial setViewerPose implementation
2013-08-03 15:24:15 +02:00
Alexander Shishkov
6df203c449
Fixes for Linux compilation, small changes
2013-08-03 01:45:20 +04:00
Andrey Pavlenko
ee8687ba19
Merge pull request #1214 from StevenPuttemans:feature_3169_others
2013-08-02 17:59:06 +04:00
Vladislav Vinogradov
d13ecd0d76
increase epsilon for GEMM & Convolve sanity tests for CUDA 5.5
2013-08-02 17:31:34 +04:00
Andrey Pavlenko
f0d854ce39
Merge pull request #1205 from asmorkalov:winrt_api_cert_fix
2013-08-02 16:27:23 +04:00
StevenPuttemans
f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
Alexander Smorkalov
63786c389f
Warning and review notes fixes.
...
WITH_WINRT -> ENABLE_WINRT_MODE;
Some temporary char* replaced with Ptr<char>;
Build fix for regular WIN32;
Windows Platform SDK and MSVC search added to cmake;
Warinig fixes.
2013-08-02 04:10:56 -07:00
Anatoly Baksheev
54774f6d3b
updated license header
2013-08-02 13:45:43 +04:00
Anatoly Baksheev
69e66d7bb5
fixed little bug in makeCameraPose
2013-08-02 13:37:15 +04:00
Vladislav Vinogradov
55cb26551f
use NPP version for Fermi
2013-08-02 09:05:21 +04:00
Fedor Morozov
c51b50b44c
Algorithm names in code
2013-08-02 00:01:15 +04:00
Vladislav Vinogradov
a28cb99e88
optimized version of histEven for CV_8UC1
2013-08-01 18:00:05 +04:00
Vladislav Vinogradov
bfca1afd9e
rewrite histEven test
2013-08-01 18:00:05 +04:00
Vladislav Vinogradov
c8d1fccdac
compare cv::gpu::calcHist with cv::calcHist
2013-08-01 18:00:05 +04:00
Fedor Morozov
ed0828d0a8
New HDR documentation
2013-08-01 15:34:03 +04:00
kdrobnyh
c1ad6a9ffb
Add IPP support in cvtColor function
2013-08-01 15:15:36 +04:00
peng xiao
fd77a49e76
Fix ocl compilation error when using Intel OpenCL SDK.
2013-08-01 13:06:33 +08:00
Fedor Morozov
302bf23f82
All hdr functions as Algorithms
2013-08-01 03:24:47 +04:00
Nghia Ho
bc3dd2452f
Added test cpp
2013-07-31 23:59:23 +10:00
Nghia Ho
61386e1abd
Merge https://github.com/Itseez/opencv
...
Keeping up to date
2013-07-31 23:40:34 +10:00
Nghia Ho
00f63fa8f7
Finished test code, added image to the doc
2013-07-31 23:08:02 +10:00
Alexander Smorkalov
e03ffde346
WinRT API Certification fixes for core and contrib.
2013-07-31 05:43:53 -07:00
Alexander Smorkalov
62b85a41da
TLS calls on WinRT replaced on variables with C++11 "thread" attribute.
2013-07-31 05:43:52 -07:00
Alexander Smorkalov
6257df1c4b
API restricted on WinRT partially removed from core.
...
Additional CMAKE flag WITH_WINRT added.
2013-07-31 05:43:51 -07:00
Andrey Pavlenko
9b5d1596dc
Merge pull request #891 from NCBee:2.4
2013-07-31 16:38:16 +04:00
Fedor Morozov
4d2ea847fa
Tonemap as 3.0 algorithm
2013-07-31 16:05:31 +04:00
Andrey Pavlenko
4c35449b7d
Merge pull request #1139 from StevenPuttemans:bugfix_3101
2013-07-31 15:14:03 +04:00
Andrey Pavlenko
d138f77143
Merge pull request #1019 from jet47:opengl-documentation
2013-07-31 15:10:27 +04:00
Andrey Pavlenko
76a938c7ef
Merge pull request #1197 from apavlenko:fix_unstable_perf_tests
2013-07-31 15:07:19 +04:00
Andrey Pavlenko
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
StevenPuttemans
4dff5b7c72
Added bugfix #2795
...
- changing license header
- fixed bug in QtKit when changing camera resolution
2013-07-31 11:25:55 +02:00
StevenPuttemans
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
hbristow
5e50791a9d
Generator and compiler now working on Windows. Moved matlab to correct VS solution folder
2013-07-31 12:37:05 +10:00
hbristow
58ca8ed97f
Improved finding Matlab on Windows machines. Needs testing on computers that have multiple version installed
2013-07-31 11:24:28 +10:00
Nghia Ho
27bcc0bf07
Merge https://github.com/Itseez/opencv
...
Keep up to date
2013-07-31 06:10:57 +10:00
berak
03c4a6299b
expanded the CV_Assert in pyrdown_ to check for empty mats
2013-07-30 17:32:48 +02:00
Andrey Pavlenko
0851766806
Merge pull request #1121 from pengx17:2.4_gftt_perf_test
2013-07-30 18:40:10 +04:00
Andrey Pavlenko
6a77bfb503
Merge pull request #1172 from StevenPuttemans:bugfix_3166_24
2013-07-30 18:39:41 +04:00
Andrey Pavlenko
c4e1edbb83
Merge pull request #1195 from jet47:gpucodec-remove-ffmpeg-dep
2013-07-30 18:22:08 +04:00
hbristow
627b9df85f
removed experimental IO from build
2013-07-31 00:00:50 +10:00
hbristow
6549e5e052
Added flaky support for finding Matlab on Windows machines
2013-07-30 23:58:32 +10:00
Nghia Ho
3fcdbbe734
Merge https://github.com/Itseez/opencv
2013-07-30 23:58:10 +10:00
Andrey Pavlenko
2b8d868560
Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix
2013-07-30 17:50:50 +04:00
Andrey Pavlenko
93923141d5
Merge pull request #1108 from nailbiter:optimLP
2013-07-30 17:50:31 +04:00
Andrey Pavlenko
b31293c984
Merge pull request #1194 from SpecLad:no-const-inputarray
2013-07-30 17:41:26 +04:00
Andrey Pavlenko
f7ce70f70a
Merge pull request #1110 from SpecLad:config-cleanup
2013-07-30 17:39:35 +04:00
Andrey Pavlenko
c43b896541
Merge pull request #1177 from janstarzy:refactor
2013-07-30 17:39:09 +04:00
Andrey Pavlenko
bc78e87a61
Merge pull request #1123 from bitwangyaoyao:2.4_fix
2013-07-30 17:13:27 +04:00
Andrey Pavlenko
26a3cabbf8
Merge pull request #1193 from SpecLad:exports-for-contrarians
2013-07-30 16:50:29 +04:00
Andrey Pavlenko
eb0d26b5be
fixing warning on shadowing local var (TEST_CYCLE_MULTIRUN uses 'r')
2013-07-30 16:42:45 +04:00
Andrey Pavlenko
cd62f9f7cb
Merge pull request #1164 from bitwangyaoyao:master_fixHaar
2013-07-30 16:14:24 +04:00
Andrey Pavlenko
c5e569d178
Merge pull request #1204 from berak:Bug_3170
2013-07-30 16:13:03 +04:00
Andrey Pavlenko
ea6002ebc7
Merge pull request #1185 from znah:cumpute_method_for_2_4
2013-07-30 15:46:48 +04:00
kdrobnyh
94bc4c4429
Some changes in erosion and dilation functions
2013-07-30 15:13:04 +04:00
Andrey Pavlenko
41d180f90a
Merge pull request #1198 from znah:py_flann_fix
2013-07-30 14:17:33 +04:00
peng xiao
8b90cb375a
Fix doc build error.
2013-07-30 14:12:22 +08:00
peng xiao
892c088e1b
Some modifications to sortByKey API.
...
Add documentation.
2013-07-30 11:53:25 +08:00
abidrahmank
fa1b96bd36
imshow docs improvement bug#2490
2013-07-30 07:00:51 +05:30
abidrahmank
9628bb0b44
morphologyex docs bug#2169
2013-07-30 06:46:59 +05:30
Alex Leontiev
3013ad6624
Minor fixes
...
Request to comments on pull request for simplex method. In particular
*) while(1) is replaced with for(;;)
*) if(true){...} constructions in tests are replaced with #if 1 ...
#endif
2013-07-30 04:14:36 +03:00
kdrobnyh
6af10a2937
Some changes in sum and mean functions
2013-07-30 00:54:27 +04:00
abidrahmank
29ddbbaa86
epilines pydocs
2013-07-30 00:27:58 +05:30
Fedor Morozov
258b98d15b
Tonemap as Algorithm
2013-07-29 21:35:10 +04:00
ozantonkal
f5816c883f
fix setting color of 3D objects
2013-07-29 15:10:48 +02:00
ozantonkal
b64e6ccc6c
static function for appending clouds in cloud collection widget
2013-07-29 15:06:05 +02:00
Andrey Pavlenko
301de6e038
Merge pull request #1202 from hansmi:docfix3149
2013-07-29 15:29:22 +04:00
Andrey Pavlenko
e213af6c0d
Merge pull request #1190 from melody-rain:2.4_add_farneback_to_superres
2013-07-29 15:25:56 +04:00
ozantonkal
42266b04a5
makeCameraPose implementation
2013-07-29 12:25:46 +02:00
berak
1b10860f36
added add_definitions(-DCVAPI_EXPORTS) to cmakelists.txt
2013-07-29 12:16:37 +02:00
ozantonkal
250dac5b71
fix: trajectory path is now relative to the global frame
2013-07-29 11:01:59 +02:00
Michael Hanselmann
cdc2ee9789
Documentation fix for cv::compare (issue 3149)
...
Since commit d8417af086
2013-07-28 16:19:19 +02:00
Nghia Ho
cb16f733b9
Added C interface
2013-07-28 15:31:58 +10:00
Nghia Ho
a40f217a38
changed from isnormal to isfinite, the prev ignored zero
2013-07-28 01:06:55 +10:00
Nghia Ho
a0576d7b2a
Fixed ret
2013-07-28 00:46:44 +10:00
Nghia Ho
e2f00ce846
New intersection function for rotated rectangles
2013-07-28 00:12:24 +10:00
Shervin Emami
7dc147c1f2
Changed cornerHarris description to say it finds corners, not edges
2013-07-26 19:13:25 -07:00
Frédéric Devernay
6be8757e8b
fix signedness error
...
OpenCV's automatic builds don't care if you store an unsigned int into
an int, but they don't want you to compare signed with unsigned. Does
that make sense?
2013-07-26 21:32:35 +02:00
Frédéric Devernay
4ad12a680c
fix cap_qtkit.mm for multithreaded applications
...
cap_qtkit does not work when the capture is run outside of the main
thread.
If the capture is launched in a separate thread, then [NSRunLoop
currentRunLoop] is not the same as in the main thread, and has no timer.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"
Using usleep() (which I previously proposed, and was reverted) is not a
good alternative, because it may block the GUI.
Here is the new proposed solution:
- create a dummy timer so that runUntilDate does not exit immediately
- simplify the loop by using runUntilDate instead of runMode:beforeDate
- fix potential memory leaks (pointed out by Xcode's static analysis)
- fix init to follow Objective-C guidelines
- fax warnings about conversions from size_t to int
2013-07-26 18:39:03 +02:00
ozantonkal
3fe5984e46
cloud collection widget implementation
2013-07-26 16:55:03 +02:00
Alexander Mordvintsev
25b9ac18e6
fixed Bug #3143 - flann 'not implemented' error
2013-07-26 17:59:38 +04:00
Andrey Pavlenko
3a0e26b89d
adding/tuning multiple run for perf tests failing due to big deviation (functions using TBB can work so)
2013-07-26 17:27:31 +04:00
ozantonkal
edfad34d39
trajectory with spheres and lines (based on the code snippet in gdocs)
2013-07-26 14:50:11 +02:00
Dmitry Retinskiy
1d571b1eaa
bugfix #3121 : corrected calculation of blue channel index
2013-07-26 16:31:39 +04:00
Vladislav Vinogradov
60e2dbe810
removed ffmpeg dependency from gpucodec module:
...
used implementation from highgui module
2013-07-26 16:13:37 +04:00
Roman Donchenko
31de2833b4
Replace "const InputArray" with "InputArray".
...
InputArray is a reference, and references are always constant anyway. Making
it const even causes a GCC warning.
2013-07-26 14:52:56 +04:00
Roman Donchenko
ee182eb086
Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared.
...
Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.
2013-07-26 14:35:40 +04:00
Vladislav Vinogradov
dfd2957841
fixed gpu_perf4au perf test (added cuda impl)
2013-07-26 11:13:39 +04:00
peng xiao
a6d558042c
Fix build errors
2013-07-26 14:32:37 +08:00
Jin Ma
027b8021b1
Added farneback to superres module.
2013-07-26 14:14:40 +08:00
yao
270b2c7918
generating the lut table instead of hard coding one
2013-07-26 11:17:27 +08:00
kdrobnyh
4dfd40bec0
Add IPP mean and sum functions
2013-07-25 21:27:35 +04:00
Roman Donchenko
4ac2db271d
Removed CV_EXPORTS from all template classes (that I could find).
...
It doesn't make sense to export template classes, since there's no way
the user can learn that it can import them. In fact, it is somewhat
deleterious, because every module will export every instantiation
that it uses, but doesn't inline.
2013-07-25 19:40:08 +04:00
ozantonkal
b661d72252
CameraPositionWidget: a workaround for setting frustum color in the presence of an image
2013-07-25 16:47:30 +02:00
ozantonkal
ec756afe87
trajectorywidget display modes are combined with & instead of |
2013-07-25 16:08:23 +02:00
ozantonkal
64cdd82146
trajectory widget constructor with field of view
2013-07-25 15:08:45 +02:00
Jan Starzynski
d6b86d43c9
removed declaration of throwJavaException
2013-07-25 14:53:22 +02:00
Alexander Mordvintsev
57bd485119
compute method for Feature2D
2013-07-25 16:22:31 +04:00
Jan Starzynski
70930a30a1
refactored throwJavaException() and removed useless returns
2013-07-25 13:36:27 +02:00
Alex Leontiev
52b250f466
Minor fixes
...
Fixing failed build.
2013-07-25 14:30:20 +03:00
ozantonkal
7d458e852e
trajectory widget display options: display path, display frames, display both
2013-07-25 10:56:54 +02:00
ozantonkal
aa2594c06c
fix aspect_ratio computation from fovs, add casting for camerapositionwidget, trajectorywidget
2013-07-25 10:23:24 +02:00
Roman Donchenko
8afb7a40c6
Merge pull request #1159 from lluisgomez:scene_text_detection_NM
2013-07-25 12:13:49 +04:00
Alexander Pacha
0b15cfd48c
Added FREAK-descriptor extractor to documentation.
...
Previously it was missing.
Ordered all descriptors by year of first publication.
2013-07-25 16:40:09 +12:00
Jan Starzynski
925e4eec98
removed multiplied code for exception handling
2013-07-24 17:27:03 +02:00
Nghia Ho
eb2720a908
missing fclose when returning early
2013-07-24 23:53:18 +10:00
Roman Donchenko
45f7c83da4
Merge pull request #1119 from 23pointsNorth:lsd
2013-07-24 13:50:11 +04:00
ozantonkal
769512db2d
move image copying structure to viz3d_impl: ConvertToVtkImage
2013-07-24 10:32:21 +02:00
ozantonkal
952029a47b
GridImpl structure to shorten grid widget implementation
2013-07-24 10:13:01 +02:00
ozantonkal
6e5a712f6e
Gridwidget with plane coefficients
2013-07-24 10:02:33 +02:00
ozantonkal
40b50755d3
add const keywords to gridwidget constructor
2013-07-23 15:46:14 +02:00
ozantonkal
4d70671231
intial implementation of frustum + image (the color of the frustum is currently dependent on the first pixel of the image)
2013-07-23 15:43:23 +02:00
lluis
c4f88b0687
removed some unnecessary ERStat members as they are easily computable from others
2013-07-23 15:04:01 +02:00
lluis
43e7e6e475
removed extra cv:: scope qualifiers for better readability
2013-07-23 14:37:45 +02:00
lluis
2087d4602b
using Rect for storing the bounding box instead of an integer array
2013-07-23 13:58:52 +02:00
StevenPuttemans
194af062ff
Adapted the reference underscore to link properly
2013-07-23 09:49:09 +02:00
StevenPuttemans
a92feafc49
Fixed bug 3166 - added paper reference to stardetector code
2013-07-23 08:49:25 +02:00
lluis
ca6b30a568
using explicit keyword in the ERStat constructor for safe contruction
2013-07-23 00:24:17 +02:00
ozantonkal
f9938da67d
image 3d widget with position, normal, up_vector
2013-07-22 17:18:19 +02:00
ozantonkal
d0bd344a42
image 3d widget use texture instead of imageactor for more flexibility (such as resizing)
2013-07-22 16:48:17 +02:00
Roman Donchenko
3939d78336
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
ozantonkal
27f5cd2afd
overlay image widget constructor with Rect
2013-07-22 16:12:22 +02:00
ozantonkal
540f9a67f3
remove unnecessary declaration
2013-07-22 15:14:33 +02:00
ozantonkal
c0f44ca421
shorten Trajectory widget implementation
2013-07-22 15:03:28 +02:00
ozantonkal
5af739dfc1
plane widget size fix
2013-07-22 14:34:44 +02:00
ozantonkal
16c8c98895
trajectory widget with frustums
2013-07-22 14:11:06 +02:00
ozantonkal
f3b228c91f
initial implementation of trajectory widget
2013-07-22 12:53:19 +02:00
Roman Donchenko
ef91d7e883
Merge pull request #1153 from abidrahmank:bgdGMG_docs
2013-07-22 14:52:36 +04:00
Vadim Pisarevsky
8b6afd697d
added call to IPP's ippiDistanceTransform_5x5_8u32f_C1R (by Alexander Kapustin)
2013-07-22 14:20:13 +04:00
yao
3d3e9ab635
Fix the problem of haar caused by merge
2013-07-22 17:53:56 +08:00
Vladislav Vinogradov
6dfd8f184c
rewrote matrix operations with cudev module
2013-07-22 13:07:07 +04:00
Roman Donchenko
1432f3a82c
Fix xls-report.py not working with more than one comparison.
2013-07-22 12:48:43 +04:00
ozantonkal
13a2516a6a
avoid memory leak in mesh widget
2013-07-22 09:11:16 +02:00
Vladislav Vinogradov
2311b0b43b
added cudev::GpuMat_<T> support to Input/Output arrays
2013-07-22 10:33:40 +04:00
Vladislav Vinogradov
1c0d2b37a7
added globPtr for GpuMat
2013-07-22 10:33:39 +04:00
Vladislav Vinogradov
c23eb17997
added gridTransform/gridCopy overloads for GlobPtrSz
2013-07-22 10:33:39 +04:00
Daniel Angelov
6fa4834f31
Update on the class. Edited tests and samples.
2013-07-22 00:55:29 +03:00
Andrey Pavlenko
aaf47578e8
Merge pull request #1155 from bitwangyaoyao:master_fix
2013-07-21 18:50:39 +04:00
Andrey Pavlenko
f01cd3d99e
Merge pull request #1158 from StevenPuttemans:bugfix_3165
2013-07-21 18:47:16 +04:00
Andrey Pavlenko
cdcb5ed134
Merge pull request #1156 from StevenPuttemans:bugfix_1873_new
2013-07-21 18:46:58 +04:00
Andrey Pavlenko
bd4d24f0fa
Merge pull request #1122 from SpecLad:merge-2.4
2013-07-21 18:46:27 +04:00
Andrey Pavlenko
cd103e442f
Merge pull request #1032 from jet47:gpuarithm-remove-obsolete-api
2013-07-21 18:45:47 +04:00
Fedor Morozov
af2c9077f7
Calibration, various changes
2013-07-21 13:56:20 +04:00
Fedor Morozov
703cf8cef7
Calibration, various changes
2013-07-21 13:48:57 +04:00
abidrahmank
297b67d2b1
pydocs for cv2.findTransformECC
2013-07-21 13:40:11 +05:30
Daniel Angelov
6f3d6ded47
Test case to strict, as overlapping lines (based on random places) may occur.
2013-07-21 10:39:24 +03:00
Daniel Angelov
68e348f960
Added private operator=.
2013-07-21 10:08:11 +03:00
Daniel Angelov
cedd768397
Fixed the M_PI to CV_PI
2013-07-21 01:54:27 +03:00
Daniel Angelov
965b3759b1
Update on the class to reflect the review. Split the class into virtual and implementation. change of name to LineSegmentDetector, using Input/Output-Arrays, general clean ups.
2013-07-21 01:31:51 +03:00
Philippe FOUBERT
9c04db554f
Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS
2013-07-20 15:03:30 +02:00
Alex Leontiev
c123974f42
Eliminated all the calls to std::find()
...
This is done by keeping indexToRow vector, that keeps the information,
opposite to those kept by N and B. That is, while N and B help to
determine which variable corresponds to given column in column-vector c
or row in matrix b, indexToRow helps to determine the corresponding
row/column for a given variable.
At this point, I'm waiting for comments from pull request reviewer and
not working on any upgrades. Comments are appreciated, as usual.
2013-07-20 15:14:02 +03:00
lluis
9fbff009e9
fixed compilation errors and warnings on builds 3298 and 4384
2013-07-20 11:35:56 +02:00
lluis
6adba09463
fixed some warnings on build 4285
2013-07-20 11:13:38 +02:00
abidrahmank
f36b9940e8
ref in inpainting docs
2013-07-20 14:07:19 +05:30
lluis
1d8e80aa3b
add opencv_ml headers to precomp
2013-07-20 10:33:42 +02:00
lluis
5abe3b59f5
Class-specific Extremal Region Filter algorithm as proposed in :
...
Neumann L., Matas J.: Real-Time Scene Text Localization and Recognition, CVPR 2012.
High-level C++ interface and implementation of algorithm is in the objdetect module.
C++ example, a test image, and the default classifiers in xml files.
2013-07-20 01:10:05 +02:00
abidrahmank
692d807fa0
gabor filter docs Bug#1894
2013-07-20 00:15:28 +05:30
abidrahmank
84179b8a4e
bgdsubtractorGMG docs
2013-07-19 23:11:30 +05:30
ozantonkal
0a3691d6ac
CameraPositionWidget: constructor with Vec2f fov (tentative)
2013-07-19 18:30:12 +02:00
StevenPuttemans
27ed32f833
Applied bugfix #3165 : Changed min_eps value
2013-07-19 14:11:04 +02:00
Alex Leontiev
33e7640fb0
Simplify printing procedures
...
Use opencv's print() procedure in place of my own procedures to output
matrices and std::vectors.
Interestingly enough, operator<< does not work for matrices, when called
from my .cpp files in src/ subfolder of the optim module, although it
works when called from tests and stand-alone programs, compiled with
opencv. I think, this requires investigation and, maybe, bug report.
2013-07-19 12:34:33 +03:00
Roman Donchenko
1c35f121bb
Merge pull request #1148 from StevenPuttemans:patch_3125
2013-07-19 12:48:49 +04:00
Roman Donchenko
7e15f2ac73
Merge pull request #1141 from apavlenko:fix_warning_unreach_code
2013-07-19 12:22:58 +04:00
Roman Donchenko
73b10bc8ca
Merge pull request #1133 from abidrahmank:denoising_pydocs
2013-07-19 12:20:56 +04:00
Roman Donchenko
1b38d1e6b7
Merge pull request #1150 from janstarzy:spelling
2013-07-19 12:15:31 +04:00
StevenPuttemans
52bfa7b850
Fixed bug 1873 : return image keypoint descriptors + fix on line 152 pure declaration
2013-07-19 09:29:48 +02:00
yao
18f71fd410
Warning fixes
2013-07-19 14:36:41 +08:00
Alex Leontiev
459c16ca99
Minor fixes
...
In request to the comments for the pull request.
2013-07-19 03:09:39 +03:00
Alexander Shishkov
b87d2e9ec2
cosmetic change
2013-07-19 03:10:38 +04:00
Alexander Shishkov
919f35644e
Merge branch 'master' of https://github.com/f-morozov/opencv
2013-07-19 01:08:49 +04:00
Alexander Shishkov
35a39c19a3
minor changes
2013-07-19 01:08:42 +04:00
Fedor Morozov
ec668ce3a7
Documentation
2013-07-19 00:23:49 +04:00
Andrey Pavlenko
6b047ca0eb
minor improvement (consistency, readability)
2013-07-18 19:50:51 +04:00
ozantonkal
2294eb82c9
fix aspect_ratio in camera position widget, add scale parameter (tentative implementation of scale)
2013-07-18 17:46:08 +02:00
Andrey Pavlenko
0386488629
Merge pull request #1095 from jet47:gpu-perf-tests
2013-07-18 19:32:37 +04:00
Andrey Pavlenko
74c72a1d7a
removing unreachible code
2013-07-18 19:15:49 +04:00
ozantonkal
9d3f3c66da
camera position widget: constructor with no parameter, constructor with intrinsic matrix for visualizing frustum
2013-07-18 17:08:58 +02:00
StevenPuttemans
dd0481ef2d
Added brackets around line 888-892 for correct code!
2013-07-18 15:34:38 +02:00
Jan Starzynski
9bf216742f
fixed cpackage -> package
2013-07-18 15:33:25 +02:00
StevenPuttemans
f9b594bf08
Changed first approach to a more general MS-specific approach.
...
Suggested by @SpecLad
2013-07-18 14:24:19 +02:00
Roman Donchenko
77f2d945f0
Merge pull request #1144 from prclibo:master
2013-07-18 16:05:40 +04:00
Roman Donchenko
28f2755413
Merge pull request #1137 from StevenPuttemans:bugfix_3131_24
2013-07-18 16:02:47 +04:00
Vladislav Vinogradov
7737375106
updated documentation
2013-07-18 15:39:43 +04:00
Vladislav Vinogradov
af2a700671
made module dependency optional
2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
62edeeed16
refactored FGD algorithm
2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
697793090d
refactored GMG algorithm
2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
b8f0d1a0e4
refactored MOG2 algorithm
2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
a2adab7283
refactored MOG algorithm
...
converted it to abstract interface
2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
88e67545ef
split mog sources
2013-07-18 15:39:42 +04:00
Jan Starzynski
ee42b65063
corrected some spelling errors
2013-07-18 13:24:55 +02:00
Vladislav Vinogradov
7b87d72d80
refactored generalized hough (both CPU and GPU):
...
removed set/get methods from Algorithm (implement owns)
removed GHT_* enumeration
2013-07-18 15:17:33 +04:00
Roman Donchenko
7eddf887d5
Merge pull request #1147 from jet47:gpu-sanity-test-name
2013-07-18 14:29:47 +04:00
Andrey Pavlenko
6fbda0dfc1
Merge pull request #1138 from janstarzy:mat-dist
2013-07-18 14:23:12 +04:00
Andrey Pavlenko
4b234fa0a5
Merge pull request #1042 from jet47:gpuimgproc-refactoring
2013-07-18 14:22:44 +04:00
Vladislav Vinogradov
f87ef77269
removed GPU_/CPU_ prefix from gpu's sanity test
2013-07-18 13:41:27 +04:00
StevenPuttemans
5caa808879
Fixing bug #3131 adding breakpoints to featuretracker.cpp
2013-07-18 11:36:22 +02:00
peng xiao
e1f43e3b03
Add sort_by_key for oclMat.
...
Most codes are ported from AMD's Bolt library.
Four methods are implemented:
SORT_BITONIC, // only support power-of-2 buffer size
SORT_SELECTION, // cannot sort duplicate keys
SORT_MERGE,
SORT_RADIX // only support signed int/float keys
2013-07-18 17:25:00 +08:00
ozantonkal
3260404fdf
initial CameraPositionWidget implementation using eye, look_at, up_vector
2013-07-18 10:39:34 +02:00
Vladislav Vinogradov
ebe7ff991f
fixed compilation without CUBLAS and CUFFT
2013-07-18 12:04:33 +04:00
Bo Li
27a0ed0018
removed tab in five-point.cpp
2013-07-18 10:09:50 +08:00
Bo Li
9b5eca975b
fixed a bug for the mask of recoverPose function
2013-07-18 09:55:39 +08:00
Alexander Shishkov
a29ce401d5
minore changes in test on HDR fromat
2013-07-18 01:32:06 +04:00
Alexander Shishkov
245dc99248
added include precomp
2013-07-18 01:13:35 +04:00
Alexander Shishkov
707048f6e1
removed tonemap_algorithms due to wrapping problems
2013-07-18 00:55:39 +04:00
Alexander Shishkov
8ccca90dca
small changes
...
added including for precomp
2013-07-18 00:28:40 +04:00
Jan Starzynski
12c42ac145
fixed strings in n1_dims(): n1_dcols() -> n1_dims()
2013-07-17 18:41:54 +02:00
Roman Donchenko
8b29a6e44a
Merge pull request #1127 from SpecLad:np-1.7
2013-07-17 18:48:08 +04:00
Roman Donchenko
73b5cc358e
Merge pull request #1132 from apavlenko:master_ver_290
2013-07-17 17:51:56 +04:00
StevenPuttemans
c3dee28394
Fixed bug #3101 , problem on ellipse2poly function
2013-07-17 15:21:23 +02:00
Jan Starzynski
1ccfa62f4f
adding method dims() to core.Mat
2013-07-17 15:04:34 +02:00
StevenPuttemans
1fc89bb2e0
Added the solution mentioned in patch #3125
2013-07-17 13:20:25 +02:00
Roman Donchenko
5d8af49016
Merge pull request #1128 from SpecLad:ocl-tr1
2013-07-17 15:08:38 +04:00
Andrey Pavlenko
e04517af36
moving version to 2.9.0,
...
also adding NVidia copyright
2013-07-17 15:03:11 +04:00
ozantonkal
40e47e6f3f
Image widgets implementation, GridWidget: vtkExtractEdges instead of Wireframe
2013-07-17 11:35:14 +02:00
Roman Donchenko
4f68212e64
Merge pull request #1124 from SpecLad:matx-div
2013-07-17 13:32:26 +04:00
Roman Donchenko
8f2047ada4
Merge pull request #1093 from jet47:fix-gpu-stream-test
2013-07-17 13:18:25 +04:00
Roman Donchenko
b45d61d2ad
Merge pull request #1105 from kdrobnyh:Integral-Image-IPP
2013-07-17 13:10:24 +04:00
Roman Donchenko
2cd1c49623
Merge pull request #1126 from asmorkalov:winrt
2013-07-17 13:08:30 +04:00
Vladislav Vinogradov
39a25115e0
fixed compilation
2013-07-17 11:41:48 +04:00
Vladislav Vinogradov
59edad5a00
removed obsolete API
2013-07-17 11:40:01 +04:00
Vladislav Vinogradov
5da724001f
made dependecy from gpufilters optional
2013-07-17 11:40:00 +04:00
Vladislav Vinogradov
f614e35443
split hough sources
2013-07-17 11:40:00 +04:00
Vladislav Vinogradov
1d79e13133
removed dependecy from gpuarithm
2013-07-17 11:39:59 +04:00
Vladislav Vinogradov
9498f82085
updated documentation
2013-07-17 11:39:58 +04:00
Vladislav Vinogradov
62a5a70cd0
switched to Input/Output Array in bilateralFilter & blendLinear
2013-07-17 11:39:58 +04:00
Vladislav Vinogradov
de56163f97
refactored gpu::matchTemplate (converted it into Algorithm)
2013-07-17 11:39:57 +04:00
Vladislav Vinogradov
1fcc8074bd
switched to Input/Output Array in Mean Shift
2013-07-17 11:39:57 +04:00
Vladislav Vinogradov
70e6dc615a
refactored GoodFeaturesToTrackDetector
2013-07-17 11:39:56 +04:00
Vladislav Vinogradov
d7ff3ad0cf
refactored cornerHarris and cornerMinEigenVal
...
* converted it into Algorithm
2013-07-17 11:39:55 +04:00
Vladislav Vinogradov
ad4d6bed9d
refactored gpu::GeneralizedHough
2013-07-17 11:39:55 +04:00
Vladislav Vinogradov
4087a45e73
refactored HoughCircles (converted it into Algorithm)
2013-07-17 11:39:54 +04:00
Vladislav Vinogradov
1652540a1f
refactored HoughLines (converted it into Algorithm)
2013-07-17 11:39:54 +04:00
Vladislav Vinogradov
48fb8c4f8a
refactored gpu::Canny (converted it into Algorithm)
2013-07-17 11:39:53 +04:00
Vladislav Vinogradov
fc8476544c
switched to Input/Output Array in Histogram Processing
2013-07-17 11:39:52 +04:00
Vladislav Vinogradov
9eea9835ab
switched to Input/Output Array in Color Processing
2013-07-17 11:39:52 +04:00
Alexander Smorkalov
16cfc7a531
WindowsRT build warning fixes.
2013-07-17 00:18:46 -07:00
yao
f1060ac514
a little simplify to pyrlk kernel
2013-07-17 14:35:44 +08:00
kdrobnyh
487ded8b27
Add IPP erosion and dilation
2013-07-16 22:35:16 +04:00
Vladislav Vinogradov
4716f63444
fixed gpu performance tests:
...
used new CV_PERF_TEST_MAIN_WITH_IMPLS mechanism
2013-07-16 15:43:04 +04:00
Vadim Pisarevsky
be040ff513
revert patch from PR 1074, since it break capturing on MacOSX
2013-07-16 15:02:33 +04:00
Roman Donchenko
28a5c127ea
Made the Python bindings not use deprecated NumPy 1.7 API.
2013-07-16 14:33:15 +04:00
Roman Donchenko
523048f99f
Fixed a compilation error (get<N> not found).
2013-07-16 14:23:05 +04:00
Roman Donchenko
1160b04fb4
Fixed a build warning in softcascade.
2013-07-16 12:43:49 +04:00
Roman Donchenko
924fc070f0
Changed / for Matx to Matx::div, for symmetry with Matx::mul.
2013-07-16 12:25:26 +04:00
Roman Donchenko
3443fd85cd
Merge pull request #984 from albenoit:master
2013-07-16 11:57:52 +04:00
Roman Donchenko
feaa12a274
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp
modules/ocl/test/main.cpp
modules/superres/CMakeLists.txt
modules/superres/src/input_array_utility.cpp
modules/superres/src/input_array_utility.hpp
modules/superres/src/optical_flow.cpp
2013-07-16 11:52:41 +04:00
ozantonkal
769eba7535
cube wire_frame fix using vtkOutlineSource
2013-07-16 09:06:14 +02:00
ozantonkal
4b85c849ca
fix rgb and bgr incompatibility
2013-07-16 09:06:14 +02:00
ozantonkal
1bfd7ad17e
arrow widget thickness parameter
2013-07-16 09:06:14 +02:00
peng xiao
ff73557304
Fix compilation error on Mac
2013-07-16 08:48:09 +08:00
Daniel Angelov
694d9ff2eb
LSD enum now anonymous.
2013-07-15 23:28:19 +03:00
Anatoly Baksheev
dc348ff93d
removed Mesh::Ptr since mesh itself consists of shared points (cv::Mat)
2013-07-15 19:18:37 +04:00
Anatoly Baksheev
0e20473c97
minor mesh load fixes
2013-07-15 16:46:39 +04:00
Anatoly Baksheev
4c228c07f1
fixed copilation
2013-07-15 16:31:28 +04:00
ozantonkal
efbebe6236
Merge branch 'implementing_widgets' of https://github.com/ozantonkal/opencv into implementing_widgets
2013-07-15 12:04:24 +02:00
ozantonkal
25f98bc022
mesh widget casting
2013-07-15 12:02:53 +02:00
ozantonkal
b066d1982f
mesh widget implementation
2013-07-15 12:02:20 +02:00
peng xiao
e5c396bb24
Add ocl::gftt performance test.
2013-07-15 16:27:27 +08:00
alexandre benoit
12f65c61a8
updated doc wrt new bioinspired namespace convention
2013-07-15 09:58:16 +02:00
Roman Donchenko
52a9378257
Merge pull request #979 from jet47:gpuwarping-refactoring
2013-07-15 11:47:03 +04:00
Roman Donchenko
1590a1a538
Merge pull request #1068 from AoD314:webp2
2013-07-15 11:45:28 +04:00
Roman Donchenko
886c009da6
Merge pull request #1049 from pengx17:2.4_superres_ocl
2013-07-15 11:43:09 +04:00
yao
cdd9234fae
fix hog mismatch on cpu ocl
2013-07-15 15:13:09 +08:00
alexandre benoit
7fe78efda3
retina included in namespace bioinspired + followed suggestions made by Vadim
2013-07-14 19:28:37 +02:00
Daniel Angelov
d35601209e
Added define guard for ln10. Fixed some warnings.
2013-07-14 14:29:56 +03:00
Daniel Angelov
22c8010b2d
Added needed header, changed macro name.
2013-07-14 12:56:22 +03:00
Anatoly Baksheev
6ca1822f36
added comments with future work for VizImpl
...
added authors to license header
2013-07-13 20:42:49 +04:00
Anatoly Baksheev
d6e2b657f9
more refactoring
2013-07-13 19:42:49 +04:00
Anatoly Baksheev
512afe2a90
beatification of test_viz
2013-07-13 18:23:46 +04:00
Anatoly Baksheev
83cb28f169
temp_viz removed
2013-07-13 18:01:56 +04:00
Anatoly Baksheev
3e41f0647e
removed q subfolder
2013-07-13 17:45:46 +04:00
abidrahmank
61e50e2fda
python docs for non-local means denoising
2013-07-13 16:00:15 +05:30
andrey.morozov
e4e0862c2e
added support image with alpha channel
2013-07-13 14:09:37 +04:00
Daniel Angelov
3350533f48
Fixed ambiguouty error, signess compare.
2013-07-13 05:08:15 +03:00
Daniel Angelov
6bd5e12be3
Added a sample to show usage of the class.
2013-07-13 04:11:27 +03:00
Daniel Angelov
e51e00ac5f
Added LSD accuracy tests.
2013-07-13 04:09:28 +03:00
Anatoly Baksheev
f480eca668
removed Affine3f from coordinate frame constructor
2013-07-13 01:49:59 +04:00
Daniel Angelov
5350a2f1d9
Added Line Segmen Detector.
2013-07-13 00:21:02 +03:00
Anatoly Baksheev
328f0e32d8
added makeTransformToGlobal() function
2013-07-13 00:00:57 +04:00
Anatoly Baksheev
6045ae856b
reshape continuous clouds for better performance.
2013-07-12 23:59:19 +04:00
Anatoly Baksheev
ae2e3a1a93
viz license header template
2013-07-12 16:53:25 +04:00
Fedor Morozov
091b48de60
MTB alignment. Missing main file.
2013-07-12 16:08:06 +04:00
Fedor Morozov
35133df0de
MTB alignment. Code, tests, application
2013-07-12 16:03:53 +04:00
Roman Donchenko
616dbd53f0
Merge pull request #1107 from abidrahmank:master
2013-07-12 11:40:33 +04:00
Roman Donchenko
09ec483d02
Merge pull request #1109 from nikman-ru:cap_reuse_24x
2013-07-12 11:38:59 +04:00
Roman Donchenko
18f1964f8a
Merge pull request #1111 from nikman-ru:fix_yamldoc
2013-07-12 11:38:14 +04:00
hbristow
9cc949e341
Added more test cases
2013-07-12 17:31:25 +10:00
hbristow
5a34b00737
Added more test cases
2013-07-12 16:57:05 +10:00
hbristow
603d949354
Improved string handling. Swapped transpose interface for slow but correct implementation. Will come back to optimized implementation later. imshow now works correctly
2013-07-12 15:48:03 +10:00
Vladislav Vinogradov
d52ef2f758
added stub library for cudev module
...
in order to make CMake scripts work properly
2013-07-12 08:47:12 +04:00
Vladislav Vinogradov
5e3934446d
fixed test compilation for gpu::Stream
2013-07-12 08:45:55 +04:00
Vladislav Vinogradov
afb08b33c7
removed obsolete API from gpuarithm module
2013-07-12 08:40:30 +04:00
Vladislav Vinogradov
0d9e3cfa37
updated documentation
2013-07-12 08:12:48 +04:00
Vladislav Vinogradov
6d6ff26887
refactored gpu::ImagePyramid (converted it to abstract interface)
2013-07-12 08:12:48 +04:00
Vladislav Vinogradov
2932beddcf
switched to Input/Output Array in gpuwarping functions
2013-07-12 08:12:48 +04:00
hbristow
346f7d0f3e
Fast deep-copy-transpose implemented which attempts to not thrash the cache. Good first step for now, but no transpose at all would be preferrable. Started I/O.
2013-07-12 10:38:48 +10:00
Alex Leontiev
6db2596ca9
Convenience fixes
...
Attempting to fix issues pointed out by Vadim Pisarevsky during the pull
request review. In particular, the following things are done:
*) The mechanism of debug info printing is changed and made more
procedure-style than the previous macro-style
*) z in solveLP() is now returned as a column-vector
*) Func parameter of solveLP() is now allowed to be column-vector, in
which case it is understood to be the transpose of what we need
*) Func and Constr now can contain floats, not only doubles (in the
former case the conversion is done via convertTo())
*)different constructor to allocate space for z in solveLP() is used,
making the size of z more explicit (this is just a notation change, not
functional, both constructors are achieving the same goal)
*) (big) mat.hpp and iostream headers are moved to precomp-headers from
optim.hpp
2013-07-11 22:05:14 +03:00
Nikita Manovich
c55dc3e8ab
Fixed "FileStorage (minor) error in doc (Feature #3151 )"
...
It was just a typo in the documentation.
2013-07-11 16:06:25 +04:00
Alex Leontiev
e9b432b1d9
Fixing the warnings
...
Fixed all of the warnings.
2013-07-11 14:43:48 +03:00
Nikita Manovich
05aeb70831
Fixed VideoCapture::open() does not release previous capture sources (Bug #3150 ).
...
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
bool VideoCapture::open(const string& filename);
bool VideoCapture::open(int device);
The methods first call VideoCapture::release() to close the already opened file or camera.
2013-07-11 15:16:22 +04:00
Anatoly Baksheev
c6a8bd65a8
fixed some warnings for windows
...
minor buitification
2013-07-11 14:45:39 +04:00
Roman Donchenko
06742247be
Removed unused PACKAGE_* macros.
2013-07-11 14:30:46 +04:00
Roman Donchenko
6f326220d3
Removed the HAVE_LRINT macro, which is never set.
2013-07-11 14:30:46 +04:00
ozantonkal
acd63c1497
fix grid widget unused color
2013-07-11 11:52:59 +02:00
Alex Leontiev
6c9ae1100b
Fixed the warnings
...
Fixed the code so to eliminate warnings related to shadowing and unused
parameters. In some settings, these warnings may be treated as an errors
and lead to failed build.
Suggested by Nikita Manovich.
2013-07-11 12:29:55 +03:00
Roman Donchenko
e2ef2a5781
Refactored image format library finding logic.
...
Now the HAVE_* macros are set in cvconfig.h. Most of them already were there,
but were nonfunctional.
2013-07-11 12:40:16 +04:00
Andrey Pavlenko
75b86c9706
Merge pull request #1104 from nikman-ru:cap_reuse
2013-07-11 11:52:22 +04:00
Andrey Pavlenko
d1fe1a62c3
Merge pull request #1106 from pengx17:2.4_gftt_rename
2013-07-11 11:41:37 +04:00
Andrey Pavlenko
07c2ae508e
Merge pull request #1102 from SpecLad:xls-updates
2013-07-11 11:36:47 +04:00
ozantonkal
eef8195569
clean unnecessary methods, make text3d face camera
2013-07-11 09:30:52 +02:00
Alex Leontiev
fe6a7e935d
Fix qualifiers on aux functions for solveLP()
...
Change qualifiers on auxiliary functions (for solveLP() procedure) from
const (that does not have much sense) to static (that makes them
invisible for outside world and hopefully exacerbates optimization).
2013-07-11 09:52:13 +03:00
Alex Leontiev
ba537a95db
Preparation for pull request
...
Additional cleaning for simplex method, removing the parts that are
currently unused. Removing developer's notes. Trying to reach production
level.
2013-07-11 09:31:10 +03:00
Andrey Pavlenko
decd0c753a
Merge pull request #1082 from jet47:gpu-warnings-fix
2013-07-11 09:41:46 +04:00
abidrahmank
1923d87f61
PyDocs for common interface of feature2d
2013-07-11 09:33:32 +05:30
abidrahmank
f91f369788
PyDocs for FAST, ORB etc
2013-07-11 09:32:49 +05:30
abidrahmank
2047838106
feature2d drawing functions PyDocs
2013-07-11 09:31:25 +05:30
abidrahmank
031c77f4eb
SIFT+SURF PyDocs
2013-07-11 09:30:21 +05:30
abidrahmank
5d863f7516
drawMatches python bindings
2013-07-11 09:28:37 +05:30
kdrobnyh
df4b67a749
Merge pull request #1 from Itseez/2.4
...
Add calculating integral image using IPP
2013-07-10 10:45:24 -07:00
Alex Leontiev
a95650111f
Cleaning the code of simplex method
...
In particular, the following things are done:
*) Consistent tabulation of 4 spaces is ensured
*) New function dprintf() is introduced, so now printing of the debug
information can be turned on/off via the ALEX_DEBUG macro
*) Removed solveLP_aux namespace
*) All auxiliary functions are declared as static
*) The return codes of solveLP() are encapsulated in enum.
2013-07-10 20:11:52 +03:00
Roman Donchenko
ca8b621b4f
Refactored detecting several Apple-related technologies.
...
Now the HAVE_* macros are set using cvconfig.h. Previously most
of them already were there, but were always undefined. One,
HAVE_COCOA, I had to add.
This also makes the CMake code more consistent; now, WITH_* variables
are always checked in cmake/*, while HAVE_* variables are checked in
modules/highgui/CMakeLists.txt.
2013-07-10 19:45:56 +04:00
ozantonkal
5813a3a99d
text3D widget implementation
2013-07-10 16:34:47 +02:00
Roman Donchenko
241e2d2360
Merge pull request #1077 from bitwangyaoyao:2.4_kmeans
2013-07-10 18:32:14 +04:00
Roman Donchenko
4f9554eead
Removed a few more unused configuration macros.
...
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.
Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
2013-07-10 18:29:11 +04:00
Roman Donchenko
894b30b34d
Merge pull request #1088 from apacha:brisk_noDescriptors_fix
2013-07-10 18:18:31 +04:00
Roman Donchenko
f0c7cce87a
Merge pull request #1080 from hhofbaue:matchTemplate_bugfix
2013-07-10 18:17:06 +04:00
Nikita Manovich
21211308d0
Fixed VideoCapture::open() does not release previous capture sources (Bug #3150 ).
...
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
bool VideoCapture::open(const string& filename);
bool VideoCapture::open(int device);
The methods first call VideoCapture::release() to close the already opened file or camera.
2013-07-10 17:48:44 +04:00
ozantonkal
e185900270
grid widget implementation
2013-07-10 15:34:19 +02:00
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Andrey Pavlenko
2b2e02166e
setting version to 2.4.6.1 (hot-fix release for Linux camera support)
2013-07-10 15:12:39 +04:00
Roman Donchenko
ea3239a00e
xls-report.py: Added an option to show per-pixel times
2013-07-10 14:58:51 +04:00
Roman Donchenko
5b2dc26f2c
Made the crude ability less crude.
2013-07-10 14:58:51 +04:00
Roman Donchenko
215b3e749f
Added to the test log parser a crude ability to detect non-implemented tests.
2013-07-10 14:58:51 +04:00
Roman Donchenko
1080c4295a
xls-report.py: removed image size and type from the list of other parameters.
...
Also, shrunk the corresponding column and the test name column.
2013-07-10 14:58:18 +04:00
Roman Donchenko
63d151a29c
xls-report.py: add ability to specify arbitrary sheet properties
2013-07-10 14:58:17 +04:00
ozantonkal
71c76aecc9
PolyLine widget implementation
2013-07-10 12:51:17 +02:00
ozantonkal
d3dee3a2fe
explicit casting among widgets, removed implicit casting
2013-07-10 09:55:42 +02:00
kdrobnyh
f8eb806565
Add IPP support to integral function
2013-07-10 11:25:36 +04:00
peng xiao
5032240c9d
Fix ocl gftt file name typo.
2013-07-10 14:51:40 +08:00
Anatoly Baksheev
e4c3416f58
experimental widget casting functionality
2013-07-09 20:16:43 +04:00
Anatoly Baksheev
509a93c7ce
minor naming
2013-07-09 19:35:26 +04:00
ozantonkal
200b254bad
rearrange widget constructors
2013-07-09 15:18:44 +02:00
Roman Donchenko
2dedfd9762
Merge pull request #1099 from asmorkalov:linux_vcap_fix
2013-07-09 17:13:05 +04:00
ozantonkal
10d955f18b
widget2d setcolor implementation
2013-07-09 14:28:55 +02:00
ozantonkal
318b1c00a9
implement assignment operator and copy constructor for all widgets existing
2013-07-09 14:12:49 +02:00
Alexander Smorkalov
f77d1f57ee
V4L and V4L2 based Video capture bug fix (Bugfix #3144 ).
2013-07-09 16:07:55 +04:00
Andrey Pavlenko
fcb4c0e51c
fixing working with test data and a small fix for init code
...
- set init value for `numsdev` to prevent use of uninitialized value
- stop use of 'workdir' and files from samples
- forcing use of 'opencv_extra' instead
Note: set OPENCV_TEST_DATA_PATH to full path to 'opencv_extra/testdata' (gitolite@code.opencv.org:opencv_extra.git) before running the test!
2013-07-09 13:25:21 +04:00
ozantonkal
195d60f4f8
fix widget delete bug
2013-07-09 11:07:21 +02:00
ozantonkal
d324c03b6a
initial redesigning widgets
2013-07-09 10:22:12 +02:00
Andrew Senin
aa2ca3aa8f
Improve FPS on black and white Ximea cameras
2013-07-09 00:33:39 +04:00
ozantonkal
b50d777985
cloudwidget private implementation for duplicate code, add cv_assert(exists), fix bug point_step bug in CloudNormalsWidget
2013-07-08 21:48:19 +02:00
ozantonkal
cc08149d7c
remove redundant statements
2013-07-08 19:05:35 +02:00
ozantonkal
658e4c5e97
set/get/updateWidgetPose implemented, cloudNormals with color
2013-07-08 18:56:13 +02:00
ozantonkal
e76023be96
cloud normals widget implementation
2013-07-08 18:22:51 +02:00
Roman Donchenko
c05bfe9d6d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp
2013-07-08 18:47:38 +04:00
ozantonkal
6e5ae98582
initial cloud widget implementation, fix safedowncasts
2013-07-08 15:12:50 +02:00
ozantonkal
d394e233bb
cube widget wireframe
2013-07-08 11:34:11 +02:00
ozantonkal
653eda45f8
text widget implementation
2013-07-08 10:41:42 +02:00
ozantonkal
c4f4727ee5
showWidget takes Affine3f as argument
2013-07-08 10:53:00 +03:00
ozantonkal
eafcdc004d
plane widget size
2013-07-07 21:19:21 +03:00
ozantonkal
030400d50f
circle widget thickness property
2013-07-07 16:21:47 +03:00
andrey.morozov
8d0452ed59
added test to save image with webp with alpha channel
2013-07-06 17:26:22 +04:00
Fedor Morozov
0aee5b61e3
Exposure fusion. Code, tests.
2013-07-05 16:14:08 +04:00
Anatoly Baksheev
9d684a39da
Fixed ref counting bug, minor formatting
2013-07-05 14:35:12 +04:00
Roman Donchenko
f5089100b9
Merge pull request #1073 from asmorkalov:android_cvjavaframe
2013-07-05 13:41:51 +04:00
Roman Donchenko
de58039b46
Merge pull request #1081 from SpecLad:merge-2.4
2013-07-05 13:34:59 +04:00
Roman Donchenko
2f8be2a4b1
Merge pull request #1083 from jet47:cuda-device-layer
2013-07-05 13:30:11 +04:00
Roman Donchenko
c4e59866a2
Merge pull request #1074 from devernay:2.4-cap_qt-multithread
2013-07-05 13:28:38 +04:00
Roman Donchenko
36a4d246f4
Merge pull request #1087 from znah:2.4
2013-07-05 12:07:45 +04:00
Alexey Spizhevoy
dcb049df6a
fixed docs
2013-07-05 10:16:22 +04:00
Alexey Spizhevoy
2a48f7c035
fixed include for Windows
2013-07-05 09:44:32 +04:00
yao
88ed74a7ec
fix the function name
2013-07-05 08:59:21 +08:00
ozantonkal
7e2643abff
removed shape files
2013-07-04 19:05:56 +03:00
Roman Donchenko
2b44172026
xls-report.py: make behaviour more intelligent in case of repeated results
2013-07-04 20:01:27 +04:00
Roman Donchenko
0732905cff
xls-report.py: write tests in sorted order
2013-07-04 20:01:27 +04:00
Roman Donchenko
ea054e2888
xls-report.py: made most columns a little wider
2013-07-04 20:01:27 +04:00
Roman Donchenko
4e939e2fce
xls-report.py: added an option to include data from unrecognized XMLs
2013-07-04 20:00:59 +04:00
ozantonkal
4c3d1d583a
remove ModelCoefficients, remove showShape methods from viz3d
2013-07-04 18:47:52 +03:00
ozantonkal
5bb95c4110
remove widget implementation
2013-07-04 18:36:26 +03:00
ozantonkal
ecdd8513fd
coordinate system widget implementation, update pose fix
2013-07-04 18:19:06 +03:00
ozantonkal
03cc439b08
cube widget implementation
2013-07-04 17:59:11 +03:00
ozantonkal
f07486b563
cylinder widget implementation
2013-07-04 17:44:41 +03:00
alexandre benoit
188f889949
Merge branch 'master' of code.opencv.org:opencv
2013-07-04 16:19:24 +02:00
Roman Donchenko
83fd385bbd
xls-report.py: don't eat all errors when reading sheet.conf
2013-07-04 18:03:03 +04:00
ozantonkal
f97c3c8b06
circle widget and arrow widget implementation
2013-07-04 16:54:46 +03:00
Alexander Mordvintsev
3677a66403
line realign
2013-07-04 17:43:38 +04:00
Alexey Spizhevoy
406f342dc3
updated docs
2013-07-04 17:41:39 +04:00
ozantonkal
d80a965f97
sphere widget implementation
2013-07-04 16:32:06 +03:00
Alexey Spizhevoy
027065a5a1
removed trailing whitespaces causing warnings
2013-07-04 17:31:12 +04:00
Roman Donchenko
a2d576c1bb
Merge pull request #1085 from bitwangyaoyao:2.4_optBP
2013-07-04 17:24:21 +04:00
Alexey Spizhevoy
cc85e86ee7
fixed Windows build
2013-07-04 17:22:36 +04:00
ozantonkal
3d3e3fd470
plane widget implementation
2013-07-04 16:15:20 +03:00
Roman Donchenko
0daf4b800a
Fix bug: CommandLineParserParams's comparator would fail with equal arguments.
2013-07-04 17:09:29 +04:00
Roman Donchenko
4692d4b36e
Fix bug: cv::String would break if assigned to itself.
2013-07-04 17:06:00 +04:00
ozantonkal
ba89a6a34a
line widget set/get line width
2013-07-04 16:05:05 +03:00
ozantonkal
158ed299c1
reference counting in widget
2013-07-04 15:57:49 +03:00
Alexey Spizhevoy
438a599288
added 'cmath' include
2013-07-04 16:57:20 +04:00
Fedor Morozov
a5e11079d7
Fixes, missing files, tests
2013-07-04 16:51:39 +04:00
Anatoly Baksheev
141cfd562c
widget_accessor.hpp - minimize dependencies
2013-07-04 15:16:48 +04:00
Anatoly Baksheev
efa7f09048
slight refactoring of widget system code
2013-07-04 13:54:00 +04:00
Jin Ma
97e620b8f3
Fix oclMat constructor when roi is provided.
2013-07-04 16:14:55 +08:00
yao
f2333e90f6
optimize stereoBP kernel
2013-07-04 14:46:38 +08:00
hbristow
d126263983
implemented faster transpose with SEE auto vectorization
2013-07-03 23:34:02 -07:00
Alexander Pacha
eaa29110e1
Fixed issue 3130 ( http://code.opencv.org/issues/3130 ), where one argument of the BRISK-call was ignored. Previously it was not possible to use BRISK without creating descriptors.
...
Now it behaves like ORB (and how it is documented), and you can call BRISK to just generate feature points and no descriptors.
2013-07-04 16:36:29 +12:00
yao
c23510785b
remove the redundant function
2013-07-04 08:59:42 +08:00
