Andrey Pavlenko
97dfd65007
Merge pull request #1626 from ilya-lavrenov:ocl_filters
2013-10-18 13:44:41 +04:00
Roman Donchenko
5e24376ad7
Updated ffmpeg_vesion.cmake after #1516 .
2013-10-18 12:23:56 +04:00
Alexander Alekhin
83b7fbe376
cmake: cleanup OpenCVModules_TARGETS from cache
...
This will allow to disable modules between cmake runs
2013-10-17 23:43:33 +04:00
Greg Hale
0c4d484679
added backslash
2013-10-17 14:17:49 -04:00
Greg Hale
61ccd170bd
shortened code to not repeat myself
2013-10-17 14:12:02 -04:00
Greg Hale
5bd5993663
Only append -l to lib entries with no path and no -l or -L of their own
2013-10-17 14:05:06 -04:00
Vladislav Vinogradov
fa70f95272
fix imshow under Windows with OpenGL support:
...
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
2013-10-17 20:58:33 +04:00
Alexander Alekhin
4bfeeb0738
ocl: perf: use RELATIVE_ERROR in SANITY_CHECK for exp/log/pow
2013-10-17 19:00:36 +04:00
Roman Donchenko
578e984739
OpenCV 2.4.6.2 (Tegra detection and native camera update)
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iF4EABEIAAYFAlIxuvoACgkQdDiF7KIeJGrdaQEA0cMV6JhnsWSnZbRCd3RzyXD7
8mf7qrSjIV9ty1UL9AMA/0d4iUIm/iEiBIEP0DbsshX+trN5kXsH5woriScbZMGS
=WeoS
-----END PGP SIGNATURE-----
Merge tag '2.4.6.2' into 2.4
OpenCV 2.4.6.2 (Tegra detection and native camera update)
2013-10-17 17:19:04 +04:00
Roman Donchenko
fb7b4d2d60
Merge pull request #1636 from ilya-lavrenov:ocl_loop_times
2013-10-17 17:00:45 +04:00
Roman Donchenko
88cc054f10
Merge pull request #1369 from StevenPuttemans:fix_featuretracker
2013-10-17 15:42:38 +04:00
Roman Donchenko
9c7ba848bb
Merge pull request #1516 from akarsakov:new_ffmpeg_build
2013-10-17 15:41:18 +04:00
Ilya Lavrenov
07aee1a25c
made LOOP_TIMES as a command line option with default value=1
2013-10-17 12:40:16 +04:00
Alexander Karsakov
cee308312a
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 )
2013-10-17 12:29:00 +04:00
Roman Donchenko
d411041c53
Merge pull request #1637 from SpecLad:run-py-java-fix
2013-10-17 12:25:31 +04:00
Ilya Lavrenov
da3b7c79b8
refactored filters in the ocl module; added an accuracy tests for ocl::medianFilter
2013-10-17 12:23:56 +04:00
Andrey Pavlenko
7605426dc3
Merge pull request #1613 from alalek:ocl_cvtcolor
2013-10-17 12:07:20 +04:00
Andrey Pavlenko
8b63e33b24
Merge pull request #1632 from alalek:cmake_find_package_build_dir
2013-10-17 11:59:27 +04:00
Andrey Pavlenko
e14dc887c6
Merge pull request #1635 from alalek:cmake_fix_export_java
2013-10-17 11:55:25 +04:00
Andrey Pavlenko
28ecd54f58
Merge pull request #1634 from alalek:cmake_fix_cuda_linker_deps
2013-10-17 11:55:03 +04:00
Alexander Alekhin
ce0647c9b6
ocl: rewrite CvtColor tests, added roi support
2013-10-16 22:46:21 +04:00
Roman Donchenko
5bb6949bd6
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.
2013-10-16 19:22:01 +04:00
Alexander Alekhin
09f0e1777e
cmake: fix linker deps for CUDA
2013-10-16 18:34:47 +04:00
Alexander Alekhin
2a9d24323c
cmake: add opencv_java into list of exported targets (fix for android)
2013-10-16 17:23:44 +04:00
Roman Donchenko
bfdbc9cefd
Merge pull request #1375 from jet47:gpu-examples-build
2013-10-16 13:22:26 +04:00
Alexander Alekhin
9941d3f71a
cmake: restore find_package() for build directory
2013-10-15 23:05:40 +04:00
Greg Hale
70df365c87
changed foreach variable to match naming conventions and dropped intermediate variable, appending directly to the LIB_COMPONENTS list
2013-10-15 14:54:58 -04:00
Roman Donchenko
b420c0b160
Merge pull request #1630 from SpecLad:java-deprecated-assert
2013-10-15 18:36:15 +04:00
Roman Donchenko
572c18da72
Merge pull request #1627 from SpecLad:java-version-no-inline
2013-10-15 18:05:58 +04:00
Roman Donchenko
a61d1e6494
Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.
...
We don't use it, anyway.
2013-10-15 17:10:12 +04:00
Roman Donchenko
7ff91665cf
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.
2013-10-15 15:44:26 +04:00
Roman Donchenko
7fb18a2311
Merge pull request #1620 from SpecLad:record-build-type
2013-10-15 14:59:53 +04:00
Andrey Pavlenko
98d55f34fa
Merge pull request #1625 from ilya-lavrenov:to_string
2013-10-15 14:42:44 +04:00
Ilya Lavrenov
741e0242b3
replaced to_string by cv::format
2013-10-15 13:26:01 +04:00
Roman Donchenko
cf71ff0845
Record OpenCV build type among the test properties.
...
Because apparently I love running performance tests for debug builds.
2013-10-15 12:09:31 +04:00
Roman Donchenko
1eb322fa5d
Merge pull request #1622 from a0byte:2.4
2013-10-15 11:51:40 +04:00
Greg Hale
f23b51de6f
Added -l prefix to EXTRA_COMPONENTS when generating pkg-config file
2013-10-14 13:36:07 -04:00
Andrey Pavlenko
97da1419e1
Merge pull request #1573 from alalek:perf_simple_strategy
2013-10-14 19:28:49 +04:00
Andrey Pavlenko
7f15ec9d54
Merge pull request #1617 from ilya-lavrenov:ocl_info
2013-10-14 19:27:01 +04:00
Han Qiang
88f68a3fe0
Fixed typo in document.
...
Signed-off-by: Han Qiang <a0byte@gmail.com>
2013-10-14 23:23:59 +08:00
Ilya Lavrenov
ca26028415
demonstrative device info output
2013-10-14 17:18:25 +04:00
Andrey Pavlenko
9e12306d95
Merge pull request #1614 from ilya-lavrenov:ocl_svm_misprint
2013-10-14 16:43:18 +04:00
Andrey Pavlenko
e90a9e810d
Merge pull request #1612 from alalek:ocl_fix_string_info
2013-10-14 16:41:43 +04:00
Andrey Pavlenko
ae56eaa563
Merge pull request #1609 from ilya-lavrenov:ocl_some_optimization
2013-10-14 16:41:25 +04:00
Roman Donchenko
0870d3d78c
Merge pull request #1616 from ilya-lavrenov:ocl_cvtColor
2013-10-14 15:16:02 +04:00
Ilya Lavrenov
28f566b843
misprint in disabling ocl::svm
2013-10-13 23:54:09 +04:00
Ilya Lavrenov
b18101b15a
some optimization of binary ocl::bitwise operations
2013-10-13 23:25:59 +04:00
Ilya Lavrenov
da607c6711
ocl::cvtColor works with ROI properly
2013-10-13 23:09:14 +04:00
Alexander Alekhin
376cd8f84f
perf: added simple collection strategy
2013-10-12 18:05:57 +04:00
Alexander Alekhin
f617c0d4a2
ocl: fix for get string info from OpenCL
2013-10-12 16:56:21 +04:00
