Roman Donchenko [Thu, 24 Oct 2013 15:12:34 +0000 (19:12 +0400)]
Merge pull request #1679 from ilya-lavrenov:ocl_equalizeHist
Roman Donchenko [Thu, 24 Oct 2013 11:00:27 +0000 (15:00 +0400)]
Merge pull request #1667 from SpecLad:detect-openmp
Roman Donchenko [Thu, 24 Oct 2013 10:18:10 +0000 (14:18 +0400)]
Merge pull request #1623 from ImAlsoGreg:2.4-pkgconfig-dash-l
Ilya Lavrenov [Thu, 24 Oct 2013 09:59:25 +0000 (13:59 +0400)]
fixed bug in ocl::equalizeHist
Roman Donchenko [Thu, 24 Oct 2013 09:55:30 +0000 (13:55 +0400)]
Merge pull request #1678 from wejeus:ios-documentationfix-2.4
Roman Donchenko [Thu, 24 Oct 2013 09:54:31 +0000 (13:54 +0400)]
Merge pull request #1674 from alalek:cmake_fix
Samuel Wejéus [Thu, 24 Oct 2013 08:36:01 +0000 (10:36 +0200)]
Removed incorrect release of obtained colorspace. This fixes bug #3318 (updated commit for 2.4 branch)
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:54 +0000 (11:23 +0400)]
Merge pull request #1676 from ilya-lavrenov:ocl_resize_test
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:35 +0000 (11:23 +0400)]
Merge pull request #1673 from ilya-lavrenov:ocl_norm
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:18 +0000 (11:23 +0400)]
Merge pull request #1672 from ilya-lavrenov:ocl_arithm
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:00 +0000 (11:23 +0400)]
Merge pull request #1669 from ilya-lavrenov:ocl_copyMakeBorder
Ilya Lavrenov [Wed, 23 Oct 2013 13:20:10 +0000 (17:20 +0400)]
fixed ocl::copyMakeBorder
Ilya Lavrenov [Wed, 23 Oct 2013 18:11:57 +0000 (22:11 +0400)]
fixed an accuracy test for ocl::resize (in some cases dsize.area() was equal to 0)
Alexander Alekhin [Wed, 23 Oct 2013 16:28:22 +0000 (20:28 +0400)]
cmake: fix bug with installation into OPENCV_LIB_INSTALL_PATH directory
Ilya Lavrenov [Wed, 23 Oct 2013 15:53:04 +0000 (19:53 +0400)]
moved to relative errors in ocl::norm tests
Ilya Lavrenov [Wed, 23 Oct 2013 14:42:55 +0000 (18:42 +0400)]
workaround for cv::multiply bug
Roman Donchenko [Wed, 23 Oct 2013 10:50:55 +0000 (14:50 +0400)]
Merge pull request #1659 from ilya-lavrenov:ocl_examples
Roman Donchenko [Tue, 22 Oct 2013 15:16:09 +0000 (19:16 +0400)]
Merge pull request #1649 from asandwhich:2.4
Roman Donchenko [Tue, 22 Oct 2013 15:02:48 +0000 (19:02 +0400)]
Merge pull request #1666 from SpecLad:cv-cap-openni
Roman Donchenko [Tue, 22 Oct 2013 14:47:37 +0000 (18:47 +0400)]
Add better OpenMP detection and make an option to enable it.
Bug report and inspiration: http://code.opencv.org/issues/3328
Roman Donchenko [Tue, 22 Oct 2013 10:48:25 +0000 (14:48 +0400)]
Fixed incorrectly unprefixed constant names in the OpenNI tutorial.
Bug report: http://code.opencv.org/issues/3329
Andrey Pavlenko [Tue, 22 Oct 2013 09:46:54 +0000 (13:46 +0400)]
Merge pull request #1658 from alalek:ocl_fixes
Ilya Lavrenov [Mon, 21 Oct 2013 16:47:55 +0000 (20:47 +0400)]
OpenCL examples refactoring
Alexander Alekhin [Mon, 21 Oct 2013 15:48:36 +0000 (19:48 +0400)]
ocl: fix FFT initialization
Alexander Alekhin [Mon, 21 Oct 2013 15:15:11 +0000 (19:15 +0400)]
ocl: workaround for ProgramCache cleanup issue, use RAII to print kernel build error
Greg Hale [Mon, 21 Oct 2013 13:27:04 +0000 (09:27 -0400)]
regex doesnt need to match full length of input, so only trying to match the leading -[lL]
Roman Donchenko [Mon, 21 Oct 2013 12:53:24 +0000 (16:53 +0400)]
Merge pull request #1646 from alalek:ocl_fix_msvc11
Roman Donchenko [Mon, 21 Oct 2013 12:27:59 +0000 (16:27 +0400)]
Merge pull request #1556 from jet47:fix-bug-3296
Roman Donchenko [Mon, 21 Oct 2013 12:18:02 +0000 (16:18 +0400)]
Merge pull request #1650 from jet47:fix-gpu-bgsegm-sample
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
Greg Hale [Sat, 19 Oct 2013 21:30:32 +0000 (17:30 -0400)]
fixed wrong regex
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
Vladislav Vinogradov [Sat, 19 Oct 2013 08:40:10 +0000 (12:40 +0400)]
fix bug in gpu bgsegm sample
create `d_fgimg` matrix before cleaning.
Kevin [Sat, 19 Oct 2013 06:30:03 +0000 (01:30 -0500)]
Change intrinsic camera matrix initialization
In the function cvInitIntrinsicParams2D the principal point for
normalized image coordinates is set to 0/0. This updates the function
to initialize the principal point at 0.5/0.5.
Ilya Lavrenov [Fri, 18 Oct 2013 21:17:46 +0000 (01:17 +0400)]
made more demonstrative message about test fails
Alexander Alekhin [Fri, 18 Oct 2013 16:43:34 +0000 (20:43 +0400)]
ocl: workaround for msvc11 bug
"#error" requires DOS line endings (or fails with fatal error C1004: unexpected end-of-file found)
See: http://connect.microsoft.com/VisualStudio/feedback/details/794991/c-error-directive-and-unix-line-endings-leads-to-an-unexpected-end-of-file
So replace them to #pragma message.
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
Greg Hale [Thu, 17 Oct 2013 18:17:49 +0000 (14:17 -0400)]
added backslash
Greg Hale [Thu, 17 Oct 2013 18:12:02 +0000 (14:12 -0400)]
shortened code to not repeat myself
Greg Hale [Thu, 17 Oct 2013 18:05:06 +0000 (14:05 -0400)]
Only append -l to lib entries with no path and no -l or -L of their own
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
Greg Hale [Tue, 15 Oct 2013 18:54:58 +0000 (14:54 -0400)]
changed foreach variable to match naming conventions and dropped intermediate variable, appending directly to the LIB_COMPONENTS list
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
Greg Hale [Mon, 14 Oct 2013 17:36:07 +0000 (13:36 -0400)]
Added -l prefix to EXTRA_COMPONENTS when generating pkg-config file
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