diff -r b12f3922a74f -r 64817133cd1d camerauis/cameraxui/cxengine/inc/cxesnapshotcontrol.h --- a/camerauis/cameraxui/cxengine/inc/cxesnapshotcontrol.h Wed Jun 23 17:59:54 2010 +0300 +++ b/camerauis/cameraxui/cxengine/inc/cxesnapshotcontrol.h Tue Jul 06 14:04:02 2010 +0300 @@ -20,6 +20,7 @@ #include #include "cxeerror.h" +#include "cxenamespace.h" class CxeCameraDevice; class CxeSnapshotControlPrivate; @@ -47,13 +48,13 @@ public: State state() const; - QSize calculateSnapshotSize(const QSize& displaySize, const QSize& outputResolution) const; - void start(const QSize& size); + QSize calculateSnapshotSize(const QSize& displaySize, Cxe::AspectRatio aspectRatio) const; + void start(const QSize &size); void stop(); signals: void stateChanged(CxeSnapshotControl::State newState, CxeError::Id status); - void snapshotReady(CxeError::Id status, const QPixmap& snapshot); + void snapshotReady(CxeError::Id status, const QImage &snapshot); public slots: void handleCameraEvent(int id, int error);