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
Andrey Pavlenko
c5afaa4e8d
Merge pull request #1610 from alalek:ocl_fix_perf_kalman
2013-10-12 16:31:02 +04:00
Andrey Pavlenko
19dca324ae
Merge pull request #1608 from alalek:fix_warn_upd_haar
2013-10-12 16:24:04 +04:00
Andrey Pavlenko
f9fe1b9b09
Merge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup
2013-10-12 16:12:05 +04:00
Andrey Pavlenko
a55cc60136
Merge pull request #1606 from ilya-lavrenov:ocl_imgproc
2013-10-12 16:10:04 +04:00
Andrey Pavlenko
9f5cda799f
Merge pull request #1602 from alalek:ocl_test_dump_info
2013-10-12 16:08:24 +04:00
Andrey Pavlenko
4e31a3df24
Merge pull request #1603 from ilya-lavrenov:ocl_disable_svm_noblas
2013-10-12 16:04:05 +04:00
Alexander Alekhin
4413bee693
ocl: reverted type of perf test params for Kalman filter
2013-10-12 02:36:53 +04:00
Ilya Lavrenov
dfbea3518a
refactored ocl/src/imgproc.cpp
2013-10-11 23:39:41 +04:00
Ilya Lavrenov
5a309e8f6e
fft cleanup ignoring
2013-10-11 20:25:03 +04:00
ilya-lavrenov
d63a38e9bf
disable SVM when AMD BLAS is not available
2013-10-11 19:25:34 +04:00
Andrey Pavlenko
fa11f04ae1
Merge pull request #1605 from alalek:ocl_fixes
2013-10-11 18:55:53 +04:00
Alexander Alekhin
723af15228
ocl: fix warnings from GCC 4.8, update Haar
2013-10-11 18:42:17 +04:00
Alexander Alekhin
1980aad8d7
ocl: dump device info in tests
2013-10-11 18:24:59 +04:00
Alexander Alekhin
3b0823db7e
ocl: fix CV_EXPORTS usage (misplaced in functions declarations)
2013-10-11 18:07:38 +04:00
Alexander Alekhin
ce1177151e
ocl: fix cleanup in static builds
2013-10-11 18:07:38 +04:00
Alexander Alekhin
57120c1a60
ocl: remove support_image2d(): we target on OpenCL 1.1 (with image2d support by default)
2013-10-11 17:16:03 +04:00
Andrey Pavlenko
c0265c60f3
Merge pull request #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
2013-10-11 16:22:59 +04:00
ilya-lavrenov
ca32583fdd
fixed ocl optical flow: sparse and tvl1
2013-10-11 13:55:49 +04:00
Andrey Pavlenko
171e0e62ec
Merge pull request #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
2013-10-11 12:40:12 +04:00
Andrey Pavlenko
b7f1edccfb
Merge pull request #1595 from alalek:cl_code_cleanup
2013-10-11 12:37:42 +04:00
Alexander Alekhin
238550cdad
ocl: code cleanup, fix .clb files
2013-10-11 01:19:46 +04:00
Andrey Pavlenko
dfbd5021fd
Merge pull request #1598 from alalek:ocl_fix_build_mac
2013-10-11 00:40:06 +04:00
Andrey Pavlenko
4417519795
Merge pull request #1594 from ilya-lavrenov:ocl_perf
2013-10-11 00:38:12 +04:00
Ilya Lavrenov
1be77dd2f3
enabled accuracy tests for the functions that use inside AMD Blas/Fft
2013-10-11 00:37:52 +04:00
Alexander Alekhin
0760fdcbdb
ocl: fix build on Mac
2013-10-10 23:11:48 +04:00
Ilya Lavrenov
1f51e6c0de
fixed kernel compilation warnings on MacOSX
2013-10-10 22:56:39 +04:00
