Commit Graph

211 Commits

Author SHA1 Message Date
Vadim Pisarevsky
e90f197beb merged fix for x64 MSVC compile errors in highgui into trunk 2010-12-27 12:01:38 +00:00
Vadim Pisarevsky
8b48eebeee enable #include "cvconfig.h" in highgui on Windows. That should fix camera capture. 2010-12-20 21:20:46 +00:00
Vadim Pisarevsky
4339f69da4 fix opencv-highgui build with old versions of libpng (< 1.4.x) 2010-12-11 18:05:50 +00:00
Vadim Pisarevsky
3beac049d5 replicated the fix for Ptr<CvCapture> bug 2010-12-08 09:36:42 +00:00
Vadim Pisarevsky
3e7fbd21e0 fixed compile errors in cap_qt.cpp (ticket #391) 2010-12-04 17:58:45 +00:00
Vadim Pisarevsky
11ed55ddb4 fixed mouse painting in Qt bindings (to make watershed & inpaint demos work); increased the font in the detailed pixel image display. 2010-12-04 15:15:06 +00:00
Vadim Pisarevsky
1286c1db45 fixed multiple warnings from VS2010. 2010-11-25 16:55:46 +00:00
Vadim Pisarevsky
334ac49d34 added user mode selection (thanks to tito for the patch, ticket #563) 2010-11-24 22:54:52 +00:00
Vadim Pisarevsky
beee6f2f70 pass the correct rgb->gray coefficients to PNG decoder, to match cvtColor's. 2010-11-24 19:50:52 +00:00
Vadim Pisarevsky
636cb15f3d add protection against EAGAIN error in the streams (thanks to vrabaud for the patch - ticket #553) 2010-11-22 13:07:43 +00:00
Vadim Pisarevsky
3163cfb845 added 16-bit tiff support, enabled LZW codec in tiff (tickets #588, #590) 2010-11-21 21:50:45 +00:00
Vadim Pisarevsky
feb0de80e1 avoid use of writable global variables in V4L capturing module (thanks to fjmadrid for the patch! - see the ticket #384) 2010-11-21 13:09:37 +00:00
Vadim Pisarevsky
5b6a755719 almost finished Python wrappers 2010-11-02 17:58:22 +00:00
Ethan Rublee
9ee954a0c6 Made calibration a bit faster in the absense of a checkboard and trying to fix
a crash with the libv4l capture code
2010-11-01 06:20:36 +00:00
Stefano Fabri
ed0ce7ed50 Fixed missing semicolon 2010-10-25 11:29:08 +00:00
Yannick Verdie
54ba887432 Qt fix: cvAddText ticket #561 2010-09-16 17:52:10 +00:00
Yannick Verdie
24427d593f Qt add byte per line information to fix a bug 2010-08-24 16:18:32 +00:00
Yannick Verdie
411e16074e Qt Ticket #520 2010-08-24 12:23:37 +00:00
Yannick Verdie
69e6294854 Qt ticket #537
Forgot to update so code after previous fix
2010-08-20 13:06:14 +00:00
Yannick Verdie
3e8a8f7942 Qt weird bug with QLabel (is it really fixed ?) 2010-08-19 22:59:32 +00:00
Yannick Verdie
45daaa6e11 Qt bug with buttons 2010-08-19 10:36:57 +00:00
Yannick Verdie
48090fd37e Qt bug fixed #534 2010-08-18 18:56:22 +00:00
Yannick Verdie
3746c48451 Bug in calibration.cpp sample
This was crashing my code:
    for( size_t i = 1; i < imagePoints.size(); i++ )
        objectPoints.push_back(objectPoints[0]);

Changed by:
objectPoints.resize(imagePoints.size(),objectPoints[0]);

Plus clean up on Qt code
2010-08-18 15:35:56 +00:00
Yannick Verdie
8ada1da08c 2010-08-18 14:45:38 +00:00
Yannick Verdie
94b588099c Qt test (some code disabled for debugging) 2010-08-18 14:07:02 +00:00
Yannick Verdie
a3582b4780 Qt Python binding -- #512 2010-08-18 11:02:11 +00:00
Yannick Verdie
b530a2cba9 Qt ticket #531 2010-08-17 17:22:21 +00:00
Yannick Verdie
662c58ca86 Qt bug fixed with cvWaitKey(0) 2010-08-15 20:43:54 +00:00
Yannick Verdie
dec6f2c393 Qt fixed bug with OpenGL, and save issue reported in #520 2010-08-14 18:36:53 +00:00
Vadim Pisarevsky
26c6b955a8 updated ffmpeg to 0.6.0 2010-08-05 17:24:41 +00:00
Yannick Verdie
2505e7e267 Qt: disable KEEP_RATIO with OpenGL to avoid a blinking bug
Qt: Now OpenGL rendering is ok
2010-08-02 17:10:43 +00:00
Vadim Pisarevsky
3510b4c81e fixed "undefined cvCreateCameraCapture_V4L" linker errors on some linux distros (thanks to miguelinux for the patch) 2010-08-02 12:55:20 +00:00
Yannick Verdie
d6bbaea28a Qt imgRegion bug fixed
Qt compilation pb with OpenGL flags fixed
2010-08-02 10:58:25 +00:00
Yannick Verdie
e8aad75446 Fixed bugs on Qt 2010-07-31 18:04:28 +00:00
Yannick Verdie
8f8aba9c88 fixed Qt bug 2010-07-30 14:13:20 +00:00
Vadim Pisarevsky
6da8d7cb52 temporarily disable 16-bit input in cap_dc1394_v2.cpp (ticket #296). thanks to sebastians for the patch! 2010-07-29 12:44:23 +00:00
Yannick Verdie
8f33e89d46 working on OpenGL for Windows 2010-07-28 21:55:55 +00:00
Yannick Verdie
7ce53adac9 Qt:
Fixed bug with exclusive buttons
Fixed memory leaks
2010-07-28 20:59:41 +00:00
Yannick Verdie
c77e8fc638 Qt - debugging Linux and Windows 2010-07-27 17:29:22 +00:00
Yannick Verdie
21b0652c40 QT statusbar bug fixed for Windows 2010-07-27 14:17:43 +00:00
Yannick Verdie
b0ab2ef16d Qt on Windows -- in progress 2010-07-27 13:14:56 +00:00
Yannick Verdie
bb2fe87b32 2010-07-26 12:28:33 +00:00
Yannick Verdie
f2353b8523 QT new functions:
- cvCreateOpenGLCallback: draw 3D on top of the image
2010-07-23 15:22:04 +00:00
Yannick Verdie
ffe7bdf69c ticket 490:
bool not defined ? -> changed everything in int
2010-07-23 12:09:13 +00:00
Yannick Verdie
f572047496 QT new functions:
- add CV_RADIOBOX with exclusive mode
2010-07-22 21:46:27 +00:00
Yannick Verdie
2c923c7eba QT new functions:
- cvAddButton changed to match requirement
 - CV_GUI_NORMAL and CV_GUI_EXPANDED done
 - context menu with right click
2010-07-22 20:39:44 +00:00
Yannick Verdie
14bf624af4 QT new functions:
- cvAddButton done
 - All the "actions" of the toolbar are working
 - Window properties done
2010-07-20 09:39:36 +00:00
Vadim Pisarevsky
f894d1de31 replaced unlink() & _unlink() with more standard remove() (ticket #334) 2010-07-17 11:51:17 +00:00
Vadim Pisarevsky
758e826d2e do not use WIN64/_WIN64 anymore - CMake did not set it anyway. Use WIN32 + __x86_64 or _M_X64 instead. Also, make VideoInput optional (WITH_VIDEOINPUT=ON/OFF) => now Mingw-dw2 can build OpenCV 2010-07-16 22:38:57 +00:00
Yannick Verdie
9fae7aee5b QT new functions:
- fixed icvFindTrackbar bug
2010-07-16 15:22:07 +00:00
Vadim Pisarevsky
670fff5f42 added workaround for strange tmpnam() output from VS2010. turned off optimization for DCT & DFT on Win64 for VS200x (VS2010 builds it fine) 2010-07-16 14:16:18 +00:00
Vadim Pisarevsky
f78a3b4cc1 updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings 2010-07-16 12:54:53 +00:00
Yannick Verdie
0c9eca7922 QT new functions:
- Finished toolbar: the last icon opens an external window with the trackbars inside
2010-07-16 12:51:29 +00:00
Yannick Verdie
f5ab36f4df QT new functions:
- Add icons for toolbar in new folder (files_Qt) (later, will delete useless icons)
2010-07-16 09:15:58 +00:00
Yannick Verdie
ddc29e08be QT new functions:
- Add toolbar
 - Clean the code
 - Window properties in progress
2010-07-16 09:12:15 +00:00
Stefano Fabri
1c7297f5be Another little fix for Monocrome frame 2010-07-13 18:11:45 +00:00
Stefano Fabri
3499703ede Fixed a typo 2010-07-13 18:08:20 +00:00
Stefano Fabri
22d22fd925 Some little fix in pvapi backend 2010-07-13 17:58:08 +00:00
Vadim Pisarevsky
fa91788222 disabled Qt by default (until the code is stabilized) 2010-07-12 15:29:31 +00:00
Yannick Verdie
e11a77cb70 use sleep instead of usleep on window 2010-07-12 15:24:15 +00:00
Yannick Verdie
f2971aebd0 Ticket #458 2010-07-12 14:39:31 +00:00
Yannick Verdie
c3eb7881f1 New functions with QT GUI:
- 3 new points mostly done:
      - OpenGL support enabled (windows are rendered using GPU)
      - Save current screen (with overlay and so on...) with shortcut CTRL+S
      - Text rendering (with any system font, and possibility to set the style - normal, italic,... - the weight - normal, bold, ... - the color, the spacing between letters, and so on...)
2010-07-12 11:04:26 +00:00
Vadim Pisarevsky
269afb91da make Qt bindings compile with any Qt 4.x 2010-07-08 11:24:32 +00:00
Yannick Verdie
3d55d4818b New functions with QT GUI:
- Save current screen (CTRL+S), with png, jpg, jpeg, bmp format support
- OpenGL rendering enable (make Qt very fast)
      -> working on opengl callback (done soon)
- Rendering optimised (with and without openGL)
2010-07-07 17:53:59 +00:00
Vadim Pisarevsky
7d006e368e fixed image rendering and memory leak in waitKey (thanks to Bart Nabbe and Steve Bushell) 2010-07-06 16:06:11 +00:00
Vadim Pisarevsky
576adb434d removed embedded (obsolete) OpenEXR files; repaired OpenEXR bindings 2010-07-04 12:32:31 +00:00
Vadim Pisarevsky
afdaafd4b8 fixed compile problem (thanks to Pierre Moulon) 2010-07-03 21:54:10 +00:00
Yannick Verdie
89d9345cae New functions with QT GUI:
- fixed bug ticket #412
2010-06-30 14:50:29 +00:00
Yannick Verdie
2f4d396506 New functions with QT GUI:
- save/load window parameters implemented !
2010-06-29 22:14:24 +00:00
Vadim Pisarevsky
d9ff8a30f5 fixed compile errors on Ubuntu 10.04 2010-06-29 15:49:44 +00:00
Yannick Verdie
f668a230ea New functions with QT GUI:
- imgregion shortcut implemented (CTRL+O)
2010-06-28 21:15:54 +00:00
Yannick Verdie
f8c83340b2 New functions with QT GUI:
- imgregion (as with Matlab) implemented
2010-06-28 21:01:37 +00:00
Yannick Verdie
4bcd81f85f New functions with QT GUI:
- aspectRatio is controled by cvSet/getWindowProperty
2010-06-26 22:36:41 +00:00
Yannick Verdie
397b31e437 New functions with QT GUI:
- fix CMake OpenGL compilation
2010-06-26 14:33:14 +00:00
Yannick Verdie
6314cd28cf New functions with QT GUI:
- fix zoom offset of 0.5
- fix CMake problem with QT detection
- Code optimisation
2010-06-25 17:19:11 +00:00
Stefano Fabri
2dcad1eb81 Added some paramter to set exposure, adaptable packet size 2010-06-25 13:18:40 +00:00
Stefano Fabri
2d0b20df9e Removed a debug print 2010-06-24 18:23:57 +00:00
Stefano Fabri
183f2306c8 Initializaed monocrom variable on costructor 2010-06-24 17:54:49 +00:00
Stefano Fabri
c7cf80fd59 Enable pixelformat check 2010-06-24 16:27:41 +00:00
Stefano Fabri
a419ecfde5 Return false if cannot adapt packed size with mtu max of network adapter 2010-06-24 15:23:43 +00:00
Stefano Fabri
686737e24f Add support for monocrome cmos ccd
Adapted mtu and packed size
Some minor fixes in gstreamer because not implemented support of v4l v4l2 in the wrapper
default beahvior must be v4l v4l2 or libv4l backends
2010-06-24 13:38:57 +00:00
Vadim Pisarevsky
4ec4cf6876 fixed memory leaks in cocoa bindings (trac ticket #253). Thanks to N. Butko 2010-06-24 12:28:23 +00:00
Yannick Verdie
f69514eef7 New functions with QT GUI:
StatusBar with zoom/color/position information
user can display infor mation in statusbar with cvDisplayStatusBar(window,text,delay_ms)
2010-06-22 17:15:49 +00:00
Yannick Verdie
f2392f2e2f New functions with QT GUI:
- fix c++ wrapper
- fix compilation bugs
2010-06-20 11:18:23 +00:00
Yannick Verdie
2f9aedfaab New functions with QT GUI:
- fix c++ wrapper
- rename cvInformation in cvDisplayOverlay
2010-06-20 10:29:11 +00:00
Yannick Verdie
bd643ad550 New functions with QT GUI:
Fixed memory leak
Disable QT by default
2010-06-20 08:44:19 +00:00
Yannick Verdie
c007b60b25 New functions with QT GUI:
Fixed bugs indicated by Vadim
2010-06-19 21:01:27 +00:00
Yannick Verdie
5cbe64dac7 New functions with QT GUI
Shortcut for zoom (CTRL + and CTRL - for zoomin/out, CTRL Left/Right/Up/Down for panning, CTRL P for zoom = 1)
Fix bug with key event
2010-06-19 18:57:04 +00:00
Vadim Pisarevsky
47620085b5 added dummy cvInitSystem() to Qt bindings to avoid "unresolved symbol" errors 2010-06-19 16:26:22 +00:00
Filipe Almeida
e78373f4b8 V4L2: removed setting device control values to initial values on capture
release
2010-06-19 14:34:44 +00:00
Yannick Verdie
3d2ec9875d New functions with QT GUI
Mouse callback return correct value during zoom/panning
Window overview in zoom mode done !
2010-06-17 20:44:18 +00:00
Yannick Verdie
386496863c New functions with QT GUI
use inv matrix for Zoom in/out for better result
Fix some bugs with zoom/panning
2010-06-17 16:41:48 +00:00
Yannick Verdie
f4dba4686d New functions with QT GUI (presented in the 4th report)
-Fullscreen
-Change Autoresize dynamically (after windows are created)
-Zoom on mouse location (with wheel)
-Panning by click'ndrag posible after zooming
2010-06-16 07:58:53 +00:00
Yannick Verdie
c4fded9afa New functions with QT GUI
Zoom function done, working on panning now (weel enable it)
Fixed mouse coordinate bugs
2010-06-14 16:00:38 +00:00
Yannick Verdie
be292046d8 working on QT change/get win property (done)
Fullscreen done
change autoresize dynamically done
2010-06-12 18:08:27 +00:00
Yannick Verdie
e71c5e8754 working on QT change/get win property (stylesheet for cvTrackBar fixed !!!) 2010-06-12 16:56:01 +00:00
Yannick Verdie
9eea2a5fe6 working on QT change/get win property (stylesheet for cvTrackBar fixed !!!) 2010-06-12 16:36:46 +00:00
Vadim Pisarevsky
d7691f6cad another attempt to fix cvcap_ffmpeg.cpp compile errors 2010-06-11 18:43:46 +00:00
Yannick Verdie
f6f634bace working on QT change/get win property (stylesheet for cvTrackBar fixed !!!) 2010-06-11 09:02:57 +00:00
Yannick Verdie
802d5f9940 working on QT change/get win property 2010-06-11 07:35:36 +00:00
Vadim Pisarevsky
fb2e7142b1 handle missing UINT64_C definition 2010-06-11 03:59:43 +00:00
Yannick Verdie
6cc7fb67dd fix bugs 2010-06-10 20:31:55 +00:00
Yannick Verdie
799460bd66 will work on the trunk 2010-06-10 20:03:52 +00:00
Yannick Verdie
c6872100db Start integrating QT GUI (GoC 2010) 2010-06-07 08:29:10 +00:00
Vadim Pisarevsky
93d469956d fixed reading of certain BMP files 2010-06-06 16:44:38 +00:00
Vadim Pisarevsky
eec30b08d4 added cv::setMouseCallback and cv::startWindowThread 2010-05-18 15:47:39 +00:00
Vadim Pisarevsky
26b7ed6901 renamed gstappsink.hpp->gstappsink.h 2010-05-12 14:51:52 +00:00
Filipe Almeida
3d12bc6b9f LIBV4L: precomp.hpp include missing 2010-05-12 11:40:40 +00:00
Filipe Almeida
17292f686e LIBV4L: fixed build failed on Linux 2010-05-12 10:33:08 +00:00
Vadim Pisarevsky
4a073bd951 fixed build on Linux 2010-05-12 07:33:21 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00