author | zecke <zecke> | 2004-09-10 11:47:55 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-10 11:47:55 (UTC) |
commit | 501c17ed2bb97f2062cb11daddeb698a6a9f2828 (patch) (unidiff) | |
tree | 84e5659af9e1b0a0b4a99badae77124e02087344 | |
parent | e2fa8fdfff6bb0460350d5f1017ead99deea7a0b (diff) | |
download | opie-501c17ed2bb97f2062cb11daddeb698a6a9f2828.zip opie-501c17ed2bb97f2062cb11daddeb698a6a9f2828.tar.gz opie-501c17ed2bb97f2062cb11daddeb698a6a9f2828.tar.bz2 |
Fix various warning
-rw-r--r-- | noncore/multimedia/camera/cmd/capture.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/camera/gui/mainwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/camera/lib/avi.c | 1 |
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 | |||
@@ -186,7 +186,10 @@ int main( int argc, char** argv ) | |||
186 | } | 186 | } |
187 | 187 | ||
188 | c->checkSettings(); | 188 | c->checkSettings(); |
189 | c->capture(); | 189 | c->capture(); |
190 | |||
191 | delete c; | ||
192 | delete a; | ||
190 | return 0; | 193 | return 0; |
191 | } | 194 | } |
192 | 195 | ||
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 | |||
@@ -545,9 +545,9 @@ void CameraMainWindow::stopVideoCapture() | |||
545 | ODevice::inst()->setLedState( Led_Mail, Led_Off ); | 545 | ODevice::inst()->setLedState( Led_Mail, Led_Off ); |
546 | _capturing = false; | 546 | _capturing = false; |
547 | updateCaption(); | 547 | updateCaption(); |
548 | ::close( _capturefd ); | 548 | ::close( _capturefd ); |
549 | _framerate = 1000.0 / (_time.elapsed()/_videopics); | 549 | _framerate = static_cast<int>( 1000.0 / (_time.elapsed()/_videopics) ); |
550 | 550 | ||
551 | QString name; | 551 | QString name; |
552 | if ( outputTo == "Documents Folder" ) | 552 | if ( outputTo == "Documents Folder" ) |
553 | { | 553 | { |
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 | |||
@@ -17,8 +17,9 @@ | |||
17 | #include "avi.h" | 17 | #include "avi.h" |
18 | 18 | ||
19 | #include <string.h> | 19 | #include <string.h> |
20 | #include <stdio.h> | 20 | #include <stdio.h> |
21 | #include <stdlib.h> | ||
21 | 22 | ||
22 | int nframes; | 23 | int nframes; |
23 | int totalsize; | 24 | int totalsize; |
24 | unsigned int* sizes; | 25 | unsigned int* sizes; |