mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,143 Commits 6 Branches 126 Tags 3 GiB
506c19616d
Commit Graph

11143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Donchenko
376993be4c Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn 2013-11-13 12:20:09 +04:00
Roman Donchenko
df6bce372b Merge pull request #1789 from ilya-lavrenov:ocl_minMaxLoc 2013-11-13 12:16:02 +04:00
Roman Donchenko
a8e1d1f0b2 Merge pull request #1791 from prattmic:limit 2013-11-13 12:15:18 +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
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
Roman Donchenko
6773914144 Merge pull request #1783 from SpecLad:cap-no-pattern 2013-11-12 11:52:50 +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
Roman Donchenko
f461930d07 Merge pull request #1781 from SpecLad:merge-2.4 2013-11-11 19:15:25 +04: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
Roman Donchenko
469d7eed72 Merge pull request #1767 from prattmic:python3_asstring 2013-11-11 14:01:07 +04: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
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
c970d4bf6e Merge pull request #1742 from pengx17:master_ocl_retina_sample 2013-11-08 17:17:20 +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
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
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