Roman Donchenko
f461930d07
Merge pull request #1781 from SpecLad:merge-2.4
11 years ago
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.
11 years ago
Ilya Lavrenov
daedc6f454
removed 2000x2000, 4000x4000 from test sizes of ocl::adaptiveBilateralFilter
11 years ago
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.
11 years ago
Ilya Lavrenov
3727168b50
added a performance test for ocl::buildWarpPerspectiveMaps; moved warps to a separate file
11 years ago
Roman Donchenko
ccbd7f8da9
Added a citation which used to be in the gpu module in 2.4.
11 years ago
Roman Donchenko
bfa40e180f
Removed another usage of __func__, following #1763 .
11 years ago
Roman Donchenko
e4dee5b372
Merge pull request #1780 from ilya-lavrenov:ocl_m_pi
11 years ago
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
11 years ago
Ilya Lavrenov
1f421fce01
added RGB5x5 <-> RGB conversion
11 years ago
Roman Donchenko
469d7eed72
Merge pull request #1767 from prattmic:python3_asstring
11 years ago
Philippe FOUBERT
05d9375759
Trailing whitespace removal.
11 years ago
perping
73b34e3f85
fix warning.
11 years ago
perping
50579d2524
Make Integral sum support cv_32f, sqsum support cv_64f.
11 years ago
Ilya Lavrenov
5beb887247
replaced custom PI by OpenCL M_PI constant
11 years ago
Ilya Lavrenov
3cc9502c90
added RGB[A] <-> BGR[A] conversion to ocl::cvtColor
11 years ago
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
11 years ago
Ilya Lavrenov
581a3e444d
added XYZ to RGB conversion to ocl::cvtColor
11 years ago
Ilya Lavrenov
5e02b20482
added RGB -> XYZ conversion to ocl::cvtColor
11 years ago
Ilya Lavrenov
33ae64201c
color.cpp refactoring: created generic interface for toRGB and fromRGB callers
11 years ago
Ilya Lavrenov
a57030a0cd
added YCrCb to RGB, BGR, RGBA, BGRA modes to ocl::cvtColor
11 years ago
Ilya Lavrenov
eba6754b06
fixed ocl::cvtColor for CV_YUV2BGRA and CV_YUV2RGBA
11 years ago
Ilya Lavrenov
8b57893e40
added an accuracy test for ocl::buildWarpPerspectiveMaps
11 years ago
Ilya Lavrenov
4248f82211
added ROI support to ocl::buildWarp*Maps functions
11 years ago
Roman Donchenko
c970d4bf6e
Merge pull request #1742 from pengx17:master_ocl_retina_sample
11 years ago
Roman Donchenko
0ac61240c5
Merge pull request #1771 from kiranpradeep:2.4
11 years ago
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'
11 years ago
Roman Donchenko
800d53f76b
Merge pull request #1759 from ilya-lavrenov:ocl_distanceToCenters
11 years ago
Roman Donchenko
0be2752366
Merge pull request #1755 from KonstantinMatskevich:dump_info
11 years ago
Roman Donchenko
0fb629915f
Merge pull request #1763 from SpecLad:cv-func
11 years ago
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].
11 years ago
Baichuan Su
9a0d06247a
Fix the whitespace warning.
11 years ago
Ilya Lavrenov
760b718981
added CV_16SC2 && CV_16UC1 map types support to ocl::remap (INTER_LINEAR mode)
11 years ago
Baichuan Su
99a00d3dd9
Fix merge conflicts
11 years ago
Baichuan Su
befcbf56fe
A minor fix.
11 years ago
Baichuan Su
f0de1a08b8
Fix ocl::calcHarris not support CV_32FC1 bug.
11 years ago
Roman Donchenko
07db81a4bb
Merge pull request #1760 from ilya-lavrenov:ocl_remap_nn
11 years ago
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.
11 years ago
Konstantin Matskevich
e9edfd1c54
update
11 years ago
Roman Donchenko
641bb7ac6b
Merge pull request #1737 from vrabaud:2.4
11 years ago
Bo Hu
c88fa27b1d
Removed trailing whitespace in cap_qtkit.mm.
11 years ago
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().
11 years ago
Ilya Lavrenov
fa15769f39
added CV_16SC2 && CV_16UC1 maps support to ocl::remap (nearest neighbour only)
11 years ago
Ilya Lavrenov
56d943388d
speeded up ocl::distanceToCenters
11 years ago
Andrey Pavlenko
296f76a135
Merge pull request #1756 from alalek:ocl_workaround_memory_leaks_with_subbuffer
11 years ago
Andrey Pavlenko
9afe65e5c0
Merge pull request #1758 from apavlenko:adaptive_bilateral_filter
11 years ago
Roman Donchenko
bca63083a8
Merge pull request #1757 from asmorkalov:android_manager_version_inc2
11 years ago
Harris Gasparakis
a1de91a4fd
Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs
11 years ago
Roman Donchenko
254aece317
Merge pull request #1753 from abidrahmank:py_tutorials
11 years ago
Konstantin Matskevich
5304e9f259
extending openCL info dump
11 years ago