Andrey Pavlenko [Mon, 21 Oct 2013 12:06:35 +0000 (16:06 +0400)]
Merge pull request #1647 from ilya-lavrenov:ocl_tests_demonstrative
Andrey Pavlenko [Mon, 21 Oct 2013 12:00:13 +0000 (16:00 +0400)]
Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix
Andrey Pavlenko [Mon, 21 Oct 2013 11:59:19 +0000 (15:59 +0400)]
Merge pull request #1644 from ilya-lavrenov:ocl_matrix_operations
Andrey Pavlenko [Mon, 21 Oct 2013 11:58:59 +0000 (15:58 +0400)]
Merge pull request #1633 from ilya-lavrenov:ocl_imgproc
Ilya Lavrenov [Sat, 19 Oct 2013 08:12:16 +0000 (12:12 +0400)]
fixed ocl::Laplacian for case when scale != 1
Ilya Lavrenov [Fri, 18 Oct 2013 13:57:10 +0000 (17:57 +0400)]
missed initialization of kernel size
Roman Donchenko [Mon, 21 Oct 2013 10:00:22 +0000 (14:00 +0400)]
Merge pull request #1651 from ilya-lavrenov:misprint
Ilya Lavrenov [Fri, 18 Oct 2013 21:00:22 +0000 (01:00 +0400)]
added reflect, reflect101, replicate, wrap border types to ocl::remap
Ilya Lavrenov [Sat, 19 Oct 2013 18:59:47 +0000 (22:59 +0400)]
misprint
Ilya Lavrenov [Fri, 18 Oct 2013 21:17:46 +0000 (01:17 +0400)]
made more demonstrative message about test fails
Andrey Pavlenko [Fri, 18 Oct 2013 14:41:12 +0000 (18:41 +0400)]
Merge pull request #1587 from alalek:opencl_khronos_headers
Roman Donchenko [Fri, 18 Oct 2013 14:39:06 +0000 (18:39 +0400)]
Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix
Roman Donchenko [Fri, 18 Oct 2013 14:22:59 +0000 (18:22 +0400)]
Merge pull request #1641 from jet47:imshow-opengl-fix
Roman Donchenko [Fri, 18 Oct 2013 14:19:35 +0000 (18:19 +0400)]
Merge pull request #1642 from alalek:cmake_cleanup_targets
Ilya Lavrenov [Fri, 18 Oct 2013 13:34:17 +0000 (17:34 +0400)]
refactored ocl matrix operations accuracy tests
Ilya Lavrenov [Fri, 18 Oct 2013 12:46:00 +0000 (16:46 +0400)]
enabled double in copyMakeBorder kernel
Ilya Lavrenov [Fri, 18 Oct 2013 12:41:09 +0000 (16:41 +0400)]
rewrote ocl::remap
Ilya Lavrenov [Fri, 18 Oct 2013 12:39:47 +0000 (16:39 +0400)]
fixed ocl::copyMakeBorder
Ilya Lavrenov [Fri, 18 Oct 2013 12:36:11 +0000 (16:36 +0400)]
added ROI support to ocl::convolve
Ilya Lavrenov [Fri, 18 Oct 2013 12:33:48 +0000 (16:33 +0400)]
added ROI support to ocl::columnSum
Ilya Lavrenov [Fri, 18 Oct 2013 12:31:52 +0000 (16:31 +0400)]
added ROI support to ocl::CLAHE
Ilya Lavrenov [Fri, 18 Oct 2013 12:29:10 +0000 (16:29 +0400)]
refactored all the tests in ocl/test/test_imgproc.cpp
Alexander Alekhin [Fri, 11 Oct 2013 15:32:31 +0000 (19:32 +0400)]
ocl: update autogenerated code
Alexander Alekhin [Fri, 11 Oct 2013 15:30:47 +0000 (19:30 +0400)]
ocl: force to use Khronos OpenCL headers
Alexander Alekhin [Tue, 8 Oct 2013 16:26:54 +0000 (20:26 +0400)]
added Khronos OpenCL 1.2 header files
Andrey Pavlenko [Fri, 18 Oct 2013 09:45:12 +0000 (13:45 +0400)]
Merge pull request #1640 from alalek:ocl_fix_exp_test
Andrey Pavlenko [Fri, 18 Oct 2013 09:44:40 +0000 (13:44 +0400)]
Merge pull request #1626 from ilya-lavrenov:ocl_filters
Roman Donchenko [Thu, 17 Oct 2013 13:16:58 +0000 (17:16 +0400)]
Updated ffmpeg_vesion.cmake after #1516.
Alexander Alekhin [Thu, 17 Oct 2013 19:42:37 +0000 (23:42 +0400)]
cmake: cleanup OpenCVModules_TARGETS from cache
This will allow to disable modules between cmake runs
Vladislav Vinogradov [Thu, 17 Oct 2013 16:54:43 +0000 (20:54 +0400)]
fix imshow under Windows with OpenGL support:
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
Alexander Alekhin [Thu, 17 Oct 2013 14:46:27 +0000 (18:46 +0400)]
ocl: perf: use RELATIVE_ERROR in SANITY_CHECK for exp/log/pow
Roman Donchenko [Thu, 17 Oct 2013 13:19:04 +0000 (17:19 +0400)]
Merge tag '2.4.6.2' into 2.4
OpenCV 2.4.6.2 (Tegra detection and native camera update)
Roman Donchenko [Thu, 17 Oct 2013 13:00:45 +0000 (17:00 +0400)]
Merge pull request #1636 from ilya-lavrenov:ocl_loop_times
Roman Donchenko [Thu, 17 Oct 2013 11:42:37 +0000 (15:42 +0400)]
Merge pull request #1369 from StevenPuttemans:fix_featuretracker
Roman Donchenko [Thu, 17 Oct 2013 11:41:15 +0000 (15:41 +0400)]
Merge pull request #1516 from akarsakov:new_ffmpeg_build
Ilya Lavrenov [Wed, 16 Oct 2013 14:23:05 +0000 (18:23 +0400)]
made LOOP_TIMES as a command line option with default value=1
Alexander Karsakov [Fri, 27 Sep 2013 08:33:57 +0000 (12:33 +0400)]
Updated build of ffmpeg library (v 2.0.2). Builded with mingw (gcc 4.6.1) with
folowing additional options: --enable-w32threads, --arch=i686 (for 32-bit
library, workaround for http://trac.ffmpeg.org/ticket/2363)
Roman Donchenko [Thu, 17 Oct 2013 08:25:30 +0000 (12:25 +0400)]
Merge pull request #1637 from SpecLad:run-py-java-fix
Ilya Lavrenov [Mon, 14 Oct 2013 10:45:15 +0000 (14:45 +0400)]
refactored filters in the ocl module; added an accuracy tests for ocl::medianFilter
Andrey Pavlenko [Thu, 17 Oct 2013 08:07:20 +0000 (12:07 +0400)]
Merge pull request #1613 from alalek:ocl_cvtcolor
Andrey Pavlenko [Thu, 17 Oct 2013 07:59:27 +0000 (11:59 +0400)]
Merge pull request #1632 from alalek:cmake_find_package_build_dir
Andrey Pavlenko [Thu, 17 Oct 2013 07:55:25 +0000 (11:55 +0400)]
Merge pull request #1635 from alalek:cmake_fix_export_java
Andrey Pavlenko [Thu, 17 Oct 2013 07:55:03 +0000 (11:55 +0400)]
Merge pull request #1634 from alalek:cmake_fix_cuda_linker_deps
Alexander Alekhin [Sat, 12 Oct 2013 12:52:25 +0000 (16:52 +0400)]
ocl: rewrite CvtColor tests, added roi support
Roman Donchenko [Wed, 16 Oct 2013 15:22:01 +0000 (19:22 +0400)]
Fix running Java tests with run.py on everything other than Windows.
Previously, run.py would assume that the opencv_java library is in the
same directory as the tests, which is only true on Windows.
The library path depends on the build configuration, which may not be
known until the actual build (e.g. with the Visual Studio generators),
so it can't be stored in the CMake cache for run.py to read. I didn't
want to hardcode into run.py where the library is on each platform,
either. So that's why I used the current scheme with the properties
file. It also makes running the tests without run.py a little easier.
Alexander Alekhin [Wed, 16 Oct 2013 11:47:51 +0000 (15:47 +0400)]
cmake: fix linker deps for CUDA
Alexander Alekhin [Wed, 16 Oct 2013 13:23:44 +0000 (17:23 +0400)]
cmake: add opencv_java into list of exported targets (fix for android)
Roman Donchenko [Wed, 16 Oct 2013 09:22:25 +0000 (13:22 +0400)]
Merge pull request #1375 from jet47:gpu-examples-build
Alexander Alekhin [Tue, 15 Oct 2013 19:05:40 +0000 (23:05 +0400)]
cmake: restore find_package() for build directory
Roman Donchenko [Tue, 15 Oct 2013 14:36:15 +0000 (18:36 +0400)]
Merge pull request #1630 from SpecLad:java-deprecated-assert
Roman Donchenko [Tue, 15 Oct 2013 14:05:58 +0000 (18:05 +0400)]
Merge pull request #1627 from SpecLad:java-version-no-inline
Roman Donchenko [Tue, 15 Oct 2013 13:10:12 +0000 (17:10 +0400)]
Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.
We don't use it, anyway.
Roman Donchenko [Tue, 15 Oct 2013 11:44:26 +0000 (15:44 +0400)]
In Java bindings, wrap version constants into functions to prevent inlining.
Java inlines static finals if they're defined with a constant expression. In
case of version constants we don't want that to happen, since they obviously
change from version to version. If the user substitutes a different OpenCV
jar without recompiling, we want user code to still have relevant values for
the version constants.
This arranges that by turning constant values into function calls, which no
longer count as a constant expression.
Roman Donchenko [Tue, 15 Oct 2013 10:59:53 +0000 (14:59 +0400)]
Merge pull request #1620 from SpecLad:record-build-type
Andrey Pavlenko [Tue, 15 Oct 2013 10:42:44 +0000 (14:42 +0400)]
Merge pull request #1625 from ilya-lavrenov:to_string
Ilya Lavrenov [Tue, 15 Oct 2013 09:12:36 +0000 (13:12 +0400)]
replaced to_string by cv::format
Roman Donchenko [Mon, 14 Oct 2013 13:15:40 +0000 (17:15 +0400)]
Record OpenCV build type among the test properties.
Because apparently I love running performance tests for debug builds.
Roman Donchenko [Tue, 15 Oct 2013 07:51:40 +0000 (11:51 +0400)]
Merge pull request #1622 from a0byte:2.4
Andrey Pavlenko [Mon, 14 Oct 2013 15:28:48 +0000 (19:28 +0400)]
Merge pull request #1573 from alalek:perf_simple_strategy
Andrey Pavlenko [Mon, 14 Oct 2013 15:27:00 +0000 (19:27 +0400)]
Merge pull request #1617 from ilya-lavrenov:ocl_info
Han Qiang [Mon, 14 Oct 2013 15:15:07 +0000 (23:15 +0800)]
Fixed typo in document.
Signed-off-by: Han Qiang <a0byte@gmail.com>
Ilya Lavrenov [Mon, 14 Oct 2013 07:58:45 +0000 (11:58 +0400)]
demonstrative device info output
Andrey Pavlenko [Mon, 14 Oct 2013 12:43:18 +0000 (16:43 +0400)]
Merge pull request #1614 from ilya-lavrenov:ocl_svm_misprint
Andrey Pavlenko [Mon, 14 Oct 2013 12:41:43 +0000 (16:41 +0400)]
Merge pull request #1612 from alalek:ocl_fix_string_info
Andrey Pavlenko [Mon, 14 Oct 2013 12:41:25 +0000 (16:41 +0400)]
Merge pull request #1609 from ilya-lavrenov:ocl_some_optimization
Roman Donchenko [Mon, 14 Oct 2013 11:16:01 +0000 (15:16 +0400)]
Merge pull request #1616 from ilya-lavrenov:ocl_cvtColor
Ilya Lavrenov [Sun, 13 Oct 2013 19:54:09 +0000 (23:54 +0400)]
misprint in disabling ocl::svm
Ilya Lavrenov [Fri, 11 Oct 2013 20:58:58 +0000 (00:58 +0400)]
some optimization of binary ocl::bitwise operations
Ilya Lavrenov [Sun, 13 Oct 2013 19:09:14 +0000 (23:09 +0400)]
ocl::cvtColor works with ROI properly
Alexander Alekhin [Sun, 6 Oct 2013 17:48:35 +0000 (21:48 +0400)]
perf: added simple collection strategy
Alexander Alekhin [Sat, 12 Oct 2013 12:53:02 +0000 (16:53 +0400)]
ocl: fix for get string info from OpenCL
Andrey Pavlenko [Sat, 12 Oct 2013 12:31:02 +0000 (16:31 +0400)]
Merge pull request #1610 from alalek:ocl_fix_perf_kalman
Andrey Pavlenko [Sat, 12 Oct 2013 12:24:03 +0000 (16:24 +0400)]
Merge pull request #1608 from alalek:fix_warn_upd_haar
Andrey Pavlenko [Sat, 12 Oct 2013 12:12:05 +0000 (16:12 +0400)]
Merge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup
Andrey Pavlenko [Sat, 12 Oct 2013 12:10:03 +0000 (16:10 +0400)]
Merge pull request #1606 from ilya-lavrenov:ocl_imgproc
Andrey Pavlenko [Sat, 12 Oct 2013 12:08:24 +0000 (16:08 +0400)]
Merge pull request #1602 from alalek:ocl_test_dump_info
Andrey Pavlenko [Sat, 12 Oct 2013 12:04:05 +0000 (16:04 +0400)]
Merge pull request #1603 from ilya-lavrenov:ocl_disable_svm_noblas
Alexander Alekhin [Fri, 11 Oct 2013 22:36:53 +0000 (02:36 +0400)]
ocl: reverted type of perf test params for Kalman filter
Ilya Lavrenov [Fri, 11 Oct 2013 15:22:25 +0000 (19:22 +0400)]
refactored ocl/src/imgproc.cpp
Ilya Lavrenov [Fri, 11 Oct 2013 16:24:26 +0000 (20:24 +0400)]
fft cleanup ignoring
ilya-lavrenov [Fri, 11 Oct 2013 11:15:57 +0000 (15:15 +0400)]
disable SVM when AMD BLAS is not available
Andrey Pavlenko [Fri, 11 Oct 2013 14:55:53 +0000 (18:55 +0400)]
Merge pull request #1605 from alalek:ocl_fixes
Alexander Alekhin [Fri, 11 Oct 2013 14:42:17 +0000 (18:42 +0400)]
ocl: fix warnings from GCC 4.8, update Haar
Alexander Alekhin [Fri, 11 Oct 2013 14:24:59 +0000 (18:24 +0400)]
ocl: dump device info in tests
Alexander Alekhin [Fri, 11 Oct 2013 12:55:22 +0000 (16:55 +0400)]
ocl: fix CV_EXPORTS usage (misplaced in functions declarations)
Alexander Alekhin [Fri, 11 Oct 2013 12:39:26 +0000 (16:39 +0400)]
ocl: fix cleanup in static builds
Alexander Alekhin [Fri, 11 Oct 2013 11:33:10 +0000 (15:33 +0400)]
ocl: remove support_image2d(): we target on OpenCL 1.1 (with image2d support by default)
Andrey Pavlenko [Fri, 11 Oct 2013 12:22:58 +0000 (16:22 +0400)]
Merge pull request #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
ilya-lavrenov [Fri, 11 Oct 2013 09:55:49 +0000 (13:55 +0400)]
fixed ocl optical flow: sparse and tvl1
Andrey Pavlenko [Fri, 11 Oct 2013 08:40:12 +0000 (12:40 +0400)]
Merge pull request #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
Andrey Pavlenko [Fri, 11 Oct 2013 08:37:41 +0000 (12:37 +0400)]
Merge pull request #1595 from alalek:cl_code_cleanup
Alexander Alekhin [Thu, 10 Oct 2013 21:16:12 +0000 (01:16 +0400)]
ocl: code cleanup, fix .clb files
Andrey Pavlenko [Thu, 10 Oct 2013 20:40:06 +0000 (00:40 +0400)]
Merge pull request #1598 from alalek:ocl_fix_build_mac
Andrey Pavlenko [Thu, 10 Oct 2013 20:38:12 +0000 (00:38 +0400)]
Merge pull request #1594 from ilya-lavrenov:ocl_perf
Ilya Lavrenov [Thu, 10 Oct 2013 20:00:01 +0000 (00:00 +0400)]
enabled accuracy tests for the functions that use inside AMD Blas/Fft
Alexander Alekhin [Thu, 10 Oct 2013 18:56:19 +0000 (22:56 +0400)]
ocl: fix build on Mac
Ilya Lavrenov [Thu, 10 Oct 2013 18:28:09 +0000 (22:28 +0400)]
fixed kernel compilation warnings on MacOSX
Ilya Lavrenov [Wed, 9 Oct 2013 15:37:09 +0000 (19:37 +0400)]
added perf tests for min, max, abs
Andrey Pavlenko [Thu, 10 Oct 2013 15:02:29 +0000 (19:02 +0400)]
Merge pull request #1597 from alalek:ocl_fix_cleanup
Andrey Pavlenko [Thu, 10 Oct 2013 15:02:10 +0000 (19:02 +0400)]
Merge pull request #1596 from alalek:test_fix_run_py
projects / platform / upstream / opencv.git / log