Andrey Kamaev
98fdd70466
Merge pull request #339 from vpisarev:core_fixes
2013-01-29 15:51:22 +04:00
Andrey Kamaev
287fb2c611
Fix build warning
2013-01-29 14:52:03 +04:00
Andrey Kamaev
78a338159d
Merge branch '2.4'
2013-01-29 14:17:13 +04:00
Andrey Kamaev
013e9294f6
Merge branch '2.4'
2013-01-29 14:16:48 +04:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +04:00
Andrey Kamaev
63873a8393
Merge pull request #355 from asmaloney:copy_paste_cond
2013-01-29 14:13:01 +04:00
Andrey Kamaev
519e23bf0b
Merge pull request #354 from asmaloney:fix_mem_dealloc
2013-01-29 14:12:12 +04:00
Andrey Kamaev
da884b4e1d
Merge pull request #347 from asmorkalov:WITH_FFMPEG_logic
2013-01-29 14:00:10 +04:00
Vadim Pisarevsky
e7cbf65280
Merge pull request #351 from vpisarev:python_fixes
2013-01-29 13:34:50 +04:00
Alexander Smorkalov
8c45b9d03d
Video IO perf tests guarded.
2013-01-29 11:09:49 +04:00
cuda-geek
04f01ed21d
Merge pull request #353 from asmaloney:arg_checks
2013-01-29 11:04:33 +04:00
cuda-geek
11dfceb2c9
Merge pull request #328 from jet47:new-gpu-fixes
2013-01-29 11:00:37 +04:00
Andy Maloney
bdf189faac
{calib3d} Fix copy-paste error in conditional
2013-01-28 18:09:10 -05:00
Andy Maloney
5bd56e7464
Fix mem leak and mismatched new/delete
2013-01-28 17:57:19 -05:00
Andy Maloney
7a6475c3f9
Check pointers before using them in var init
2013-01-28 16:51:28 -05:00
Andrey Kamaev
2b4ffd1161
Merge pull request #350 from asmorkalov:android_java_warnings
2013-01-28 23:57:14 +04:00
Andrey Kamaev
d7ea27b279
Merge pull request #349 from Daniil-Osokin:bugfix_opencv_cheatsheet
2013-01-28 23:56:55 +04:00
Andrey Kamaev
3a9c978b5e
Merge pull request #348 from Daniil-Osokin:bugfix_YCrCb_formula
2013-01-28 23:56:42 +04:00
Andrey Kamaev
6abb69bd25
Merge pull request #345 from Daniil-Osokin:bugfix_2550
2013-01-28 23:56:26 +04:00
Andrey Kamaev
17130477c9
Merge pull request #344 from taka-no-me:improve_jpeg_encoder_errors
2013-01-28 23:56:01 +04:00
Vadim Pisarevsky
4044fbcb33
hopefully fixed handling of 'long' Python type in OpenCV bindings (bug #2193 ). added the corresponding test
2013-01-28 21:03:59 +04:00
Vadim Pisarevsky
2320ec76b4
Extended python bindings to support scalar values and tuples in place of InputArray (i.e. Mat) - ticket #2658 . Added tests for #2611 , #2505 , #2658
2013-01-28 20:45:00 +04:00
Vadim Pisarevsky
a519bbc617
Extended python bindings to support scalar values and tuples in place of InputArray (i.e. Mat) - ticket #2658 . Added tests for #2611 , #2505 , #2658
2013-01-28 20:44:47 +04:00
Andrey Kamaev
09d93af975
Merge pull request #343 from taka-no-me:fix_nlmeans_2646
2013-01-28 20:35:39 +04:00
Alexander Smorkalov
ca98710640
Resolve warning in OpenCV Library project in Eclipse (Bug #2714 )
...
Warning in auto generated code was suppressed by project settings.
2013-01-28 19:44:58 +04:00
Daniil Osokin
e33f3e8345
Fixed cheatsheet for loop (bug #2701 )
2013-01-28 18:41:59 +04:00
Vadim Pisarevsky
cd46a674d1
applied patch #2611 that also likely fixes #2505
2013-01-28 18:30:20 +04:00
Daniil Osokin
4c9c27b244
Fixed formula of YCrCb to RGB conversion (bug #2725 )
2013-01-28 18:29:01 +04:00
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
Daniil Osokin
f9bff103dd
Removed obsolete steps from Windows installation tutorial (bug #2550 )
2013-01-28 17:46:03 +04:00
Vadim Pisarevsky
146ca61a27
added tests for #1373 , #2629 , #2719 ; fixed another bug in determinant(Matx<T,n,n>)
2013-01-28 17:27:08 +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
255cd61a8c
Improve error reporting of JPEG image encoder
...
OpenCV issue #2604
After this patch applied an attempt to encode empty images produces exception
saying "Raw image encoder error: Empty JPEG image (DNL not supported)"
2013-01-28 16:55:00 +04:00
Andrey Kamaev
7374445398
Fix integer overflow in NL-Means denoising on white input
...
Issues #2646
2013-01-28 14:35:51 +04:00
Andrey Kamaev
7e92826efc
Add test for issue #2646
2013-01-28 14:35:51 +04:00
Andrey Kamaev
d83914d478
Change Imgproc_ prefix to Photo_ in all accuracy tests of photo module
2013-01-28 14:01:22 +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
Vadim Pisarevsky
1df10553bb
fixed bugs #1373 , #2629 , #2719
2013-01-25 23:45:41 +04:00
Andrey Kamaev
9de36c5592
Merge pull request #338 from taka-no-me:ocl_warnings_master
2013-01-25 19:08:53 +04:00
Andrey Kamaev
d3aef0d378
Fix OpenCL build warnings
2013-01-25 18:41:06 +04:00
Andrey Kamaev
2e02654004
Fix build of Java tests
2013-01-25 17:08:36 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04: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
b445f4b01d
Find OpenCL in AMD APP SDK
2013-01-25 14:15:26 +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
