Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Andrey Kamaev
37e2664cf0
Merge pull request #479 from ilya-lavrenov:TestHighGUI
2013-02-14 11:21:01 +04:00
kobigurk
88e0127f44
API of TiffDecoder back to what it was - normalizeChannelsNumber moved to protected
...
test code unified - channels number is tested for other formats as well
2013-02-13 14:13:36 +02:00
Andrey Kamaev
956aa68fb5
Merge branch '2.4'
2013-02-12 20:30:17 +04:00
Andrey Kamaev
ac389507a0
Fix warnings from ffmpeg wrapper
2013-02-12 19:58:59 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Ilya Lavrenov
5512f91d08
removed libstdc++ dependency
2013-02-12 14:20:23 +04:00
Andrey Kamaev
2ed6bc8aaf
Revert ffmpeg related changes from "thread-safe VideoWriter and VideoCapture"
...
This reverts commit 4abf0b3193
2013-02-11 14:15:29 +04:00
kobigurk
7927ebf20e
alpha channels support for 8-bit tiffs
2013-02-10 01:22:49 +02:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andrey Kamaev
727b6a7259
Merge pull request #408 from asmorkalov:giganetix_cams_patch
2013-02-04 14:56:54 +04:00
Andrey Kamaev
0cd8684ade
Fix setting of FPS after frame width and height with DShow cameras
...
Issue #2114
2013-02-01 18:01:13 +04:00
Alexander Smorkalov
75191e8f2f
Smartek Giganetix Cameras support (Patch #2192 ) integrated to master.
2013-02-01 16:54:00 +04:00
Alexander Smorkalov
25086ed257
Smartek Giganetix Cameras support (Patch #2192 ) integrated.
2013-02-01 16:07:32 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
Andrey Kamaev
2d6253609c
Fix truncation of fourcc value in dshow capture property setter (bug #2535 )
...
Added test checking that all valid fourcc values are converted properly
2013-01-31 12:00:04 +04:00
Andrey Kamaev
9b4f2d1b53
Merge pull request #373 from ilysenkov:bugfix_2440
2013-01-30 19:37:16 +04:00
Ivan Korolev
eaa5012163
fix v4l yes-yes build
2013-01-30 17:04:33 +04:00
Ilya Lysenkov
3c8787980c
Fixed cvDestroyAllWindows() without windows in QT ( #2440 )
2013-01-30 15:26:49 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
81f5e72630
Merge pull request #366 from asmorkalov:gstreamer_codec_list
2013-01-30 14:41:22 +04:00
Alexander Smorkalov
82e325cbfa
Patch #2721 More FourCC for gstreamer applied.
2013-01-30 11:44:14 +04:00
Andrey Kamaev
62ce815197
Fix rollover when computing buffer size in tiff decoder (bug #2161 )
2013-01-30 00:07:33 +04:00
Andrey Kamaev
b4d0dff4c5
Added minimal support for tiff encoder parameters and test for issue #2161
2013-01-30 00:07:30 +04:00
Andrey Kamaev
c78cb21999
Merge pull request #346 from taka-no-me:decouple_V4L2
2013-01-29 19:25:30 +04:00
Andrey Kamaev
287fb2c611
Fix build warning
2013-01-29 14:52:03 +04:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +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
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
Andy Maloney
e87355463f
{highgui} Fix copy-paste error in conditional
2013-01-26 16:38:01 -05:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Vadim Pisarevsky
c197a46e7e
removed rarely used fixed_size parameter from AutoBuffer type, added optional AutoBuffer* but to cvarrToMat in order to speedup CvSeq->Mat conversion; finished conversion of convex hull and related functions to C++
2013-01-20 00:58:51 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
Andrey Kamaev
084b1c7969
Merge branch 2.4
2013-01-11 15:45:23 +04:00
Andrey Kamaev
4e1ba6f02f
Fix build with libjpeg release 9
2013-01-08 19:55:29 +04:00
Vladislav Vinogradov
5138b7d209
Merge branch 'master' into cuda-dev
2012-12-24 13:48:33 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Éric Piel
7701fa7a63
highgui: fix segfault on CvCapture_GStreamer::open
...
when compiled with GStreamer, open (of a file) segfaults.
Fix was suggested by Bostjan Vesnicer.
2012-12-15 12:11:13 +01:00
marina.kolpakova
a6c3ed5b36
Merge branch master into cuda-dev
2012-12-11 01:12:14 +04:00
Andrey Kamaev
67ce03d7dd
Merge branch 2.4
2012-12-10 23:51:34 +04:00
Andrey Kamaev
1821d21f5b
Prevent imread from illegal memory access (Bug #2602 )
...
The change is based on pull request #211 .
2012-12-06 19:42:17 +04:00
Vadim Pisarevsky
7852b68c20
Merge pull request #197 from asmorkalov:ffmpeg_status_message_fix
2012-12-04 21:02:10 +04:00
Alexander Smorkalov
6e0db3f527
Feature #1322 "If dll cannot be loaded a warning should be generated" implemented.
2012-12-03 13:52:49 +04:00
Andrey Kamaev
ae5649d3f7
Drop unsupported imageio from grfmt
2012-12-03 09:56:09 +04:00
Andrey Kamaev
00fbf58902
Revert incompletely applied patch from #2192
...
This reverts commit 2e7656dbdf
2012-12-03 09:55:53 +04:00
Andrey Kamaev
476efd7d37
Drop unsupported yzx and mil camera backends
2012-12-03 09:28:01 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Vladislav Vinogradov
08fbf667f9
refactored opengl functionality
...
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
2012-11-30 17:35:28 +04:00
Alexander Smorkalov
bb3d14e1a0
Patch #2323 "cap_libv4l.cpp clears default width and height after setting them" applied.
2012-11-28 21:53:39 +04:00
Andrey Kamaev
50bebd6f0b
Merge pull request #166 from askforeric:pvapi_updates
2012-11-28 11:31:01 +04:00
askforeric
3923484341
Refactored the PvAPI capture class to better facilitate dynamic property changes
...
- Added Gain control
- Changed default acquisition mode to grayscale
- Fixed a signed/unsigned compare issue
- Implemented frame resizing
- Implemented automatic buffer resizing on frame resize
- Corrected camera initialization so that it attempts to put the camera in Mono8
but does not fail if this doesn't succeed.
2012-11-28 11:28:16 +04:00
Ilya Lavrenov
4abf0b3193
thread-safe VideoWriter and VideoCapture
2012-11-19 16:44:23 +04:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
b131dfeecd
Build tutorial codes together with other samples
...
These codes should be included into regular builds.
2012-11-09 10:15:48 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
Andrey Kamaev
fd4909360f
Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.
2012-11-01 12:44:10 +04:00
Andrey Kamaev
8dbde3297e
Merge branch '2.4'
2012-10-23 20:32:19 +04:00
Andrey Kamaev
2e91405833
Fix OS X build warnings
2012-10-22 20:33:14 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Evgeny Talanin
5dd1ec98f7
#720 patch apply
2012-10-12 14:25:36 +04:00
Evgeny Talanin
2e7656dbdf
#2192 patch apply
2012-10-12 13:03:43 +04:00
Andrey Kamaev
f41ab3a330
Merge pull request #34 from roynos/master
2012-10-11 16:31:20 +04:00
Evgeny Talanin
bd4620f04e
#2408 patch apply (see pull request at https://github.com/Itseez/opencv/pull/33 )
2012-10-11 14:38:25 +04:00
Vadim Pisarevsky
63c9412922
enable huge value range in highgui sliders on Windows (patch #941 )
2012-10-10 23:05:15 +04:00
Vadim Pisarevsky
0e314163e5
fixed INT64_C & UINT64_C definitions (patch #2033 )
2012-10-10 17:27:32 +04:00
Vadim Pisarevsky
a09c88ab16
added Asus Xtion QVGA modes to the OpenNI backend (patch #1753 )
2012-10-09 22:01:43 +04:00
Vadim Pisarevsky
3243ad3483
applied patch #1473 (timestamp retrieval in OpenNI)
2012-10-09 21:52:41 +04:00
Roy Reapor
5d9d4659ad
Fixed issue 2404
...
- imdecode_() only creates a temporary file when needed.
- Use the string's empty() function to flag if the temporary file needs
to be deleted.
2012-10-03 23:06:59 -07:00
Vadim Pisarevsky
c9f1490302
added variant of cv::imdecode with the specified output matrix
2012-10-01 16:23:40 +04:00
Vadim Pisarevsky
420dd22258
fixed a few warnings reported by Oleg; restored SSE2 optimization in FAST
2012-10-01 14:12:19 +04:00
marina.kolpakova
dc568d4de1
fix for 4-channels TIFF missing 'break' statement
2012-10-01 08:33:56 +04:00
Vadim Pisarevsky
40d5b026c7
fixed verbose mode in highgui's DirectShow wrapper (bug #2350 )
2012-09-19 16:57:10 +04:00
Vadim Pisarevsky
4e07561141
fixed possible compile error in cap_ffmpeg_impl.hpp (bug #2365 )
2012-09-19 16:48:19 +04:00
Vadim Pisarevsky
d9e801fbfa
improved image rendering performance in Qt backend for highgui UI (bug #2356 )
2012-09-17 16:13:53 +04:00
Vadim Pisarevsky
bb93651048
added support for bi-level PNG's (patch #2301 ; thanks to Costantino Grana)
2012-09-11 14:05:25 +04:00
Andrey Kamaev
f268af8ef0
Removed remaining SWIG marks from headers
2012-09-07 22:19:43 +04:00
Alexander Smorkalov
710e070990
Native camera issue on HTC One S fixed.
...
Camera connect->disconnect->connect leads to sigsegv.
Apply properties method reimplemented.
2012-09-07 17:22:47 +04:00
Andrey Kamaev
bcd0aefbca
Fix gcc build errors and warnings
2012-09-05 15:51:51 +04:00
Andrey Kamaev
577d9cdece
Fix openexr build on MinGW
2012-09-02 20:44:09 +04:00
Andrey Kamaev
941391c0be
Fix openexr build with MSVC
2012-09-02 20:44:07 +04:00
Vadim Pisarevsky
2367a195c5
probably fixed compile error on MacOSX 10.6
2012-08-31 14:35:11 +04:00
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Andrey Kamaev
7744b1d600
Android camera: fix logging macro part 2
2012-08-28 15:07:42 +04:00
Vadim Pisarevsky
e2c9e7c3fb
applied patches from #2311
2012-08-28 14:19:34 +04:00
Andrey Kamaev
71df8906be
Android camera: commented logs in frame callback
2012-08-24 16:10:17 +04:00
Andrey Kamaev
ad35f317f6
Fix buffer allocation in Android camera
2012-08-24 16:10:17 +04:00
Vadim Pisarevsky
e95bc7d502
fixed ios camera timing (patch by Eduard Feicho)
2012-08-22 13:33:13 +04:00
Vadim Pisarevsky
0d2b8f4ba1
fixed the channel ordering of rgba images (by Eduard)
2012-08-21 15:41:05 +04:00
Vadim Pisarevsky
8efb84b5a4
added ios camera support in highgui. turned on optimization in opencv2.framework (ticket #2232 )
2012-08-20 19:36:36 +04:00
Andrey Kamaev
d525362cd5
Fixed 2 new Android build warnings
2012-08-13 19:24:31 +04:00
Sam Bromley
8506ce06c1
Fix missing remainder of line.
2012-07-26 12:46:51 -02:30
Sam Bromley
966a652142
Fix crash when polling for non-existent Kinects.
...
If no Kinects are present, crash can result from
stepping beyond end of device list. Now we check
to ensure this does not happen.
2012-07-26 12:36:21 -02:30
Maria Dimashova
469ec7c522
fixed vfw ( #2156 )
2012-07-11 09:04:25 +00:00
Maria Dimashova
bc3fb347a3
fixed #2155
2012-07-11 08:41:09 +00:00
Marina Kolpakova
d88bbb3d9d
fixed undefined behaviour in image codecs initialization
2012-07-08 18:26:28 +00:00
Andrey Kamaev
df262b340c
Fixed #2125
2012-07-02 14:20:59 +00:00
Vadim Pisarevsky
7ef2114107
added fullscreen mode on Mac (patch #2040 by Takahiro Horikawa)
2012-07-01 20:25:24 +00:00
Andrey Kamaev
27c23b557c
Merged few small fixes from 2.4 branch
2012-06-30 13:36:27 +00:00
Andrey Kamaev
4d09d62f85
Added Ptr<T> support to AlgorithmInfo; fixed some warnings
2012-06-29 07:46:53 +00:00
Vadim Pisarevsky
7c778fc043
fixed possible video distortion problem when cap_avfoundation.mm is used to capture video (ticket #1980 )
2012-06-28 16:34:53 +00:00
Andrey Kamaev
a323da6fd5
Fixed some warnings and install problems on linux
2012-06-27 12:02:31 +00:00
Andrey Kamaev
f9418853a0
Applied XIMEA path (by Marian Zajko) with multiple changes #2054
2012-06-26 11:47:49 +00:00
Andrey Kamaev
5e0160d711
Fixed few warnings on Linux
2012-06-21 12:44:48 +00:00
Andrey Kamaev
25f70e691a
Fixed warnigs from zlib defines
2012-06-21 10:28:57 +00:00
Andrey Kamaev
e94e5866a1
Fixed mingw build warnings
2012-06-20 17:57:26 +00:00
Andrey Kamaev
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Andrey Kamaev
16c94d643f
Fixed #2053
2012-06-15 06:40:20 +00:00
Marina Kolpakova
f273e54be3
fixed part of shadow warnings
2012-06-13 13:21:51 +00:00
Andrey Kamaev
7cccc93bdf
Fixed Android build warnings and few warnings in specific cnfigurations
2012-06-13 13:19:43 +00:00
Maria Dimashova
f363c835ab
fixed compilation error and some warnings if with_openni is true
2012-06-13 08:38:30 +00:00
Andrey Kamaev
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +00:00
Marina Kolpakova
09d4d69100
minor warning fixes
2012-06-09 15:24:36 +00:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
Andrey Kamaev
2f40905548
Fixed Android build
2012-06-08 08:11:17 +00:00
Andrey Kamaev
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
677680d82d
reverted the original VideoCapture::read() code; moved frame index check to where it should belong: ffmpeg wrapper; applied patch by Rob Reilink (ticket #1971 )
2012-06-01 08:55:16 +00:00
Andrey Kamaev
c492dc6a83
Fixed property names in cap_dshow #1993
2012-05-29 05:41:46 +00:00
Andrey Kamaev
e161f428a0
Fixed PvAPI search on Windows #1927
2012-05-24 20:10:13 +00:00
Alexander Mordvintsev
8429c109be
FIX: VideoCapture::read() was returning empty image for camera captures
2012-05-22 07:58:31 +00:00
Andrey Kamaev
c9027fecc0
Fixed few MinGW build problems
2012-05-20 18:45:19 +00:00
Andrey Kamaev
9961658eab
Fixing compile on some MinGW platforms
2012-05-19 10:44:43 +00:00
Andrey Kamaev
def87eae19
Fixed MinGW build after r8358
2012-05-17 20:19:48 +00:00
Vadim Pisarevsky
00c30681bc
Added Snap-to-Screen Edge feature in the case of multiple monitors (patch by Adi Shavit)
2012-05-16 16:13:24 +00:00
Vadim Pisarevsky
f620f1ce57
fixed building avfoundation on MacOSX with iOS targets
2012-05-15 15:34:53 +00:00
Alexander Reshetnikov
57e26bde9f
Accelerating the completion of video bypass (bug #1893 )
2012-05-05 17:28:05 +00:00
Alexander Reshetnikov
3ec43a11ed
Fixed read error in VideoCapture for images (bug #1892 ); minor fix of ffmpeg wrapper warning
2012-05-05 14:43:03 +00:00
Andrey Kamaev
3a1f85d4e8
Remerged the 2.4.0 branch
2012-05-02 20:20:14 +00:00
Vladislav Vinogradov
ca57239618
fixed some problems after r8280 (lost code)
2012-05-02 13:07:30 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vladislav Vinogradov
f4b4665940
added VideoReader_GPU
2012-04-18 11:18:25 +00:00
Vladislav Vinogradov
70909738f4
added support of different surface formats to VideoWriter_GPU
...
added key frame handling to ffmpeg wrappers
2012-04-17 11:08:08 +00:00
Vladislav Vinogradov
2bfaf540a1
added VideoWriter_GPU
2012-04-17 07:12:16 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Alexander Shishkov
9bfd50e6ae
merged revisions r7802,r7804,r7805 from 2.4 branch
2012-04-03 00:33:33 +00:00
Alexander Reshetnikov
1c616f43ba
Fixed compilation error with ffmpeg 0.9.x & 0.10.x
2012-03-31 17:06:35 +00:00
Alexander Reshetnikov
4ec2ad91b9
Removed duplicated includes from ffmpeg wrappers
2012-03-31 15:27:48 +00:00
Alexander Reshetnikov
958d5a0caa
Solved a problem with VideoWriter in the new wrapper
2012-03-31 15:12:45 +00:00
Alexander Reshetnikov
ab0fc84781
Fixed compilation error under Ubuntu 11.10; added #if-#else-#endif code for some deprecated functions
2012-03-31 15:10:13 +00:00
Vadim Pisarevsky
1e5a600d13
fixed video capturing on Mac running Windows (ticket #988 )
2012-03-31 08:56:48 +00:00
Vadim Pisarevsky
f309bafe9e
another fix for cap_dshow.cpp; fixed warning in facerec_demo
2012-03-30 20:06:06 +00:00
Alexander Reshetnikov
3a564d1ae8
Updated displayOverlay's implementation & documentation (ticket #903 )
2012-03-30 19:58:44 +00:00
Andrey Kamaev
7a017973bf
Fixed Windows build (MSVC 10 Win32)
...
internal CV_CAP_PROP_ZOOM is renamed to CV_CAP_PROP_ZOOM_DSHOW
internal CV_CAP_PROP_FOCUS is renamed to CV_CAP_PROP_FOCUS_DSHOW
2012-03-30 19:26:15 +00:00
Vadim Pisarevsky
f0b8b81caa
applied big patch #1281 by Martin Beckett (various direct show video capture enhancements)
2012-03-30 18:39:03 +00:00
Alexander Reshetnikov
aff34adf1b
Updated new ffmpeg wrapper
2012-03-30 16:57:41 +00:00
Alexander Reshetnikov
e00f1e3911
Fixed a problem with CODEC_ID_RAWVIDEO in FFMPEG (ticket #1400 )
2012-03-30 14:30:24 +00:00
Vadim Pisarevsky
38f686252c
added video stream positioning in QTKit-based VideoCapture backend (patch #1420 )
2012-03-30 14:13:21 +00:00
Alexander Reshetnikov
554e0051e8
Fixed error with color space switching for IEEE1394 cameras (patch #766 )
2012-03-29 16:15:55 +00:00
Alexander Shishkov
0ac70e6883
fixed #1421
2012-03-29 13:46:54 +00:00
Alexander Reshetnikov
1564fe9a83
Fixed segfault problem with cap_unicap (ticket #1112 )
2012-03-29 12:20:06 +00:00
Alexander Reshetnikov
ee8c4aeb4b
Updated close method for ieee1394 cameras
2012-03-29 11:56:53 +00:00
Andrey Kamaev
d46f44b48a
#1695 fixed arrow key events with the Qt backend
2012-03-28 22:22:02 +00:00
Alexander Reshetnikov
2a68228b66
changed icvSetVideoSize function (ticket #1067 )
2012-03-28 16:14:36 +00:00
Andrey Kamaev
9941cf7c95
Fixed MSCV2005 build with TBB enabled.
2012-03-27 23:17:53 +00:00
Vadim Pisarevsky
8513ed08d0
probably fixed multi-threaded capturing from DShow cameras (ticket #1470 )
2012-03-27 12:50:56 +00:00
Maria Dimashova
f70d171cef
changed default parameter
2012-03-27 08:37:39 +00:00
Maria Dimashova
550fd8e57c
added image and depth synchronization
2012-03-27 07:41:48 +00:00
Alexander Reshetnikov
1d7e09a9d5
Removed duplicated ifdef code from ffmpeg wrappers
2012-03-26 13:51:05 +00:00
Alexander Reshetnikov
1a04d09140
Fixed compilation error for ffmpeg tests
2012-03-26 12:27:00 +00:00
Vladislav Vinogradov
9034a2d6d7
fixed gpu arithm functions (mismatch with cpu version)
2012-03-26 11:02:03 +00:00
Alexander Reshetnikov
c6571249a8
Update FFMPEG wrapper binaries
2012-03-23 10:59:06 +00:00
Alexander Shishkov
84ddd6018d
fixed wrapper compilation on Windows (opencv_ffmpeg dlls)
2012-03-23 10:52:36 +00:00
Alexander Reshetnikov
e83ebde210
Fixed ifdef code mistake
2012-03-22 23:17:04 +00:00
Alexander Reshetnikov
b27d1662e6
Separated ffmpeg codecs and wrappers
2012-03-22 21:28:06 +00:00
Andrey Pavlenko
23619718ed
fixing copy/paste typo
2012-03-22 13:23:11 +00:00
Alexander Reshetnikov
0dd4386d77
Updated new ffmpeg wrapper; restored NEW_FFMPEG in the root cmake file
2012-03-21 18:07:34 +00:00
Maria Dimashova
499efec5b0
removed debug log
2012-03-21 14:47:13 +00:00
Maria Dimashova
c1a6cb6221
added oni-files reading
2012-03-21 14:31:40 +00:00
Alexander Reshetnikov
82a2a50f87
Updated new ffmpeg wrapper
2012-03-21 12:54:52 +00:00
Maria Dimashova
fedff0922e
removed unnecessary members of CvCapture_OpenNI
2012-03-21 11:58:25 +00:00
Maria Dimashova
67d7669188
switched to use RunXmlScript always (missing '\n' at the end of xml script was a problem)
2012-03-21 08:56:38 +00:00
Alexander Reshetnikov
5d4a8d0889
Updated license text in highgui files
2012-03-20 16:39:02 +00:00
Alexander Reshetnikov
4dff974e8c
Refactored new ffmpeg wrapper
2012-03-20 09:17:28 +00:00
Alexander Reshetnikov
484fe1d598
Fixed compiling error for ffmpeg with libavcodec less than 53.4.0
2012-03-19 09:05:55 +00:00
Vadim Pisarevsky
846e37ded5
fixed many warnings from GCC 4.6.1
2012-03-17 09:22:31 +00:00
Vadim Pisarevsky
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
Maria Dimashova
baa81de122
renamed property of openni camera
2012-03-16 13:59:08 +00:00
Maria Dimashova
00aca7e77a
renamed property of openni camera
2012-03-16 09:08:18 +00:00
Alexander Shishkov
7f2ddf16eb
minor changes in wrapper 5
2012-03-15 20:39:11 +00:00
Alexander Shishkov
6546719158
minor changes in wrapper 4
2012-03-15 20:30:21 +00:00
Alexander Shishkov
a12fb7f96c
minor changes in wrapper 3
2012-03-15 20:14:59 +00:00
Maria Dimashova
930c7bf20e
minor refactoring CvCapture_OpenNI
2012-03-15 15:55:07 +00:00
Alexander Shishkov
538eeeab1d
minor changes in wrapper 2
2012-03-15 15:43:14 +00:00
Alexander Shishkov
10b0f29372
minor changes in wrapper
2012-03-15 15:36:14 +00:00
Alexander Shishkov
bf4df828f7
minor changes in wrapper
2012-03-15 15:30:01 +00:00
Alexander Shishkov
7b3ec537b4
minor changes in wrapper
2012-03-15 15:12:52 +00:00
Maria Dimashova
c13febc4d4
minor refactoring CvCapture_OpenNI::CvCapture_OpenNI
2012-03-15 09:59:23 +00:00
Alexander Reshetnikov
36b2ff3cf3
Fixed compiling error under Ubuntu with ffmpeg 0.7.x and advised under Windows
2012-03-15 09:24:03 +00:00
Alexander Shishkov
0ea66a38ff
fixed compilation FFMPEG wrapper on Windows
2012-03-15 07:22:31 +00:00
Alexander Reshetnikov
e0b772a392
Added a first version of new ffmpeg wrapper
2012-03-12 17:07:54 +00:00
Alexander Shishkov
6051e27a09
added support of Asus XtionPRO (thanks to Gustav Karlsson for his patches) #1657
2012-03-12 16:07:42 +00:00
Alexander Shishkov
d05b788db4
fixed compilation problems with MinGW after rev7353
2012-02-28 12:39:25 +00:00
Andrey Kamaev
216d75ccae
Restored missed }
2012-02-24 12:45:23 +00:00
Alexander Reshetnikov
9b5534a6e0
Fixed syntax error in cap_dc1394_v2.cpp
2012-02-24 12:27:20 +00:00
Alexander Reshetnikov
b12f18536f
Added new VideoCapture properties for ieee1394 cameras
2012-02-24 10:54:52 +00:00
Alexander Reshetnikov
8b7edda6ac
Added cvShowImage working with handles under Windows.
2012-02-22 13:30:47 +00:00
Alexander Shishkov
50df95650a
fixed #924
2012-02-22 12:16:01 +00:00
Alexander Shishkov
f7866677eb
fixed #1615
2012-02-22 12:13:56 +00:00
Vladislav Vinogradov
2d30480982
created wrappers for new NPP functions
...
removed void integral(const GpuMat& src, GpuMat& sum, GpuMat& sqsum, Stream& stream) - it fails with NPP_NOT_IMPLEMENTED error
updated docs, accuracy and performance tests
2012-02-22 10:00:53 +00:00
Andrey Kamaev
e426dfc396
Fixed #1613 : removed YUV420i color conversion constants
2012-02-21 15:08:03 +00:00
Alexander Reshetnikov
f83aa74bc4
Updated ffmpeg implementation (setProperty & getProperty methods)
2012-02-18 12:56:00 +00:00
Vadim Pisarevsky
716a5d04ab
fixed a few problems detected by Xcode 4.2.1
2012-02-15 19:48:04 +00:00
Anatoly Baksheev
84db4eb6fa
fixed ~200 warnings for windows
...
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
2012-02-14 10:22:34 +00:00
Alexander Shishkov
7c03b301c1
fixed #927 issue
2012-02-09 10:53:16 +00:00
Alexander Shishkov
c761996a28
fixed #927 issue
2012-02-08 15:29:07 +00:00
Alexander Shishkov
06247b49af
fixed issue #1243
2012-02-06 08:13:11 +00:00
Andrey Kamaev
984eb99428
Global CMake reorganization:
...
[~] Automatically tracked dependencies between modules
[+] Support for optional module dependencies
[+] Options to choose modules to build
[~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
[+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
[~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Andrey Morozov
386578bc3f
fixed compile error
2012-02-01 09:54:18 +00:00
Alexander Reshetnikov
a41b0902f4
Prepared some videos for future tests. Added first version of common positioning video test.
2012-01-31 21:02:05 +00:00
Andrey Morozov
196ac49fcf
fixed of the ticket #1442
2012-01-26 11:36:12 +00:00
Vadim Pisarevsky
403a7ff391
fixed memory leak in cap_libv4l.cpp (ticket #1518 ; thanks to gorgen for the patch)
2012-01-26 08:37:24 +00:00
Vladislav Vinogradov
6310622be3
minor
2011-12-13 06:25:37 +00:00
Vladislav Vinogradov
061f032719
fixed build under linux
2011-12-12 13:57:37 +00:00
Vladislav Vinogradov
3afc97e67e
fixed new OpenGL functionality under Qt
2011-12-12 12:52:06 +00:00
Vladislav Vinogradov
1a1d167bb8
fixed build under linux
2011-11-30 06:45:46 +00:00
Vladislav Vinogradov
bd4239be7b
moved OpenGL wrappers to separate header
...
added GlBuffer, GlTexture and GpuMat support to InputArray
replaced addTextOpenGl function by render + GlFont
2011-11-30 06:20:29 +00:00
Vladislav Vinogradov
0403746636
implemented addTextOpenGl under Gtk
2011-11-28 12:35:05 +00:00
Vladislav Vinogradov
07debd6cb5
minor fix
2011-11-28 12:10:37 +00:00
Vladislav Vinogradov
9817252b23
added addTextOpenGl function
2011-11-28 11:50:46 +00:00
Vladislav Vinogradov
2a4fb155e1
added OpenGL support to Gtk realization of highgui
2011-11-28 08:23:26 +00:00
Vladislav Vinogradov
35e69a1ee3
fixed build with Qt
2011-11-27 10:13:08 +00:00
Vladislav Vinogradov
d7450c2449
added GlArrays class and pointCloudShow function
2011-11-23 10:05:24 +00:00
Vladislav Vinogradov
4d09737a02
fixed compilation error
2011-11-21 12:28:54 +00:00
Vladislav Vinogradov
c2783af781
added OpenGL support to highgui under WIN32
2011-11-21 11:58:52 +00:00
Vadim Pisarevsky
325e0b1ab8
fixed ffmpeg backend build on Ubuntu 11.10
2011-11-04 16:44:52 +00:00
Vadim Pisarevsky
448a252776
added compression strategy as a parameter (another request from ticket #1452 )
2011-10-28 04:11:02 +00:00
Vadim Pisarevsky
17c3102705
improved png compression ratio (ticket #1452 )
2011-10-28 02:22:11 +00:00
Vadim Pisarevsky
a512883170
fixed bug #1388
2011-09-27 15:23:43 +00:00
Andrey Kamaev
6167469bbd
Fixed fullscreen window mode on Windows.
2011-09-11 18:54:25 +00:00
Vadim Pisarevsky
df5c60c50a
added missing cv::moveWindow & cv::resizeWindow
2011-08-27 20:05:07 +00:00
Artem Myagkov
3a3bc18381
modified capturing building ligic for iOS
2011-08-24 10:53:57 +00:00
Artem Myagkov
8c6782300a
modified highgui and ts modules and cmakelists for ios cross-compiling, added ios toolchains, added ios build tutorial
2011-08-23 11:19:58 +00:00
Andrey Kamaev
014ba699a3
Attempt to fix a build problem (ambiguous PixelType error when compiled on Mac x86)
2011-08-19 19:18:32 +00:00
Vadim Pisarevsky
c66ed3e02f
fixed Ximea constructor call
2011-08-15 14:23:55 +00:00
Vadim Pisarevsky
c65c67eff4
preserve alpha channel in PNG, when imread(..., -1) is called (ticket #1107 )
2011-08-11 22:38:09 +00:00
Vadim Pisarevsky
bd0d8429ee
added support for Ximea cameras (patch by Marian Zajko), fixed GCC warnings in MOG2 background subtractor.
2011-08-11 17:59:30 +00:00
Maria Dimashova
ec150c24e3
added CV_CAP_PROP_OPENNI_REGISTRATION property for getting
2011-08-09 13:58:05 +00:00
Maria Dimashova
1f07209f6c
fixed CvCapture_OpenNI constructor (removed all exceptions) ( #1237 )
2011-08-08 15:47:52 +00:00
Andrey Morozov
bba4f9e5d6
removed property. added automatically define number of cpus for decoding video
2011-08-02 14:27:21 +00:00
Vadim Pisarevsky
ce2f4c6a4d
propagated fix for EXR from 2.3 branch to trunk
2011-08-02 12:55:05 +00:00
Andrey Morozov
d0176d69f2
fixed property for ffmpeg
2011-08-01 16:05:34 +00:00
Andrey Morozov
c697f6a3f8
fixed build ffmpeg v0.8.1
2011-07-31 17:34:31 +00:00
Andrey Morozov
c55a37ad7c
fixed build with ffmpeg 0.5.X
2011-07-30 10:26:37 +00:00
Andrey Morozov
c0a0c881ee
minor fix
2011-07-30 07:52:06 +00:00
Andrey Morozov
418bc6dbe9
minor fix for ffmpeg
2011-07-29 14:37:54 +00:00
