summaryrefslogtreecommitdiff
path: root/noncore
authorzecke <zecke>2004-09-10 11:47:55 (UTC)
committer zecke <zecke>2004-09-10 11:47:55 (UTC)
commit501c17ed2bb97f2062cb11daddeb698a6a9f2828 (patch) (side-by-side diff)
tree84e5659af9e1b0a0b4a99badae77124e02087344 /noncore
parente2fa8fdfff6bb0460350d5f1017ead99deea7a0b (diff)
downloadopie-501c17ed2bb97f2062cb11daddeb698a6a9f2828.zip
opie-501c17ed2bb97f2062cb11daddeb698a6a9f2828.tar.gz
opie-501c17ed2bb97f2062cb11daddeb698a6a9f2828.tar.bz2
Fix various warning
Diffstat (limited to 'noncore') (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
@@ -187,6 +187,9 @@ int main( int argc, char** argv )
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
@@ -546,7 +546,7 @@ void CameraMainWindow::stopVideoCapture()
_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" )
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
@@ -18,6 +18,7 @@
#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
int nframes;
int totalsize;