Andrey Pavlenko [Mon, 24 Feb 2014 12:56:40 +0000 (16:56 +0400)]
Merge pull request #2402 from ilya-lavrenov:amd_libs
Andrey Pavlenko [Mon, 24 Feb 2014 12:54:44 +0000 (16:54 +0400)]
Merge pull request #2388 from alalek:coverity_bug_fix
Andrey Pavlenko [Mon, 24 Feb 2014 12:22:28 +0000 (16:22 +0400)]
Merge pull request #2401 from akarsakov:fix_elem_size
Andrey Pavlenko [Mon, 24 Feb 2014 12:21:41 +0000 (16:21 +0400)]
Merge pull request #2394 from ilya-lavrenov:tapi_memop_fix
Ilya Lavrenov [Mon, 24 Feb 2014 11:12:42 +0000 (15:12 +0400)]
dump AMD Blas/Fft
Alexander Karsakov [Mon, 24 Feb 2014 11:10:00 +0000 (15:10 +0400)]
Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale.
Ilya Lavrenov [Sun, 23 Feb 2014 11:12:38 +0000 (15:12 +0400)]
int2 -> ulong; to work properly with 3 channels
Roman Donchenko [Fri, 21 Feb 2014 15:11:57 +0000 (19:11 +0400)]
Merge pull request #2266 from vpisarev:ipp_norm_fix
Vadim Pisarevsky [Fri, 21 Feb 2014 14:07:01 +0000 (18:07 +0400)]
fixed hint type declaration
Alexander Alekhin [Fri, 21 Feb 2014 10:04:01 +0000 (14:04 +0400)]
TAPI: coverity bug fix
Andrey Pavlenko [Thu, 20 Feb 2014 17:41:43 +0000 (21:41 +0400)]
Merge pull request #2375 from akarsakov:fix_getGradient
Andrey Pavlenko [Thu, 20 Feb 2014 17:40:27 +0000 (21:40 +0400)]
Merge pull request #2377 from alalek:tapi_warpers_perf_test
Andrey Pavlenko [Thu, 20 Feb 2014 17:36:30 +0000 (21:36 +0400)]
Merge pull request #2383 from ilya-lavrenov:perf_match_template
Ilya Lavrenov [Thu, 20 Feb 2014 14:11:56 +0000 (18:11 +0400)]
ported 2.4 perf tests for matchTemplate
Alexander Karsakov [Wed, 19 Feb 2014 12:32:17 +0000 (16:32 +0400)]
Fixed typo with indexes in getGradient(x/y) functions.
Roman Donchenko [Thu, 20 Feb 2014 09:43:22 +0000 (13:43 +0400)]
Merge pull request #2376 from GrinIara:master
Roman Donchenko [Thu, 20 Feb 2014 09:39:54 +0000 (13:39 +0400)]
Merge pull request #2325 from alalek:perf_fix
Alexander Alekhin [Wed, 12 Feb 2014 14:12:22 +0000 (18:12 +0400)]
some fixes in perf tests
Alexander Alekhin [Wed, 19 Feb 2014 16:30:27 +0000 (20:30 +0400)]
TAPI: fix perf test for warpers
GrinIara [Wed, 19 Feb 2014 16:06:33 +0000 (17:06 +0100)]
Fixed compilation error due to missing std::.
Alexander Alekhin [Wed, 19 Feb 2014 10:00:39 +0000 (14:00 +0400)]
TAPI: fix OpenCL warpers and test
Roman Donchenko [Wed, 19 Feb 2014 10:48:56 +0000 (14:48 +0400)]
Merge pull request #2144 from nickdademo:pvapi_framestarttriggermode
Roman Donchenko [Wed, 19 Feb 2014 10:33:57 +0000 (14:33 +0400)]
Merge pull request #2291 from xgvargas:extra-note-for-waitKey
Roman Donchenko [Tue, 18 Feb 2014 11:49:18 +0000 (15:49 +0400)]
Merge pull request #2098 from pxli168:patch-1
Roman Donchenko [Tue, 18 Feb 2014 09:36:33 +0000 (13:36 +0400)]
Merge pull request #2355 from alekcac:hough_circles_fix
Andrey Pavlenko [Tue, 18 Feb 2014 09:27:38 +0000 (13:27 +0400)]
Merge pull request #2341 from alalek:ocl_fix_error_processing
Andrey Pavlenko [Tue, 18 Feb 2014 09:24:40 +0000 (13:24 +0400)]
Merge pull request #2352 from ilya-lavrenov:flann
Roman Donchenko [Tue, 18 Feb 2014 08:57:25 +0000 (12:57 +0400)]
Merge pull request #2347 from Chechli:master
Roman Donchenko [Tue, 18 Feb 2014 08:15:48 +0000 (12:15 +0400)]
Merge pull request #2367 from jet47:fix-3544
Roman Donchenko [Tue, 18 Feb 2014 08:14:57 +0000 (12:14 +0400)]
Merge pull request #2356 from SpecLad:merge-2.4
Chechli [Tue, 18 Feb 2014 07:50:33 +0000 (08:50 +0100)]
Update hough_circles.cpp
Vladislav Vinogradov [Tue, 18 Feb 2014 06:45:47 +0000 (10:45 +0400)]
fix bug #3544:
add "opencv2/core/utility.hpp" header to precomp.hpp
Gustavo Vargas [Tue, 18 Feb 2014 02:22:18 +0000 (23:22 -0300)]
Update py_image_display.rst
pxli168 [Tue, 18 Feb 2014 02:13:30 +0000 (10:13 +0800)]
Change again.
Opps.
Ilya Lavrenov [Sun, 16 Feb 2014 23:00:20 +0000 (03:00 +0400)]
some more changes
Andrey Pavlenko [Mon, 17 Feb 2014 13:53:05 +0000 (17:53 +0400)]
Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup
Andrey Pavlenko [Mon, 17 Feb 2014 13:38:26 +0000 (17:38 +0400)]
Merge pull request #2345 from ilya-lavrenov:tapi_3cn_perf
Andrey Pavlenko [Mon, 17 Feb 2014 13:34:19 +0000 (17:34 +0400)]
Merge pull request #2334 from alalek:umat_usage_flags_2
Andrey Pavlenko [Mon, 17 Feb 2014 12:45:40 +0000 (16:45 +0400)]
Merge pull request #2340 from ilya-lavrenov:tapi_lab
Roman Donchenko [Mon, 17 Feb 2014 11:24:05 +0000 (15:24 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
Roman Donchenko [Mon, 17 Feb 2014 11:00:42 +0000 (15:00 +0400)]
Merge pull request #2354 from gleb-sternharz:Branch_2.4.8
Alexander Shishkov [Mon, 17 Feb 2014 08:55:19 +0000 (12:55 +0400)]
small changes in hough circles tutorial
Chechli [Mon, 17 Feb 2014 08:50:32 +0000 (09:50 +0100)]
Update hough_circles.cpp
Chechli [Mon, 17 Feb 2014 08:48:51 +0000 (09:48 +0100)]
Update precomp.hpp
Roman Donchenko [Mon, 17 Feb 2014 08:24:48 +0000 (12:24 +0400)]
Merge pull request #2337 from pmoulon:master
Roman Donchenko [Mon, 17 Feb 2014 08:23:59 +0000 (12:23 +0400)]
Merge pull request #2328 from rohitgirdhar:bugfix_blobdetector_kpt_radius
Roman Donchenko [Mon, 17 Feb 2014 08:22:11 +0000 (12:22 +0400)]
Merge pull request #2330 from rohitgirdhar:linux_tutorial_make_j8
Roman Donchenko [Mon, 17 Feb 2014 08:21:19 +0000 (12:21 +0400)]
Merge pull request #2342 from yashdv:android_doc_fix
Roman Donchenko [Mon, 17 Feb 2014 08:02:58 +0000 (12:02 +0400)]
Merge pull request #2348 from ilya-lavrenov:typo
Roman Donchenko [Mon, 17 Feb 2014 07:58:02 +0000 (11:58 +0400)]
Merge pull request #2351 from yashdv:BOW_assert_error
Roman Donchenko [Mon, 17 Feb 2014 07:52:00 +0000 (11:52 +0400)]
Merge pull request #2349 from jet47:fix-bug-3552
Roman Donchenko [Mon, 17 Feb 2014 07:48:03 +0000 (11:48 +0400)]
Merge pull request #2344 from kirill-kornyakov:replace-gittip-button
gleb.sternharz [Mon, 17 Feb 2014 03:08:30 +0000 (04:08 +0100)]
fix dev by 0 in KL-Divergence
pxli168 [Mon, 17 Feb 2014 02:21:18 +0000 (10:21 +0800)]
Simplify the code
Simplify the code as @SpecLad suggested.
Ilya Lavrenov [Sun, 16 Feb 2014 21:37:32 +0000 (01:37 +0400)]
changed the signature of add method according to the base class
yash [Sun, 16 Feb 2014 17:03:30 +0000 (22:33 +0530)]
Fixed CV_ASSERT condition in the code for bag of words
Chechli [Sun, 16 Feb 2014 12:26:00 +0000 (13:26 +0100)]
Update hough_circles.cpp
Ilya Lavrenov [Fri, 14 Feb 2014 14:55:11 +0000 (18:55 +0400)]
extended performance test
Vladislav Vinogradov [Sun, 16 Feb 2014 08:17:17 +0000 (12:17 +0400)]
fix bug #3552:
replace std::swap with own code
Ilya Lavrenov [Sat, 15 Feb 2014 21:42:02 +0000 (01:42 +0400)]
typo
Ilya Lavrenov [Sat, 15 Feb 2014 11:27:27 +0000 (15:27 +0400)]
extended performance tests to test 3 channels
Chechli [Sat, 15 Feb 2014 16:31:14 +0000 (17:31 +0100)]
Update hough_circles.cpp
Ilya Lavrenov [Sat, 15 Feb 2014 12:29:40 +0000 (16:29 +0400)]
disabled 'reshape', 'copyTo' test
Ilya Lavrenov [Sat, 15 Feb 2014 12:04:57 +0000 (16:04 +0400)]
restored lost in PR #1735 umat tests
Ilya Lavrenov [Sat, 15 Feb 2014 11:51:52 +0000 (15:51 +0400)]
cleaned-up UMat tests
Kirill Kornyakov [Sat, 15 Feb 2014 09:08:52 +0000 (13:08 +0400)]
Replaced Gittip button
yash [Fri, 14 Feb 2014 17:34:03 +0000 (23:04 +0530)]
fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
Alexander Alekhin [Fri, 14 Feb 2014 15:50:58 +0000 (19:50 +0400)]
core/ocl: change error processing for missed function
Ilya Lavrenov [Fri, 14 Feb 2014 13:26:28 +0000 (17:26 +0400)]
added [s|l]rgb <-> lab conversion
Roman Donchenko [Fri, 14 Feb 2014 12:21:00 +0000 (16:21 +0400)]
Merge pull request #2336 from SpecLad:useOclChanged
Roman Donchenko [Fri, 14 Feb 2014 12:20:44 +0000 (16:20 +0400)]
Merge pull request #2335 from jet47:gpu-alphacomp-test
Andrey Pavlenko [Fri, 14 Feb 2014 11:49:36 +0000 (15:49 +0400)]
Merge pull request #2326 from vpisarev:ocl_ch3
Alexander Alekhin [Mon, 10 Feb 2014 12:34:45 +0000 (16:34 +0400)]
core/umat: usage flags (with proposals from PR #2195)
Roman Donchenko [Fri, 14 Feb 2014 11:37:09 +0000 (15:37 +0400)]
Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host
Pierre Moulon [Fri, 14 Feb 2014 11:22:53 +0000 (12:22 +0100)]
Fix a typo error
Pierre Moulon [Fri, 14 Feb 2014 11:21:35 +0000 (12:21 +0100)]
Fix a typo error
Roman Donchenko [Fri, 14 Feb 2014 10:38:36 +0000 (14:38 +0400)]
Merge pull request #2329 from ilya-lavrenov:macosx_ogl
Roman Donchenko [Fri, 14 Feb 2014 10:37:56 +0000 (14:37 +0400)]
Deleted an assignment to a variable that doesn't exist.
Vladislav Vinogradov [Fri, 14 Feb 2014 10:27:43 +0000 (14:27 +0400)]
temporary disable performance test for alphaComp function
Andrey Pavlenko [Fri, 14 Feb 2014 09:24:12 +0000 (13:24 +0400)]
Merge pull request #2315 from ilya-lavrenov:nlmeans_perf
Andrey Pavlenko [Fri, 14 Feb 2014 08:37:47 +0000 (12:37 +0400)]
Merge pull request #1735 from KonstantinMatskevich:umat_tests
Roman Donchenko [Fri, 14 Feb 2014 08:09:01 +0000 (12:09 +0400)]
Merge pull request #2062 from cook:bug3440
Stuart Cunningham [Fri, 14 Feb 2014 05:16:17 +0000 (16:16 +1100)]
Fix build of libtiff on big endian host due to defined but empty WORDS_BIGENDIAN macro
Ilya Lavrenov [Thu, 13 Feb 2014 19:47:18 +0000 (23:47 +0400)]
some more fixes
Yantao Xie [Thu, 13 Feb 2014 15:53:58 +0000 (23:53 +0800)]
Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab.
Roman Donchenko [Thu, 13 Feb 2014 15:21:56 +0000 (19:21 +0400)]
Merge pull request #2333 from asmorkalov:java_dead_code_fix
Roman Donchenko [Thu, 13 Feb 2014 15:21:45 +0000 (19:21 +0400)]
Merge pull request #2332 from jet47:gpu-fixes
Alexander Smorkalov [Thu, 13 Feb 2014 14:17:47 +0000 (18:17 +0400)]
Dead code removed as this cannot be null in Java.
Roman Donchenko [Thu, 13 Feb 2014 13:57:45 +0000 (17:57 +0400)]
Merge pull request #2331 from asmorkalov:android_native_activity_finish
Vadim Pisarevsky [Thu, 13 Feb 2014 13:37:42 +0000 (17:37 +0400)]
fixed OpenCL kernel flag in resize (thanks to Ilya L)
Vladislav Vinogradov [Thu, 13 Feb 2014 13:25:59 +0000 (17:25 +0400)]
temporary disable perf test for StereoBeliefPropagation
Vladislav Vinogradov [Thu, 13 Feb 2014 13:16:43 +0000 (17:16 +0400)]
increase epsilon for AlphaComp sanity test for integer input
Alexander Smorkalov [Thu, 13 Feb 2014 12:47:02 +0000 (16:47 +0400)]
Application pause/resume fix for Android sample NativeActivity.
Stuart Cunningham [Thu, 13 Feb 2014 11:59:30 +0000 (22:59 +1100)]
Fix cmake detection of build platform endianness
Improve comments to indicate actual usage of WORDS_BIGENDIAN where
it is tested with #ifdef rather than #if
Konstantin Matskevich [Wed, 11 Dec 2013 09:56:41 +0000 (13:56 +0400)]
update
Roman Donchenko [Thu, 13 Feb 2014 08:30:19 +0000 (12:30 +0400)]
Merge pull request #2304 from mattvenn:master
Rohit Girdhar [Thu, 13 Feb 2014 08:22:00 +0000 (13:52 +0530)]
-j8 in linux_installation tutorial
Roman Donchenko [Thu, 13 Feb 2014 08:16:18 +0000 (12:16 +0400)]
Merge pull request #2318 from gongzg:2.4
Roman Donchenko [Thu, 13 Feb 2014 08:12:00 +0000 (12:12 +0400)]
Merge pull request #2319 from m3d:patch-1
Andrey Pavlenko [Thu, 13 Feb 2014 07:46:23 +0000 (11:46 +0400)]
Merge pull request #2324 from vpisarev:fix_facedetect
projects / platform / upstream / opencv.git / log