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
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
Andrey Pavlenko
9afe65e5c0
Merge pull request #1758 from apavlenko:adaptive_bilateral_filter
2013-11-06 18:09:49 +04:00
Roman Donchenko
bca63083a8
Merge pull request #1757 from asmorkalov:android_manager_version_inc2
2013-11-06 17:50:20 +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
Roman Donchenko
254aece317
Merge pull request #1753 from abidrahmank:py_tutorials
2013-11-06 15:40:55 +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 Smorkalov
24f369c4ac
Android Manager Version++.
2013-11-06 14:24:18 +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
Peng Xiao
7a2a810de5
Update retina_ocl.cpp
2013-11-06 17:00:27 +08:00
Roman Donchenko
8b19df3fec
Merge pull request #1748 from SpecLad:merge-2.4
2013-11-06 12:55:05 +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
abidrahmank
8bba305487
small correction in Py tutorials
2013-11-06 10:22:08 +05:30
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
Andrey Pavlenko
14b2eed17b
Merge pull request #1745 from alalek:ocl_fix_svm_with_blas
2013-11-05 23:48:42 +04:00
Alexander Alekhin
691d5f4187
ocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory guard
2013-11-05 19:43:07 +04:00
Roman Donchenko
f2241e3d26
Merge pull request #1749 from SpecLad:update-ignore
2013-11-05 19:41:29 +04:00
Ilya Lavrenov
e544e34eed
fixed ocl::copyMakeBorder accuracy test
2013-11-05 18:23:34 +04:00
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.
2013-11-05 16:44:09 +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
.
Conflicts:
modules/ocl/test/test_ml.cpp
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