mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-03 00:10:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,632 Commits 6 Branches 126 Tags 3 GiB
3558da9ab7
Commit Graph

901 Commits

Author SHA1 Message Date
Hanusz Leszek
cf39ba5801 Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel 
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
 2013-08-21 05:31:44 +02:00
Roman Donchenko
47b3e7855f Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix 2013-08-16 14:05:39 +04:00
Roman Donchenko
46fb737bdc Merge pull request #1152 from StevenPuttemans:bugfix_2795 2013-08-16 12:52:48 +04:00
Alexander Smorkalov
9af2c1661a Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch 
for libpng added.
 2013-08-15 06:42:00 -07:00
kamjagin
69287c936b missed # in if defined 2013-08-14 14:25:46 +02:00
kamjagin
c24c1a5926 added HAVE_QTKIT to tests 2013-08-14 13:40:50 +02:00
kamjagin
7ff07e94a3 Fix for bug Bug #3215. Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME 2013-08-14 13:34:34 +02:00
Roman Donchenko
dc06d47f1c Merge pull request #1241 from SpecLad:redundant-precomps 2013-08-12 17:19:53 +04:00
Roman Donchenko
504ebda7c4 Merge pull request #1235 from WonderRico:bugfix_dshow 2013-08-12 14:33:30 +04:00
WonderRico
d067749c21 fix _index / index 2013-08-12 11:19:53 +02:00
StevenPuttemans
d11746e56d Added fix mentioned in bug #3206 
VideoWriter memory leak solved.
 2013-08-12 09:49:19 +02:00
WonderRico
a048387376 fix formating 2013-08-09 16:13:40 +02:00
Roman Donchenko
d9f71b762f Deleted almost all of the precomp.cpp files. 
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
 2013-08-08 12:43:07 +04:00
StevenPuttemans
ed76b2f98f Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong 
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
 2013-08-07 14:49:33 +02:00
