ee7c74ceeb
return when OpenCV is found
12 years ago
af7c614438
added RGB[A] -> HSV[FULL] conversion
12 years ago
411629a57d
Merge pull request #1786 from SpecLad:cap-images-file-pattern
12 years ago
54ea5bbac7
Merge pull request #1779 from perping:integral_2.4
12 years ago
28e0d3d771
Merge pull request #1784 from SpecLad:ffmpeg-no-png
12 years ago
9007a02302
fixes http://code.opencv.org/issues/3367
12 years ago
fb326a58fc
ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize
12 years ago
f1873bbca1
perf tests: allow to skip performance tests
12 years ago
6770c04073
refactored some functions from ocl arithm
12 years ago
c38e4f9639
added eps to ocl::buildWarpPerspectiveMaps perf test
12 years ago
376993be4c
Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn
12 years ago
df6bce372b
Merge pull request #1789 from ilya-lavrenov:ocl_minMaxLoc
12 years ago
a8e1d1f0b2
Merge pull request #1791 from prattmic:limit
12 years ago
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’
12 years ago
185059959b
fix haar
12 years ago
1e2fb6de30
fix match_template and haar
12 years ago
3314bc94b6
Reworked documentation building to work with extra modules.
...
The main problem with extra modules is that they're located outside
of the OpenCV root, while Sphinx requires that all documents are
within the documentation root. To circumvent this, we create a
"fake root" and copy all documentation (as well as all files that
it depends on) there. It's a bit messy, but what can you do.
As a bonus, this eliminates the need to generate modules/refman.rst
inside the source tree.
12 years ago
0bf7350615
fixed compilation of ocl::minMaxLoc for Intel device
12 years ago
f02ce90559
minX1 should be max(-maxD,0) not max(maxD,0), avoid black band at left
12 years ago
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.
12 years ago
96121a66c5
kernel warnings on AMD
12 years ago
a81efdbb25
Merge pull request #1775 from ilya-lavrenov:ocl_cvtColor
12 years ago
d6e0ef2710
fix linux warning.
12 years ago
dee584ee15
fix haar
12 years ago
834705490e
Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat
12 years ago
ef4eadd5d3
Merge pull request #1766 from ilya-lavrenov:ocl_remap_linear
12 years ago
46e423d217
Merge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps
12 years ago
6773914144
Merge pull request #1783 from SpecLad:cap-no-pattern
12 years ago
8af626d295
fix some bug about haar and match_template.
12 years ago
eda6360fa3
added RGB5x5 <-> Gray
12 years ago
93120775cd
Using four spaces for indentation.
12 years ago
f461930d07
Merge pull request #1781 from SpecLad:merge-2.4
12 years ago
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.
12 years ago
daedc6f454
removed 2000x2000, 4000x4000 from test sizes of ocl::adaptiveBilateralFilter
12 years ago
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.
12 years ago
3727168b50
added a performance test for ocl::buildWarpPerspectiveMaps; moved warps to a separate file
12 years ago
ccbd7f8da9
Added a citation which used to be in the gpu module in 2.4.
12 years ago
bfa40e180f
Removed another usage of __func__, following #1763 .
12 years ago
e4dee5b372
Merge pull request #1780 from ilya-lavrenov:ocl_m_pi
12 years ago
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
12 years ago
1f421fce01
added RGB5x5 <-> RGB conversion
12 years ago
469d7eed72
Merge pull request #1767 from prattmic:python3_asstring
12 years ago
05d9375759
Trailing whitespace removal.
12 years ago
73b34e3f85
fix warning.
12 years ago
50579d2524
Make Integral sum support cv_32f, sqsum support cv_64f.
12 years ago
5beb887247
replaced custom PI by OpenCL M_PI constant
12 years ago
3cc9502c90
added RGB[A] <-> BGR[A] conversion to ocl::cvtColor
12 years ago
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
12 years ago
581a3e444d
added XYZ to RGB conversion to ocl::cvtColor
12 years ago
5e02b20482
added RGB -> XYZ conversion to ocl::cvtColor
12 years ago
Vincent Rabaud
Ilya Lavrenov
Roman Donchenko
Alexander Alekhin
Michael Pratt
perping
huangs
Philippe FOUBERT