Andrey Kamaev
cf407c2ec0
Don't check for EINTR and replace xioctl with ioctl
...
This should be safe todo unless we are writing a signal handler.
2013-01-28 17:58:57 +04:00
Patrick Welche
1a84bcc565
NetBSD video(4) support, patch 3 of 3
...
xioctl() assumes that ioctl takes int request. Cope with
int ioctl(int d, unsigned long request, ...)
to avoid "invalid argument".
2013-01-28 17:11:44 +04:00
Patrick Welche
681ffd9a21
NetBSD video(4) support, patch 2 of 3
...
* Decouple Video4Linux2 support from Video4Linux as existence of
v4l2 on a system does not imply support for v4l.
* Don't use V4L's struct video_window in V4L2 code.
* Removed __USE_GNU as comment says:
/* support for MJPEG is only available with libjpeg and gcc,
because it's use libjepg and fmemopen()
so replace with test for fmemopen() if found necessary.
2013-01-28 17:11:41 +04:00
Patrick Welche
d90b8d615c
NetBSD video(4) support, patch 1 of 3
...
The video(4) driver provides a Video4Linux2 compatible API for
various video peripherals. This patch propagates HAVE_VIDEOIO if
the sys/videoio.h include file is found, which is the signature of
video(4).
2013-01-28 17:11:36 +04:00
Andrey Kamaev
8521ac5d21
Merge branch 'fix_jpg2000' into 2.4
2013-01-28 12:41:35 +04:00
Andy Maloney
e87355463f
{highgui} Fix copy-paste error in conditional
2013-01-26 16:38:01 -05:00
Andrey Kamaev
d8f749da52
Merge pull request #337 from taka-no-me:ocl_appsdk
2013-01-25 16:23:36 +04:00
Andrey Kamaev
9509dfd1de
Fix OpenCL build warnings
2013-01-25 16:19:59 +04:00
Andrey Kamaev
dc11acf041
Merge pull request #336 from ivan-korolev:fix_relative_error_formula
2013-01-25 14:10:06 +04:00
Ivan Korolev
6385b0f7ed
Fixed a formula to calculate the relative error
2013-01-25 11:19:38 +04:00
Andrey Kamaev
ed949bc211
Merge pull request #324 from bitwangyaoyao:2.4_cvtcolor
2013-01-25 00:53:42 +04:00
Andrey Kamaev
20de2f35f9
Merge pull request #325 from bitwangyaoyao:2.4_fixcanny
2013-01-25 00:46:35 +04:00
Andrey Kamaev
f9ed0037b3
Merge pull request #327 from bitwangyaoyao:2.4_vs2012
2013-01-25 00:46:20 +04:00
Andrey Kamaev
94e2b5c140
Merge pull request #305 from stephenfalken:2.4
2013-01-24 18:24:36 +04:00
Andrey Kamaev
d5b15d6523
Fix ocl build warnings
2013-01-24 17:08:30 +04:00
Siegfried Hochdorfer
195d501b43
fixed broken indentation
2013-01-24 11:40:35 +01:00
Andrey Kamaev
a441980d68
Fix debug build of Java warppers
2013-01-24 13:25:12 +04:00
Andrey Kamaev
3c4cfccc88
Merge pull request #321 from apavlenko:warp_sanity_check
2013-01-24 13:05:54 +04:00
yao
2aae501234
make ocl module compile on VS2012
2013-01-24 15:45:29 +08:00
yao
d574e6dc09
fix canny crash in bug #2279
2013-01-24 14:58:41 +08:00
yao
4f778436b5
ocl::cvtColor support YUV and YCbCr formats
2013-01-24 14:33:28 +08:00
Andrey Kamaev
0773ab4d07
Merge pull request #315 from taka-no-me:java_on
2013-01-23 19:02:27 +04:00
Andrey Pavlenko
e287dea91b
fixing build warnings
2013-01-23 18:45:06 +04:00
Andrey Kamaev
2c32536bf4
Enable Java bindings on all platforms by default
2013-01-23 18:08:09 +04:00
Andrey Kamaev
caa2c06e50
Quiet output of cv::error in Java tests
...
Introduced new Java API
void org.opencv.core.Core.setErrorVerbosity(boolean verbose)
used to suppress output to stderr from OpenCV's asserts
2013-01-23 18:08:09 +04:00
Andrey Kamaev
5eabcf8e4f
Java tests: print summary for tests run
2013-01-23 18:08:09 +04:00
Andrey Kamaev
4668a133f0
Java API: fix build warning on OS X
...
Common part of all source files is extracted to special header
2013-01-23 18:08:09 +04:00
Andrey Kamaev
3889b34ec3
Add option to run java tests with run.py
2013-01-23 18:08:08 +04:00
Andrey Pavlenko
81721d0dce
enabling sanity checks for warp and resize functions on Android
...
- add syntetic images generation function to ts
- use generated syntetic images
2013-01-23 17:25:30 +04:00
Andrey Kamaev
311d799344
Merge pull request #299 from branch 'bitwangyaoyao_ocl' into 2.4
2013-01-23 14:50:29 +04:00
yao
e05112a364
some host side optimizations to ocl::GaussianBlur
2013-01-23 14:48:04 +04:00
yao
9060365f5e
use format on filtering.cpp
2013-01-23 14:48:04 +04:00
yao
56c1a7fab6
make oclHaarDetectObjects running on more ocl platforms
2013-01-23 14:48:04 +04:00
yao
b5bd2cde9e
A few optimizations to ocl::pyrLK::sparse, make it running on more OCL platforms
2013-01-23 14:48:04 +04:00
yao
f6d82773f9
fix bug #2674
2013-01-23 14:48:04 +04:00
Andrey Kamaev
78dc44a7fd
Merge pull request #295 from apavlenko:test_surf_keypoints_invariance
2013-01-23 14:40:05 +04:00
Anna Kogan
608fab60fd
Added cleanup of keypoints vector
2013-01-22 18:05:18 +04:00
Andrey Kamaev
46c4390a2e
Hardly refactored CMake script for Java wrappers
2013-01-22 17:59:01 +04:00
Andrey Kamaev
c92743d124
Eliminate intermediate build target "opencv_java_api"
2013-01-22 17:59:00 +04:00
mdim
93f8e7ba74
check of keypoint index range in drawMatches
2013-01-22 00:37:27 +04:00
Andrey Kamaev
a45eb275e3
Merge pull request #306 from AnnaKogan8:perf_tests_timing.py-improvement
2013-01-21 18:10:08 +04:00
Vadim Pisarevsky
f14b7af5ac
changed diagnostic from "warning" to "note" in the python wrapper generator, to suppress some noise in opencv utilities
2013-01-21 15:00:32 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
Siegfried Hochdorfer
82a9f9a5a9
MeanshiftGrouping Bugfix (Bug #2685 )
2013-01-17 11:46:24 +01:00
Andrey Pavlenko
a8c0f1d962
fixing test failure on some systems
2013-01-16 18:33:35 +04:00
Andrey Kamaev
7341eaa654
Merge pull request #296 from asmorkalov:html_docs_warning_fix
2013-01-16 16:44:13 +04:00
Andrey Kamaev
bf3c2b0bbb
Fix incorrect Mat address reconstruction on 64-bit platforms
...
This fixes random failures in Java wrappers.
2013-01-15 19:23:49 +04:00
Anna Kogan
0587bef667
Switched time from seconds to minutes
2013-01-15 15:32:22 +04:00
Anna Kogan
3cdfa654ae
Added 'Num of tests' col, changed headers, added 'overall time' row
2013-01-15 15:26:43 +04:00
Andrey Pavlenko
9f0d5f60b5
fixinf warning on non-Windows systems
2013-01-14 18:15:51 +04:00