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
Roman Donchenko
370235c07b
Merge pull request #1711 from SpecLad:cap-broken-mat
11 years ago
Alexander Smorkalov
24f369c4ac
Android Manager Version++.
11 years ago
Alexander Alekhin
03646e7e01
ocl: workaround for subbuffer memory leaks
11 years ago
Roman Donchenko
b5777efee6
Merge pull request #1716 from ilya-lavrenov:resize_area_sse2_fix
11 years ago
Ilya Lavrenov
e9b54ab844
fixed cv::resize (area fast mode) - it writes outside of array boundary in SSE2 version
11 years ago
Andrey Pavlenko
43c9157220
Merge pull request #1750 from alalek:ocl_update_documentation
11 years ago
Andrey Pavlenko
a3fa7a243d
Merge pull request #1740 from ilya-lavrenov:ocl_corners
11 years ago
Andrey Pavlenko
95767676b7
Merge pull request #1739 from pengx17:2.4_ocl_overload_haar
11 years ago
Roman Donchenko
5c44afa427
Merge pull request #1743 from ilya-lavrenov:ocl_repeat
11 years ago
Peng Xiao
7a2a810de5
Update retina_ocl.cpp
11 years ago
Roman Donchenko
8b19df3fec
Merge pull request #1748 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
65389e41db
Revert commit 994e07db0
(PR #1715 ), because it's irrelevant for master.
...
Conflicts:
modules/java/generator/src/cpp/VideoCapture.cpp
11 years ago
abidrahmank
8bba305487
small correction in Py tutorials
11 years ago
peng xiao
53d1873776
Revert back test image.
11 years ago
Alexander Alekhin
3952a0df44
ocl: update comments in ocl.hpp
11 years ago
Alexander Alekhin
5a333bfff4
ocl: update documentation
11 years ago
Andrey Pavlenko
be37d99567
Merge pull request #1752 from alalek:ocl_memory_cleanup_workaround
11 years ago
Andrey Pavlenko
14c3560750
Merge pull request #1751 from ilya-lavrenov:ocl_copyMakeBorder_test_fix
11 years ago
Andrey Pavlenko
14b2eed17b
Merge pull request #1745 from alalek:ocl_fix_svm_with_blas
11 years ago
Alexander Alekhin
691d5f4187
ocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory guard
11 years ago
Roman Donchenko
f2241e3d26
Merge pull request #1749 from SpecLad:update-ignore
11 years ago
Ilya Lavrenov
e544e34eed
fixed ocl::copyMakeBorder accuracy test
11 years ago
Roman Donchenko
8f5eaca354
Remove the explicit setting of CMP0017, partially undoing #1720 .
...
In master, it's already set to NEW, since we declare the minimal CMake
version as 2.8.7, which is newer than the policy.
11 years ago
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
11 years ago
Alexander Alekhin
7704dbf866
ocl: svm: restore non BLAS version
11 years ago
Alexander Alekhin
9a63508f50
Revert "disable SVM when AMD BLAS is not available"
...
This reverts commit d63a38e9bf
.
Conflicts:
modules/ocl/test/test_ml.cpp
11 years ago
Vincent Rabaud
0b1df62215
add VERBATIM as advised by @SpecLad
11 years ago
Vincent Rabaud
3b0108e4c1
fix the crash as suggested by @SpecLad
11 years ago