command line capturer now seems to work

you can now write yourself a nice webcam application :)

1 files changed, 6 insertions, 2 deletions

diff --git a/noncore/multimedia/camera/lib/zcameraio.cpp b/noncore/multimedia/camera/lib/zcameraio.cpp
index c940b45..d59cbbb 100644
--- a/noncore/multimedia/camera/lib/zcameraio.cpp
+++ b/noncore/multimedia/camera/lib/zcameraio.cpp
@@ -136,12 +136,13 @@ bool ZCameraIO::setCaptureFrame( int width, int height, int zoom, bool rot )
         _height = height;
         _zoom = zoom;
         _rot = rot;
         _readlen = 2 * _width * _height; // camera is fixed @ 16 bits per pixel
         return true;
     }
+    owarn << "couldn't write to driver" << oendl;
     return false;
 }
 
 
 bool ZCameraIO::setZoom( int zoom )
 {
@@ -212,12 +213,14 @@ bool ZCameraIO::snapshot( QImage* image )
 {
     setReadMode( STATUS );
 
     odebug << "finder reversed = " << isFinderReversed() << oendl;
     odebug << "rotation = " << _rot << oendl;
 
+    odebug << "w=" << _width << " h= " << _height << " readlen= " << _readlen << oendl;
+
     int readmode;
     if ( _flip == -1 ) // AUTO
     {
         if ( _rot ) // Portrait
         {
             readmode = IMAGE | isFinderReversed() ? XFLIP | YFLIP : 0;
@@ -288,17 +291,18 @@ bool ZCameraIO::snapshot( unsigned char* buf )
 
 }
 
 
 void ZCameraIO::captureFrame( int w, int h, int zoom, QImage* image )
 {
+    int prot = _rot;
     int pw = _width;
     int ph = _height;
-    setCaptureFrame( w, h, zoom*256, _rot );
+    setCaptureFrame( w, h, zoom*256, w<h );
     snapshot( image );
-    setCaptureFrame( pw, ph, _zoom, _rot );
+    setCaptureFrame( pw, ph, _zoom, prot );
 }
 
 
 void ZCameraIO::captureFrame( int w, int h, int zoom, unsigned char* buf )
 {
     //FIXME: this is too slow