WonderRico
7e7fb0b75d Bug #3201 fix 2013-08-06 18:35:49 +02:00
Andrey Pavlenko
6483754860 Merge pull request #1220 from asmorkalov:msmf_sizet_fix 2013-08-05 10:26:39 +04:00
Andrey Pavlenko
af8a03e17f Merge pull request #1222 from philippefoubert:branch_2.4_pvapi 2013-08-05 10:20:25 +04:00
Alexander Smorkalov
aada5f7844 Difference in method definition and declaration fixed (Bug #3189). 2013-08-04 22:34:36 +04:00
StevenPuttemans
f28496c628 Added sample links in documentation for python2, ocl and gpu 2013-08-02 14:05:08 +02:00
Andrey Pavlenko
d138f77143 Merge pull request #1019 from jet47:opengl-documentation 2013-07-31 15:10:27 +04:00
Andrey Pavlenko
6a40067424 Merge pull request #1206 from StevenPuttemans:feature_3169 2013-07-31 14:31:21 +04:00
StevenPuttemans
4dff5b7c72 Added bugfix #2795 
- changing license header
- fixed bug in QtKit when changing camera resolution
 2013-07-31 11:25:55 +02:00
StevenPuttemans
0c5244103f Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169 
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
 2013-07-31 11:20:05 +02:00
Andrey Pavlenko
2b8d868560 Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix 2013-07-30 17:50:50 +04:00
Andrey Pavlenko
f7ce70f70a Merge pull request #1110 from SpecLad:config-cleanup 2013-07-30 17:39:35 +04:00
Frédéric Devernay
6be8757e8b fix signedness error 
OpenCV's automatic builds don't care if you store an unsigned int into
an int, but they don't want you to compare signed with unsigned. Does
that make sense?
 2013-07-26 21:32:35 +02:00
Frédéric Devernay
4ad12a680c fix cap_qtkit.mm for multithreaded applications 
cap_qtkit does not work when the capture is run outside of the main
thread.
If the capture is launched in a separate thread, then [NSRunLoop
currentRunLoop] is not the same as in the main thread, and has no timer.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"

Using usleep() (which I previously proposed, and was reverted) is not a
good alternative, because it may block the GUI.

Here is the new proposed solution:
- create a dummy timer so that runUntilDate does not exit immediately
- simplify the loop by using runUntilDate instead of runMode:beforeDate
- fix potential memory leaks (pointed out by Xcode's static analysis)
- fix init to follow Objective-C guidelines
- fax warnings about conversions from size_t to int
 2013-07-26 18:39:03 +02:00
Philippe FOUBERT
9c04db554f Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS 2013-07-20 15:03:30 +02:00
Vadim Pisarevsky
be040ff513 revert patch from PR 1074, since it break capturing on MacOSX 2013-07-16 15:02:33 +04:00
Nikita Manovich
05aeb70831 Fixed VideoCapture::open() does not release previous capture sources (Bug #3150). 
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
  bool VideoCapture::open(const string& filename);
  bool VideoCapture::open(int device);

The methods first call VideoCapture::release() to close the already opened file or camera.
 2013-07-11 15:16:22 +04:00
Roman Donchenko
06742247be Removed unused PACKAGE_* macros. 2013-07-11 14:30:46 +04:00
Roman Donchenko
e2ef2a5781 Refactored image format library finding logic. 
Now the HAVE_* macros are set in cvconfig.h. Most of them already were there,
but were nonfunctional.
 2013-07-11 12:40:16 +04:00
Roman Donchenko
ca8b621b4f Refactored detecting several Apple-related technologies. 
Now the HAVE_* macros are set using cvconfig.h. Previously most
of them already were there, but were always undefined. One,
HAVE_COCOA, I had to add.

This also makes the CMake code more consistent; now, WITH_* variables
are always checked in cmake/*, while HAVE_* variables are checked in
modules/highgui/CMakeLists.txt.
 2013-07-10 19:45:56 +04:00
Roman Donchenko
4f9554eead Removed a few more unused configuration macros. 
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.

Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
 2013-07-10 18:29:11 +04:00
Roman Donchenko
ac39bfb4cc Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
Alexander Smorkalov
f77d1f57ee V4L and V4L2 based Video capture bug fix (Bugfix #3144). 2013-07-09 16:07:55 +04:00
Andrew Senin
aa2ca3aa8f Improve FPS on black and white Ximea cameras 2013-07-09 00:33:39 +04:00
Philippe FOUBERT
639450efdc PvAPI support on Windows with MinGW (PR #1038 applied to the branch 2.4) 2013-07-03 00:19:22 +02:00
Frédéric Devernay
b524e275c1 allow QtKit capture in secondary threads 
[NSRunLoop currentRunLoop] is not the same as in the main thread.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"

The old code caused grabFrame() to return immediately if the capture
was not done in the main thread.
This code works correctly, even in secondary threads, provided that all
capture functions are called in the *same* thread
 2013-07-02 18:08:12 +02:00
Roman Donchenko
4b51b1e3a8 Merge pull request #1059 from dominikrose:dc1394_2-1394b 2013-06-28 14:47:45 +04:00
Roman Donchenko
1707b1769f Merge pull request #1063 from alekcac:conversion 2013-06-28 14:41:35 +04:00
Alexander Shishkov
7b06592dea added conversions between UIImage and cv::Mat 2013-06-28 13:26:54 +04:00
Kirill Kornyakov
cbed07bc18 Removed references to YG from samples 2013-06-28 12:21:52 +04:00
Dominik Rose
d39aeeca0f Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b 2013-06-27 19:43:05 +02:00
Dominik Rose
e32700cf8f dc1394-2: support for operation mode 1394b added 2013-06-27 15:05:32 +02:00
Roman Donchenko
d76468c223 Merge pull request #1040 from asmorkalov:winrt 2013-06-27 16:59:25 +04:00
Alexander Smorkalov
7c5bd78804 Test fixes 
Calib3d badarg tests fixed. Default exception handling enabled;
Highgui Video I/O tests fixed on ARM;
Code cleanup.
 2013-06-27 15:47:37 +04:00
Alexander Smorkalov
347c86d9b5 Windows RT related code cleanup. 
Windows RT sample cleanup.
Video I/O code cleanup.
 2013-06-26 05:44:10 -07:00
Alexander Smorkalov
34c6598752 Perf test failure fixes for Media Foundation. 2013-06-25 03:35:57 -07:00
Alexander Smorkalov
2bc1d3709c GetProperty method for MSMF VideoCapture implemented. 2013-06-25 03:35:56 -07:00
Alexander Smorkalov
43122939cb Media foundation video i/o fixes. 
Bug in Video for Windows capture init fixed;
Media Foundation based capture finalization fixed;
Highgui tests for video i/o updated.
 2013-06-25 03:35:30 -07:00
Alexander Smorkalov
996f02a531 Multiple Media Foundation video i/o fixes. 
Video i/o tests enabled for media foundation;
Negative stride support added to VideoCapture;
Error handling improved, dead lock in case of playback error fixed;
Some code refacotring done.
 2013-06-24 02:45:27 -07:00
Alexander Smorkalov
0c9d776083 Media Foundation-based code refactoring. 
I* + SafeRelease -> ComPtr.
 2013-06-24 02:45:26 -07:00
Alexander Smorkalov
e94cc0b5ee Media Foundation camera capture fixed. 
Camera-based VideoCapture updated to fit changes in ImageGrabber from prev
commit
 2013-06-24 02:45:25 -07:00
Alexander Smorkalov
9fb762ccec VideoCapture for video files implemented. 
Set and Get methods are not implemented;
Camera based video capture is broken due to modifications.
 2013-06-24 02:45:24 -07:00
Alexander Smorkalov
22b0cfbaa2 Media Foundation-based VideoWriter improvements. 
FourCC parameter handlig added;
Smart pointers instead SafeRelease call;
Windows RT support (vertical mirroring).
 2013-06-24 02:45:23 -07:00
Alexander Smorkalov
ccb8292e8e Media Foundation-based VideoWriter added 2013-06-24 02:45:22 -07:00
Alexander Smorkalov
033e3092a3 Media Foundation based VideoCapture improved 
Code formating fixed;
GrabFrame method implemented correclty.
 2013-06-24 02:45:21 -07:00
Vladislav Vinogradov
af2fc1a22a added documentation for OpenGL interoperability 2013-06-20 16:11:10 +04:00
Roman Donchenko
37d19b9c46 Pass the HAVE_QT* flags through the config header, like all others. 
I don't know why it didn't work for the original author, but it definitely
works now.
 2013-06-19 17:44:12 +04:00
Roman Donchenko
1d9660c6d2 Merge pull request #954 from LeszekSwirski:24_fix-qtwindow 2013-06-19 17:01:57 +04:00
Roman Donchenko
5b39c02c39 Merge pull request #1007 from alekcac:i_camera 2013-06-18 15:54:01 +04:00
Alexander Shishkov
24fd2cc326 updated licenses 2013-06-18 07:02:09 +04:00
Alexander Shishkov
5db08961ce fixed Kirill's comments 2013-06-18 06:59:52 +04:00
Roman Donchenko
0124902f42 Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows 2013-06-14 15:46:25 +04:00
Alexander Shishkov
0cee15eb7f Updated iOS camera. Added rotation flag. Added functions to lock/unlock focus, white balance and exposure. 2013-06-14 15:10:25 +04:00
Andrew Senin
8eb6decb25 Fixed Ximea cameras support 2013-06-11 21:17:31 +04:00
Roman Donchenko
3af21cad4c Merge pull request #903 from aks2:2.4 2013-06-11 17:35:39 +04:00
Alexander Smorkalov
956d8027ef Bug #3044 cap_dshow.cpp forgotten validity check fixed. 2013-06-10 13:29:45 -07:00
Leszek Swirski
7d0f6b4d68 Fix image saving from QT toolbar 2013-06-06 11:15:00 +01:00
Leszek Swirski
9a1cc06ebe Fix pixel value rendering for non-fixed-size QT windows 2013-06-06 11:14:52 +01:00
Roman Donchenko
8714cbac91 Fix a missing header path when building with Qt 4. 
Also, removing explicit include path configuration,
since QT_USE_FILE takes care of that.
 2013-06-06 14:09:33 +04:00
alex77git
c8abaea368 (tab to space) 2x 2013-05-20 12:06:25 +02:00
alex77git
bc59428b3a Bug #2966, insert CV_Assert(size.width>0 && size.height>0); in imshow() 2013-05-20 02:28:40 +02:00
Dominik Rose
86ec9b79fd libd1394 2.x support for mingw on windows added 2013-05-14 16:30:12 +02:00
Vadim Pisarevsky
2a646f7626 Merge pull request #862 from piponazo:v4lFPS 2013-05-14 16:00:28 +04:00
Andrey Pavlenko
d94ecf40e6 Merge pull request #880 from apavlenko:qt-5.0 2013-05-13 21:18:47 +04:00
Andrey Kamaev
f856f78ac0 Update CMake scripts to recognize Qt 5.0 2013-05-13 17:10:32 +04:00
Andrey Kamaev
2665c39a0d Fix build warnings from gcc 4.8 2013-05-13 17:07:30 +04:00
Luis Díaz Más
d13d5c0c12 Added setting feature of FPS in cap_libv4l 2013-05-01 01:07:03 +02:00
Andrey Pavlenko
5ce4e3c265 Merge pull request #800 from asmorkalov:android_cam_idx_semantic 2013-04-29 10:00:08 +04:00
Alexander Smorkalov
8606ee4beb Front/Back camera semantic support added to Android VideoCapture back-end. 2013-04-24 10:56:16 +04:00
Andrey Kamaev
0c64fc61dc Merge pull request #740 from evil0sheep:2.4 2013-04-11 11:33:31 +04:00
Andrey Kamaev
eb3c9ed1ab Fix ffmpeg wrapper compatibility with libavcodec > 53.25.0 
Based on pull request #685
 2013-04-04 11:27:43 +04:00
Andrey Kamaev
1e9ed14205 Merge pull request #752 from khzimmer:2.4 2013-04-04 00:57:33 +04:00
Karl-Heinz Zimmer
2122627877 Set ptr to NULL, so this method can be called repeatedly. This fixes a crash after unplugging web cam and trying to re-scan the cameras. 2013-04-03 17:54:29 +02:00
Andrey Kamaev
795a513ac4 Merge pull request #716 from asmorkalov:winrt 2013-04-03 15:39:58 +04:00
Alexander Smorkalov
a2561ee0cd Code review notes fixed. 2013-04-03 04:14:40 -07:00
Alexander Smorkalov
4703f4552a Experimental MS Media Foundation API support added 2013-04-02 18:10:55 -07:00
dave
8db1a73102 Added v4l2 support for getting capture property CV_CAP_PROP_POS_MSEC 2013-04-02 10:31:02 -07:00
Vladislav Vinogradov
3c86788b1f fixed incorrect sizeof() expression in CvCaptureCAM_VFW::open 2013-04-01 11:35:33 +04:00
Alexander Smorkalov
c6cab50c5c Perf tests for Video IO on WInRT fixed. 2013-03-28 00:15:30 -07:00
Alexander Smorkalov
09bc99a0c0 HAVE_WIN32UI and HAVE_VFW checks and defines added. 2013-03-27 08:03:51 -07:00
Alexander Smorkalov
de95a2b278 Video IO tests turned off for ARM WinRT. 2013-03-27 00:45:41 -07:00
Alexander Smorkalov
6f68640d4d Multiple fixes for WinRT 
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
 2013-03-26 17:19:52 -07:00
Alexander Smorkalov
7ec2b6bad0 Highgui tests for GUI disabled for WinRT; 
Warnings fix;
 2013-03-21 16:18:19 +04:00
Alexander Smorkalov
429cd85b46 More accurate guards for WinRT features in CMake. 2013-03-20 12:21:29 -07:00
Alexander Smorkalov
3d594c70ff Multiple Windows RT fixes 
TIFF build was fixed;
Direct Show back-end was enabled;
More accurate guards implemented.
 2013-03-19 17:46:01 -07:00
Alexander Smorkalov
06aff4e7b0 Initial Windows RT support commit. 
GPU module turned off;
TIFF support turned off;
Windows Managment and Video IO (VFW) turned off.
 2013-03-13 09:02:15 -07:00
Vladislav Vinogradov
df456245e7 fixed ffmpeg destination folder for NMake generator 2013-02-28 10:16:41 +04:00
gferry
e3803f9985 fix for OpenCV issue #2815 
- libavcodec issue
- some decoders alter AVCodecContext width/height values, in a wrong way
- eg. in issue 2815, vp6f decoder changes these values, resulting in distorted / invalid frames
- this patch forces default AVCodecContext values
 2013-02-21 17:37:24 +04:00
Vladislav Vinogradov
a938534a7e restored binary compatibility 2013-02-21 12:18:08 +04:00
Vladislav Vinogradov
e06c3ec7c5 updated OpenGL functionality: 
* removed OpenGLFuncTab, now extensions are loaded internally
* 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
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
 2013-02-19 14:13:11 +04:00
Andrey Kamaev
37e2664cf0 Merge pull request #479 from ilya-lavrenov:TestHighGUI 2013-02-14 11:21:01 +04:00
Andrey Kamaev
ac389507a0 Fix warnings from ffmpeg wrapper 2013-02-12 19:58:59 +04:00
Ilya Lavrenov
5512f91d08 removed libstdc++ dependency 2013-02-12 14:20:23 +04:00
Andrey Kamaev
5cae645ba1 Temporary disabled parallel_writers_and_readers test 2013-02-11 16:52:20 +04:00
Andrey Kamaev
2ed6bc8aaf Revert ffmpeg related changes from "thread-safe VideoWriter and VideoCapture" 
This reverts commit 4abf0b3193.

Changes are reverted because they break build of proxy dlls on Windows
 2013-02-11 14:15:29 +04:00
Andrey Kamaev
bf575ba7fb Merge pull request #434 from taka-no-me:fix_parallel_writer_test 2013-02-06 14:04:59 +04:00
Andrey Kamaev
727b6a7259 Merge pull request #408 from asmorkalov:giganetix_cams_patch 2013-02-04 14:56:54 +04:00
Andrey Kamaev
3c39e146a3 Make parallel video writer test pass if compiled without threading support 2013-02-04 14:34:44 +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
25086ed257 Smartek Giganetix Cameras support (Patch #2192) integrated. 2013-02-01 16:07:32 +04:00
Andrey Kamaev
13d2412d24 Merge pull request #394 from taka-no-me:fix_tiff_test 2013-01-31 20:52:35 +04:00
Andrey Kamaev
55b90d7bae Modify decode_tile16384x16384 test to not fail when available memory is not enough for test 2013-01-31 18:51:24 +04:00
Daniil Osokin
fe5b9df45f Fixed multiple issues in docs (bug #2410) 2013-01-31 17:34:40 +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
Andrey Kamaev
33c26a93c6 Merge pull request #376 from taka-no-me:solve_tiff_conflict 2013-01-30 19:36:09 +04:00
Ivan Korolev
eaa5012163 fix v4l yes-yes build 2013-01-30 17:04:33 +04:00
Andrey Kamaev
11871528ce Solve conflict between tiff.h and opencv2/core/types_c.h 
Сonflict exists between some versions of libtiff and opencv headers
 2013-01-30 16:36:50 +04:00
Ilya Lysenkov
3c8787980c Fixed cvDestroyAllWindows() without windows in QT (#2440) 2013-01-30 15:26:49 +04:00
Ilya Lysenkov
56fbcc541f Tested cvDestroyAllWindows() without windows 2013-01-30 15:25:10 +04:00
Andrey Kamaev
81f5e72630 Merge pull request #366 from asmorkalov:gstreamer_codec_list 2013-01-30 14:41:22 +04:00
Andrey Kamaev
ae7460440e Merge pull request #361 from taka-no-me:tiff_big_tile 2013-01-30 14:40:51 +04:00
Andrey Kamaev
86b4b30a6d Merge pull request #358 from taka-no-me:objc_exceptions 2013-01-30 14:40:32 +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
0b1fe53a46 Add -fobjc-exceptions flag to ObjectiveC sources if supported (bug #2657) 2013-01-29 17:09:23 +04:00
Andrey Kamaev
287fb2c611 Fix build warning 2013-01-29 14:52:03 +04:00
Andrey Kamaev
da884b4e1d Merge pull request #347 from asmorkalov:WITH_FFMPEG_logic 2013-01-29 14:00:10 +04:00
Alexander Smorkalov
8c45b9d03d Video IO perf tests guarded. 2013-01-29 11:09:49 +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
e3474878b6 Consistently use 4-digit library version 2013-01-18 14:57:55 +04:00
Andrey Kamaev
4e1ba6f02f Fix build with libjpeg release 9 2013-01-08 19:55:29 +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
Andrey Kamaev
6e244c83cd Corrected sanity checks in several perf tests 
Also fixed a typo in performance testing framework and removed hardcoded
temporary file name from highgui perf test
 2012-12-12 01:00:47 +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
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
Ilya Lavrenov
4abf0b3193 thread-safe VideoWriter and VideoCapture 2012-11-19 16:44:23 +04:00
Andrey Kamaev
5bc66ec8e4 Merge pull request #149 from taka-no-me/osx_warnings 2012-11-13 18:21:40 +04:00
Andrey Kamaev
a126532cb7 Fix OS X build warnings 2012-11-09 11:29:52 +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
63ee26adda Merge pull request #127 from cuda-geek/apple2clang 2012-11-02 14:29:39 +04:00
marina.kolpakova
7a5b9a6b7f replase __APPLE__ marco with __clang__ 2012-11-01 19:34:05 +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
b5ecb1d32d Merge pull request #111 from taka-no-me/algorithm/addParam-short 2012-10-31 16:57:06 +04:00
Andrey Kamaev
74fe158f4b Merge pull request #117 from vpisarev/doc_updates 2012-10-31 16:56:04 +04:00
Andrey Kamaev
3e10e057cb Merge pull request #110 from vpisarev/test_fixes2 2012-10-31 16:52:50 +04:00
Vadim Pisarevsky
849a8c8d20 fixed many errors in warnings in rst docs; added ocl module description (by Niko Li) 2012-10-31 15:15:51 +04:00
Vadim Pisarevsky
63bd6f9adf fixed compile errors in ocl tests; disabled a few problematic tests 2012-10-29 23:37:18 +04:00
Andrey Kamaev
ad982f4ed6 Turn off video IO perf tests on Android 2012-10-26 17:00:31 +04:00
Andrey Kamaev
2b0072d823 Suppress more warnings in gtest on OS X 2012-10-24 20:36:30 +04:00
Andrey Kamaev
22e352d9cc Merge pull request #76 vpisarev/test_fixes_1 2012-10-22 21:13:26 +04:00
Vadim Pisarevsky
fbe0d6963c disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW 2012-10-22 21:13:26 +04:00
Andrey Kamaev
2e91405833 Fix OS X build warnings 2012-10-22 20:33:14 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Kirill Kornyakov
aedf56404e made imread description slightly better #2406 2012-10-15 15:23:38 +04:00
Vadim Pisarevsky
5b2271c6fb another fix for #2332 test 2012-10-15 14:12:32 +04:00
Vadim Pisarevsky
78a0b9787c fixed build errors on Mac; moved test for #2332 from imgproc to highgui 2012-10-15 13:55:32 +04:00
Evgeny Talanin
5dd1ec98f7 #720 patch apply 2012-10-12 14:25:36 +04:00
Vsevolod Glumov
b91ca6a73f Removed the phrase, that was causing all the confusion. Issue #2406. 
+ Some minor formatting fixes.
 2012-10-12 14:15:30 +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
Andrey Kamaev
354b77e2e1 Applied fix from bug #2324: ocv_list_unique makes for incorrect linking 2012-10-10 19:40:55 +04:00
Andrey Kamaev
d6a8753124 Remove second argument from VideoCapture_Reading perf test 2012-10-10 19:40:19 +04:00
Vadim Pisarevsky
0e314163e5 fixed INT64_C & UINT64_C definitions (patch #2033) 2012-10-10 17:27:32 +04:00
Andrey Kamaev
cabddaeb4f Revert "Issue #2035 Calling cv::namedWindow crashes on Android fixed." 
This reverts commit 36135fc59d.
 2012-10-10 13:24:49 +04:00
Alexander Smorkalov
36135fc59d Issue #2035 Calling cv::namedWindow crashes on Android fixed. 
Window-related functions is guarded from calls from application code.
Old implementations with "no-gui" exception are stell compiled and linked to OpenCV library for binary compatibility.
 2012-10-10 12:40:36 +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
89de0bebd8 Merge remote-tracking branch 'origin/master' 2012-10-09 21:52:56 +04:00
Vadim Pisarevsky
3243ad3483 applied patch #1473 (timestamp retrieval in OpenNI) 2012-10-09 21:52:41 +04:00
Andrey Kamaev
8ebd04cbf9 Fix sanity checks in highgui module 2012-10-09 19:39:03 +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
06a13d9ba0 replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet 2012-10-02 23:07:46 +04: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
58fb8692c3 added test for png encoding bug #2352 2012-09-17 16:44:40 +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
Andrey Kamaev
867777f825 Added OpenEXR library v1.7.1 2012-09-02 20:44:04 +04:00
Vadim Pisarevsky
2367a195c5 probably fixed compile error on MacOSX 10.6 2012-08-31 14:35:11 +04:00
Sergiu Dotenco
85eae7b30d win32: always link to vfw32 2012-08-30 14:52:39 +02:00
Vadim Pisarevsky
a6e2acbfee added a few missing images for tutorials; integrated pull request #26 2012-08-30 16:23:18 +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
Andrey Kamaev
5100ca7508 svn repository web references are replaced with links to git 2012-08-07 14:30:36 +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
e900952b87 quiet most of the OSX build warnings 2012-07-05 12:56:31 +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
82cb2ab556 fixed bug in SVD, ticket #2027; fixed building highgui with ffmpeg support on MacOSX 2012-06-28 19:45:13 +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
69b5972e03 Fixed MSVC build with Qt enabled #2096 2012-06-26 21:05:15 +00:00
Andrey Kamaev
55567582a6 added XIMEA support for linux (by Igor Kuzmin) #2085 2012-06-26 11:48:58 +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
d9c74f63e1 All tests writing temporary files are updated to use cv::tempfile() function 2012-06-25 11:24:06 +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
Andrey Kamaev
827d7ba2e9 fixed highgui configuration with QT enabled 2012-06-13 11:49:27 +00:00
Andrey Kamaev
694f0e954f Added linking against AppKit framework when OpenCV is configured with WITH_QUICKTIME=OFF 2012-06-13 10:43:03 +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
47a4e87784 Ignored warnings from gtest with precompiled headers enabled 2012-06-08 14:54:17 +00:00
Andrey Kamaev
2f40905548 Fixed Android build 2012-06-08 08:11:17 +00:00
Andrey Kamaev
79df8db76f Fixed recently introduced build problems on some platforms 2012-06-08 06:19: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
314813e51c Added C++ and python signatures for moveWindow, resizeWindow and setMouseCallback 2012-05-31 08:11:47 +00:00