c1cfb4d422
core: added cv::error with CV_NORETURN attr
2013-11-30 03:43:31 +04:00
09795e3265
added cv::resize INTER_AREA to T-API
2013-11-29 17:57:37 +04:00
d83094b412
Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor
2013-11-29 12:59:09 +04:00
9ca80961fd
Merge pull request #1874 from SpecLad:merge-2.4
2013-11-28 16:43:00 +04:00
41d046a2db
restored ocl_cvtcolor.cl
2013-11-27 23:46:30 +04:00
0b900b54e5
RGB[A] <-> HSV
2013-11-27 23:30:29 +04:00
96a228fd7e
Merge pull request #1866 from ilya-lavrenov:ocl_fix2
2013-11-26 23:27:49 +04:00
736097a462
Merge pull request #1868 from KonstantinMatskevich:umat_bugfix
2013-11-26 23:24:51 +04:00
920fd48228
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
modules/ocl/src/arithm.cpp
2013-11-26 15:32:44 +04:00
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
e7339ac11a
Merge pull request #1818 from GregoryMorse:patch-2
2013-11-26 13:00:56 +04:00
e20f7014cf
Merge pull request #1835 from SpecLad:windows-xadd
2013-11-26 11:43:34 +04:00
05e22ee8c9
Merge pull request #1859 from SpecLad:string-plus-equals
2013-11-26 11:40:37 +04:00
e4793e3d5e
Update system.cpp
...
Fixed to use native C++ instead of C++/CX although it does require significantly more code, it goes along with the spirit of keeping the project in native C++
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
2013-11-26 00:22:14 +08:00
145855767c
bugfix in deallocate
2013-11-25 17:16:22 +04:00
9d23a0cb81
fixed ocl_arithm_op; fix for 3-channel images is needed
2013-11-25 14:21:12 +04:00
52e810ed33
Merge pull request #1850 from ilya-lavrenov:pthread_mutex
2013-11-25 12:04:17 +04:00
fd4a7e7d1f
ocl: disable tests
2013-11-23 18:13:32 +04:00
b157cc17e9
Merge pull request #1857 from alalek:ocl_ta_tests_infra
2013-11-23 16:44:58 +04:00
1af95ea12c
fixed error in setting kernel arguments
2013-11-22 18:56:03 +04:00
881e837520
ocl/core: added prototype for tests
2013-11-22 18:37:44 +04:00
fc49d33c8d
Gave cv::String appropriate += operators.
...
Note that since String is a reference to an immutable string,
this doesn't actually change the string; it just replaces *this
with a reference to the concatenated string.
2013-11-22 17:58:40 +04:00
c8abb6124f
recursive mutex for linux
2013-11-22 17:30:32 +04:00
650f92f9cc
eliminated warning C4267
2013-11-21 18:27:07 +04:00
65b7e2018c
fixed kernel compilation
2013-11-21 14:22:24 +04:00
8d1a8df1a9
Merge pull request #1824 from vpisarev:ocl_experiments5
2013-11-20 19:14:40 +04:00
4cfbee70bd
Simplified the Windows implementation of CV_XADD.
...
_InterlockedExchangeAdd is a Visual Studio intrinsic that's available
for all architectures and in all VS versions that we care about. It's also
faster than the underscore-less function, since it's an intrinsic.
We also don't need to declare it ourselves.
It is, however, a Visual Studio-specific intrinsic, so I changed the
preprocessing condition accordingly.
Fixes <http://code.opencv.org/issues/3365 >.
2013-11-20 13:47:35 +04:00
ae8b2cbd68
fixed bug with cl_long size on Win32 (thanks to Aaron Kunze)
2013-11-19 20:51:31 -05:00
677c7f27cb
fixed failure in Tonemap test
2013-11-19 19:20:24 -05:00
56f791679b
Merge pull request #1825 from jet47:fix-opengl-mem-leak
2013-11-19 12:31:53 +04:00
66221a32b9
fixed memory leak in ogl::Texture2D
2013-11-19 10:12:22 +04:00
e2bbe7597b
fixed few compile errors and doc build errors
2013-11-18 13:48:04 -05:00
8762ee3f6f
removed unnecessary opencl kernels
2013-11-18 12:02:10 -05:00
d914f20a4c
updated patch to bring in the first functions with "transparent API"
2013-11-18 11:48:00 -05:00
8f6f9c3e58
compilation for VS2008
2013-11-16 20:14:01 +04:00
615d6c22d1
Switched OpenCV to a 3-component version number.
...
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
2013-11-15 19:41:53 +04:00
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
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
2df53d97c5
added ocl::repeat
2013-11-05 12:23:20 +04:00
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
2013-11-01 15:22:34 +04:00
485d36d3c0
changed InputArray's enumeration constant for UMat, since it may potentially conflict with existing OpenCL module. refactored Kernel's setArg API (now UMat is passed to a kernel as a structure, as Alexander A suggested). removed Kernel's cleanup callback from the external API; now each kernel keeps track of used matrices and they are dereferenced after it's complete.
2013-10-25 16:46:03 +04:00
6416c33020
fixed some bugs in OpenCL branch of UMat implementation; maybe now the tests will finally pass?! (please ;( )
2013-10-25 11:19:40 +04:00
5920bd4f2e
fixed whitespace errors
2013-10-24 23:18:05 +04:00
caa33b2242
added first very simple test for UMat<=>Mat conversion
2013-10-24 22:33:41 +04:00
b1aa4a4913
yet another attempt to fix test failures
2013-10-24 18:00:15 +04:00
a9065b7d0c
trying to fix failures in tests
2013-10-24 17:23:48 +04:00
303df78cca
removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now
2013-10-24 16:08:15 +04:00
5a34272150
fixed build on Windows
2013-10-23 00:17:18 +04:00
de521fc9fa
fixed some more compile bugs (including Python bindings)
2013-10-22 23:34:16 +04:00
d3076c5014
hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors
2013-10-22 17:41:28 +04:00
Alexander Alekhin