Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Roman Donchenko
de58039b46
Merge pull request #1081 from SpecLad:merge-2.4
2013-07-05 13:34:59 +04:00
Roman Donchenko
0daf4b800a
Fix bug: CommandLineParserParams's comparator would fail with equal arguments.
2013-07-04 17:09:29 +04:00
Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Andrey Pavlenko
89086bdb8d
Merge pull request #1046 from SpecLad:merge-2.4
2013-07-02 15:39:07 +04:00
Roman Donchenko
f36f8067bc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/cuda/limits.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/matrix.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/hog.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_pyrup.cpp
modules/ts/src/precomp.hpp
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/surf_matcher.cpp
2013-06-25 15:55:52 +04:00
Roman Donchenko
f8e187e1e1
Merge pull request #1035 from SpecLad:cv-concurrency
2013-06-25 11:33:16 +04:00
Roman Donchenko
c16316c4b4
Replaced the semi-public CV_PARALLEL_FRAMEWORK macro with a function.
...
That way, core/internal.hpp doesn't have to depend on cvconfig.h, which we
don't ship.
2013-06-24 12:57:14 +04:00
Vladislav Vinogradov
98bd401534
fix gpu::DeviceInfo compilation under linux
...
glibc defines major and minor macros
which conflict with gpu::DeviceInfo methods with the same name
2013-06-24 10:11:44 +04:00
Roman Donchenko
b20c9ad2d1
Merge pull request #1015 from SpecLad:merge-2.4
2013-06-21 17:38:04 +04:00
peng xiao
290c8db0a8
Revise naming for getOclMat function.
2013-06-21 14:51:23 +08:00
peng xiao
e129638263
Add a workaround to interpolate between oclMat and Input/OutputArray.
2013-06-21 14:05:29 +08:00
Vladislav Vinogradov
50166d2734
fixed compilation with CUDA 4.2
2013-06-19 15:29:20 +04:00
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Roman Donchenko
24d84a45b1
Made tests record in the XML output which parallel framework was used.
2013-06-18 18:26:53 +04:00
Vladislav Vinogradov
a4750f49c6
fix for bug #3068 (PCA::computeVar for double input):
...
The matrix g can have CV_32F or CV_64F type, but g.at uses only float template.
This fix adds specialization for double type.
2013-06-14 12:53:44 +04:00
Vladislav Vinogradov
439c3574ed
renamed gpu_private.hpp to private.gpu.hpp
2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
0489489322
used cudaMalloc for 1-row or 1-column matrix instead of cudaMallocPitch
2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
1db4afac6a
made createContinuous & ensureSizeIsEnough generic (OutputArray support)
2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
f17b836d24
added Event class (wrapper for cudaEvent)
2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
2dab93c2e8
refactored gpu info structures (TargetArchs and DeviceInfo)
...
now DeviceInfo provides full information about device (from cudaDeviceProp)
2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
76f4b02b06
refactored gpu::Stream (minor fixes)
2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
a52af84dcf
refactored CudaMem (now alloc type assign only in constructor)
2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
cc34a8ac3c
new implementation for GpuMat::setTo (without constant memory)
2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
69be49bac1
refactored GpuMat:
...
* switch to InputArray/OutputArray
* add Stream support
2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
db1178b5df
moved GpuMat implementation to separate file
2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
6994a02c15
added Stream support to ogl::Buffer
2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
4c9773d55f
renamed gpu headers (made it more consistent)
2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
6c253a41c2
added CudaMem support to Input/Output arrays
2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
2fae1d9507
removed ogl::Texture2D support from InputArray
2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
bf7c1c6c25
fixed NPP error constants usage
2013-06-07 16:32:43 +04:00
Vladislav Vinogradov
3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
2013-06-07 13:05:39 +04:00
Roman Donchenko
029fce10c9
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
Bo Li
81779d8287
fixed pca bug for fixed mean input
2013-05-09 15:20:00 +08:00
Andrey Kamaev
416fb50594
Revert "Merge pull request #836 from jet47:gpu-modules"
...
This reverts commit fba72cb60d02131ffb62
2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
43d5e2d8b4
removed gpu BORDER_* constants
2013-04-18 11:33:34 +04:00
Andrey Kamaev
e27f4da9c6
Merge pull request #795 from taka-no-me:move_imgproc_utils_to_core
2013-04-11 11:35:15 +04:00
Roman Donchenko
484607fb6f
Backported RNG_MT19937 from master.
2013-04-10 19:39:38 +04:00
Roman Donchenko
f64d512774
Backported globbing from master.
2013-04-10 19:36:39 +04:00
Andrey Kamaev
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
Andrey Kamaev
b0e6606b98
Cleanup core module API
...
* Drop some low level API
* Remove outdated overloads
* Utilize Input/OutputArray
2013-04-09 13:36:32 +04:00
Vladislav Vinogradov
f50aabf012
fixed bug #2938
2013-04-09 10:14:25 +04:00
Vladislav Vinogradov
b50090f850
restore cudaSafeCall
2013-04-08 17:25:16 +04:00
Vladislav Vinogradov
910ef57109
renamed cuda namespace to cudev
2013-04-08 17:25:15 +04:00
Vladislav Vinogradov
193e857392
removed cu_safe_call.h and cu_safe_call.cpp
2013-04-08 17:25:15 +04:00
Vladislav Vinogradov
204a19b431
moved common gpu utility functionality to gpu_private.hpp
2013-04-08 17:25:15 +04:00
Vladislav Vinogradov
28b1e81883
renamed device -> cuda
2013-04-08 17:25:15 +04:00
Vladislav Vinogradov
a57707b8d8
moved device layer to core module
2013-04-08 17:25:15 +04:00
Vladislav Vinogradov
bf6c08a9ea
fixed compilation with CUDA
2013-04-08 13:29:04 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Andrey Kamaev
235a678458
SVD: always update W vector for better algorithm convergency
2013-04-04 13:55:36 +04:00
Andrey Kamaev
795a513ac4
Merge pull request #716 from asmorkalov:winrt
2013-04-03 15:39:58 +04:00
Andrey Kamaev
940eedfb27
Finalize core headers reorganization
2013-04-03 14:10:03 +04:00
Andrey Kamaev
c979de1eed
Rewrite Mat formatting without std streams
2013-04-03 11:55:19 +04:00
Andrey Kamaev
7193a73ca0
Move FileStorage to separate header
2013-04-01 19:18:05 +04:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Andrey Kamaev
d62bc8cfbf
Remove more old definitions from internal.hpp
2013-04-01 16:32:08 +04:00
Andrey Kamaev
3890a74565
Drop outdated definitions from internal.hpp
...
This also fixes few clang build errors
2013-04-01 15:24:35 +04:00
Andrey Kamaev
605382562d
Fix stack corruption in cvConvexHull2 and heap corruption in OutputArray::create
2013-04-01 15:24:35 +04:00
Andrey Kamaev
b28f594917
Drop fast_abs
2013-04-01 15:24:35 +04:00
Andrey Kamaev
c886afb502
Finalize cv::Mat transition
2013-04-01 15:24:34 +04:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
Andrey Kamaev
969a7133a9
Implementation of cv::Matx and cv::Vec is almost moved to matx.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
5e7ab8baf3
Move cv::Scalar_ to types.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
62adc01980
Move cv::Rect_
2013-04-01 15:24:33 +04:00
Andrey Kamaev
addf0309ec
Move cv::Size_
2013-04-01 15:24:32 +04:00
Andrey Kamaev
6bf49d49e7
Drop CvModule and cvSetMemoryManager
2013-04-01 15:24:32 +04:00
Andrey Kamaev
db45e04d58
Merge pull request #720 from taka-no-me:drop_sort
2013-04-01 15:14:45 +04:00
Andrey Kamaev
aebffb712a
Merge pull request #726 from jet47:fix-pvs-studio-warnings
2013-04-01 15:11:02 +04:00
Vladislav Vinogradov
ce2284e2e6
removed duplication
2013-04-01 11:29:13 +04:00
Vladislav Vinogradov
b28677bd90
fixed misprint in MatOp::augAssignXor
2013-04-01 11:16:47 +04:00
Andrey Kamaev
ea5225ef3e
Fix typo leading to heap corruption in OutputArray::create
2013-03-31 13:40:09 +04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Andrey Kamaev
f4b98e9628
Merge pull request #719 from jet47:gpu-fix-build
2013-03-29 18:23:05 +04:00
Andrey Kamaev
cc6bdfb045
Remove inline sorting algorithms from core headers
2013-03-28 17:22:50 +04:00
Vladislav Vinogradov
15f09f8068
fixed gpu module compilation
2013-03-28 11:48:43 +04:00
Alexander Smorkalov
6f68640d4d
Multiple fixes for WinRT
...
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
2013-03-26 17:19:52 -07:00
Andrey Kamaev
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
2013-03-26 16:08:43 +04:00
Andrey Kamaev
8eff34ee0b
Merge pull request #709 from taka-no-me:cv_format
2013-03-26 14:36:47 +04:00
Andrey Kamaev
2107ea9773
More accurate implementation of cv::format
2013-03-26 11:54:04 +04:00
Andrey Kamaev
5fd58a0103
Fix std::string to cv::String migration problems in gpumat.cpp
2013-03-26 11:24:54 +04:00
Andrey Kamaev
deb7f4d474
Fix globbing failure when stat call fails
2013-03-25 17:38:50 +04:00
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
Andrey Kamaev
75513a46dc
Remove all include directives for <string>
2013-03-22 22:14:47 +04:00
Andrey Kamaev
3088808926
Fix build of various backends
2013-03-22 22:14:40 +04:00
Andrey Kamaev
762aefd71b
Compile opencv_test_core with cv::String instead of std::string
...
All tests passed!
2013-03-22 22:14:22 +04:00
Andrey Kamaev
14bb4cbe1e
Add cv::String class
2013-03-22 22:14:18 +04:00
Vladislav Vinogradov
f0b19d4659
updated license header in whole gpu module
2013-03-22 14:03:15 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Andrey Kamaev
2d764fe1c6
Merge pull request #665 from taka-no-me:core_utility
2013-03-21 14:47:49 +04:00
Jonathan Bohren
a7a0f92e58
Fixing segfault for near-zero-sized ellipses
2013-03-20 16:51:48 -04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Vadim Pisarevsky
9a86245242
added test for bug #1448 and hopefully fixes the bug #2898
2013-03-20 11:58:19 +04:00
marina.kolpakova
92ba74a3ee
fix cuda
2013-03-17 05:50:45 +04:00
marina.kolpakova
157a98edf7
refactored cuda error handling; remove optional dependancies in soft cascade training app
2013-03-14 23:43:03 +04:00
marina.kolpakova
3c8e66d580
softcascade: remove device dependency on gpu
2013-03-14 12:28:01 +04:00
marina.kolpakova
6daf17f974
remove softcascade host dependencies on gpu module
2013-03-14 12:28:01 +04:00
Andrey Kamaev
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
Andrey Kamaev
b076b69e68
Merge pull request #642 from taka-no-me:fix1
2013-03-14 11:42:05 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
55698548dd
Avoid assert in lapac.cpp if findHomography fails in BestOf2NearestMatcher::match
2013-03-12 22:49:40 +04:00
Andrey Kamaev
013fd9bf59
Make CV_XADD independent on STL and system headers
2013-03-12 20:32:41 +04:00
Andrey Kamaev
9f3ce0dd97
Reword and merge pull request #625 from jet47/gpu-fixes
2013-03-12 18:14:23 +04:00
Vladislav Vinogradov
ecb2ebfba4
Move opengl iterop code to cv::ogl namespace
...
Fixed issues: #2737 #2848
2013-03-12 18:13:11 +04:00
cuda-geek
e4f55a7ec0
Merge pull request #629 from cuda-geek:globbing
2013-03-12 15:57:56 +04:00
cuda_geek
61094d350b
add dlobbing for Windows
2013-03-09 23:21:17 +04:00
marina.kolpakova
a486aafe7c
add dlobbing under *nix
2013-03-09 21:10:45 +04:00
marina.kolpakova
12fe6ff734
add Mersenne Twister random number generator
2013-03-09 19:18:37 +04:00
Artanis
993522598b
Add implementations for Mat::zeros() and Mat::ones()
...
In class Mat, "static MatExpr Mat::zeros(int ndims, const int* sz, int
type)" and "static MatExpr Mat::ones(int ndims, const int* sz, int
type)" are declared but never implemented. That means we can see their
manuals from
"http://docs.opencv.org/modules/core/doc/basic_structures.html " but we
can't use them. Here I tried to finish their implementation.
I have also changed MatOp_Initializer::assign to make it support
multi-dimension Mat.
Test cases are added in test_math.cpp as well.
2013-03-01 13:18:44 +08:00
Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
Andrey Kamaev
ab221e94c0
Fix invert under MSVC
2013-02-26 11:16:57 +04:00
Andrey Kamaev
0d12f451be
Merge pull request #524 from LeonidBeynenson:add_float_and_unsigned_parameters_to_cv_algorithm
2013-02-26 01:00:55 +04:00
Vadim Pisarevsky
416432a8e5
replaced tabs with spaces
2013-02-25 23:10:38 +04:00
Vadim Pisarevsky
087537463d
attempt to make the ultimate fix for the failure in Core_Invert.small
2013-02-25 22:46:30 +04:00
LeonidBeynenson
41dc829341
Made changes to avoid warnings (Windows compilation).
2013-02-25 15:38:59 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
marina.kolpakova
ef6c236655
restore missed gpu functionality after merge #dddd285d
2013-02-24 22:14:57 +04:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
LeonidBeynenson
bfb644ac04
Changed error message in Algorithm::get.
2013-02-21 20:10:42 +04:00
LeonidBeynenson
e7b214b6d2
Removed urequired functions
2013-02-21 19:49:37 +04:00
Vladislav Vinogradov
8b1f88c40f
updated gpu module API
2013-02-21 16:12:33 +04:00
Andrey Kamaev
afa993316f
Merge pull request #502 from jet47:opengl-updates
2013-02-21 15:12:43 +04:00
Vladislav Vinogradov
a938534a7e
restored binary compatibility
2013-02-21 12:18:08 +04:00
Vladislav Vinogradov
ce2559b332
optimized DeviceInfo class and ensureSizeIsEnough
2013-02-20 19:30:57 +04:00
Andrey Kamaev
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04:00
Vladislav Vinogradov
e06c3ec7c5
updated OpenGL functionality:
...
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
Vadim Pisarevsky
a1c7e0368c
fixed problem reported by Thouis (Ray) Jones
2013-02-18 17:01:21 +04:00
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Andrey Kamaev
4cc3dfe27c
Merge pull request #482 from vpisarev:c2cpp_imgproc_part2
2013-02-14 20:13:45 +04:00
Daniil Osokin
6deda2531c
Fixed getNumThreads() for C=
2013-02-14 17:07:36 +04:00
Vadim Pisarevsky
78402bf596
made several minor fixes as pointed out by Andrey
2013-02-14 15:36:20 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Bo Li
92e7e7d8e8
fix issue 2788
2013-02-11 15:09:42 +01:00
Andrey Kamaev
afe85e7e51
Fix some warnings from -O0 build
2013-02-06 20:57:36 +04:00
LeonidBeynenson
b85a098d9c
Added float, uint64, and uchar params to Algorithm
...
Made changes to work in cv::Algorithm with parameters of these types.
Also fixed SimpleBlobDetector -- now it can be created by
cv::Algorithm::create and it can work with cv::Algorithm::set/get.
2013-02-04 20:25:18 +04:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Vadim Pisarevsky
51eba617a8
a part of PR269 (parallelization of several functions) by Alexander Mordvintsev
2013-02-01 14:01:44 +04:00
Vadim Pisarevsky
54e0765d80
yet another minor fix in cv::transpose()
2013-01-31 20:26:16 +04:00
Vadim Pisarevsky
7ca38d63d9
fixed failure of the C++ test for estimateAffine3D
2013-01-31 19:44:16 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
98fdd70466
Merge pull request #339 from vpisarev:core_fixes
2013-01-29 15:51:22 +04:00
Andrey Kamaev
78a338159d
Merge branch '2.4'
2013-01-29 14:17:13 +04:00
cuda-geek
04f01ed21d
Merge pull request #353 from asmaloney:arg_checks
2013-01-29 11:04:33 +04:00
Andy Maloney
7a6475c3f9
Check pointers before using them in var init
2013-01-28 16:51:28 -05:00
Vadim Pisarevsky
1df10553bb
fixed bugs #1373 , #2629 , #2719
2013-01-25 23:45:41 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Vladislav Vinogradov
281d036fcf
optimizations:
...
- new reduce implementation (with kepler optimizations)
- saturate_cast via asm command
- video SIMD instructions in element operations
- float arithmetics instead of double
- new deviceSupports function
2013-01-23 21:05:07 +04:00
Vladislav Vinogradov
ae6266e101
fixes for gpu module:
...
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
