summaryrefslogtreecommitdiff
path: root/noncore/multimedia/camera/lib
authorzecke <zecke>2004-03-13 23:10:26 (UTC)
committer zecke <zecke>2004-03-13 23:10:26 (UTC)
commit6b5ec807e25094979f5631a3a46baf7415326d8a (patch) (unidiff)
treea5af190712e332d3b6869795cb944b98102fdb1f /noncore/multimedia/camera/lib
parent874af2f5ce2d48a460d5d9fa1d6535b68e5966da (diff)
downloadopie-6b5ec807e25094979f5631a3a46baf7415326d8a.zip
opie-6b5ec807e25094979f5631a3a46baf7415326d8a.tar.gz
opie-6b5ec807e25094979f5631a3a46baf7415326d8a.tar.bz2
ODP changes
Diffstat (limited to 'noncore/multimedia/camera/lib') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/camera/lib/imageio.cpp1
-rw-r--r--noncore/multimedia/camera/lib/zcameraio.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/noncore/multimedia/camera/lib/imageio.cpp b/noncore/multimedia/camera/lib/imageio.cpp
index ed0d39f..7d20848 100644
--- a/noncore/multimedia/camera/lib/imageio.cpp
+++ b/noncore/multimedia/camera/lib/imageio.cpp
@@ -15,12 +15,13 @@
15 15
16#include "imageio.h" 16#include "imageio.h"
17 17
18#include <opie2/odebug.h> 18#include <opie2/odebug.h>
19#include <qimage.h> 19#include <qimage.h>
20 20
21using namespace Opie::Core;
21 22
22void bufferToImage( int _width, int _height, unsigned char* bp, QImage* image ) 23void bufferToImage( int _width, int _height, unsigned char* bp, QImage* image )
23{ 24{
24 unsigned char* p; 25 unsigned char* p;
25 26
26 image->create( _width, _height, 16 ); 27 image->create( _width, _height, 16 );
diff --git a/noncore/multimedia/camera/lib/zcameraio.cpp b/noncore/multimedia/camera/lib/zcameraio.cpp
index d59cbbb..c4be42f 100644
--- a/noncore/multimedia/camera/lib/zcameraio.cpp
+++ b/noncore/multimedia/camera/lib/zcameraio.cpp
@@ -27,12 +27,14 @@
27#include <qdatetime.h> 27#include <qdatetime.h>
28 28
29#include <opie2/odebug.h> 29#include <opie2/odebug.h>
30 30
31#define SHARPZDC "/dev/sharp_zdc" 31#define SHARPZDC "/dev/sharp_zdc"
32 32
33using namespace Opie::Core;
34
33ZCameraIO* ZCameraIO::_instance = 0; 35ZCameraIO* ZCameraIO::_instance = 0;
34 36
35ZCameraIO* ZCameraIO::instance() 37ZCameraIO* ZCameraIO::instance()
36{ 38{
37 if ( !ZCameraIO::_instance ) 39 if ( !ZCameraIO::_instance )
38 { 40 {