summaryrefslogtreecommitdiff
path: root/noncore/multimedia/camera/zcameraio.cpp
Side-by-side diff
Diffstat (limited to 'noncore/multimedia/camera/zcameraio.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/camera/zcameraio.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/noncore/multimedia/camera/zcameraio.cpp b/noncore/multimedia/camera/zcameraio.cpp
index 1c449e7..c940b45 100644
--- a/noncore/multimedia/camera/zcameraio.cpp
+++ b/noncore/multimedia/camera/zcameraio.cpp
@@ -272,47 +272,40 @@ bool ZCameraIO::snapshot( unsigned char* buf )
if ( _rot ) // Portrait
{
readmode = IMAGE | isFinderReversed() ? XFLIP | YFLIP : 0;
}
else // Landscape
{
readmode = IMAGE | XFLIP | YFLIP;
}
}
else // OVERRIDE
{
readmode = IMAGE | _flip;
}
setReadMode( readmode );
read( (char*) buf, _readlen );
}
void ZCameraIO::captureFrame( int w, int h, int zoom, QImage* image )
{
int pw = _width;
int ph = _height;
- if ( _rot )
- setCaptureFrame( h, w, zoom*256, true );
- else
- setCaptureFrame( w, h, zoom*256, false );
+ setCaptureFrame( w, h, zoom*256, _rot );
snapshot( image );
setCaptureFrame( pw, ph, _zoom, _rot );
}
void ZCameraIO::captureFrame( int w, int h, int zoom, unsigned char* buf )
{
//FIXME: this is too slow
int pw = _width;
int ph = _height;
- if ( _rot )
- setCaptureFrame( h, w, zoom*256, true );
- else
- setCaptureFrame( w, h, zoom*256, false );
-
+ setCaptureFrame( w, h, zoom*256, _rot );
snapshot( buf );
setCaptureFrame( pw, ph, _zoom, _rot );
}