summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/camera/cmd/capture.cpp3
-rw-r--r--noncore/multimedia/camera/gui/mainwindow.cpp2
-rw-r--r--noncore/multimedia/camera/lib/avi.c1
3 files changed, 5 insertions, 1 deletions
diff --git a/noncore/multimedia/camera/cmd/capture.cpp b/noncore/multimedia/camera/cmd/capture.cpp
index 688622b..6b8c63c 100644
--- a/noncore/multimedia/camera/cmd/capture.cpp
+++ b/noncore/multimedia/camera/cmd/capture.cpp
@@ -182,11 +182,14 @@ int main( int argc, char** argv )
if ( !ZCameraIO::instance()->isOpen() )
{
printf( "Error: Can't detect your camera. Exiting.\n" );
return -1;
}
c->checkSettings();
c->capture();
+
+ delete c;
+ delete a;
return 0;
}
diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp
index 7f2a9bd..bde448d 100644
--- a/noncore/multimedia/camera/gui/mainwindow.cpp
+++ b/noncore/multimedia/camera/gui/mainwindow.cpp
@@ -541,17 +541,17 @@ void CameraMainWindow::timerEvent( QTimerEvent* )
void CameraMainWindow::stopVideoCapture()
{
killTimers();
ODevice::inst()->playTouchSound();
ODevice::inst()->setLedState( Led_Mail, Led_Off );
_capturing = false;
updateCaption();
::close( _capturefd );
- _framerate = 1000.0 / (_time.elapsed()/_videopics);
+ _framerate = static_cast<int>( 1000.0 / (_time.elapsed()/_videopics) );
QString name;
if ( outputTo == "Documents Folder" )
{
name.sprintf( "%s/Documents/video/%s/", (const char*) QDir::homeDirPath(), (const char*) captureFormat.lower() );
if ( !QDir( name ).exists() )
{
odebug << "creating directory " << name << oendl;
diff --git a/noncore/multimedia/camera/lib/avi.c b/noncore/multimedia/camera/lib/avi.c
index 77aba33..d99c016 100644
--- a/noncore/multimedia/camera/lib/avi.c
+++ b/noncore/multimedia/camera/lib/avi.c
@@ -13,16 +13,17 @@
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
**********************************************************************/
#include "avi.h"
#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
int nframes;
int totalsize;
unsigned int* sizes;
void fprint_quartet(int fd, unsigned int i)
{
char data[4];