summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordeva <deva>2005-05-01 12:04:15 +0000
committerdeva <deva>2005-05-01 12:04:15 +0000
commitd560c9cd0ed12def4c620187fcf3144ab18f76e0 (patch)
treeacfa3fd4801f44dc396a6d24a87419662ad815bd
parent90712e97bdc219492235f3ae04f3e707ae10e161 (diff)
Using qbitmap for raw pixel readin.
-rw-r--r--src/mainwindow.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index fccee98..0e681e0 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -27,6 +27,9 @@
*/
/*
* $Log$
+ * Revision 1.18 2005/05/01 12:04:15 deva
+ * Using qbitmap for raw pixel readin.
+ *
* Revision 1.17 2005/05/01 11:25:56 deva
* Added code to read screenshot from frame queue, decode it to rgb and put it into a qimage.
*
@@ -44,6 +47,7 @@
#include <qpushbutton.h>
#include <qfont.h>
#include <qpixmap.h>
+#include <qbitmap.h>
#include <qimage.h>
#include <qlayout.h>
#include <qstatusbar.h>
@@ -336,10 +340,10 @@ void MainWindow::shoot_clicked()
QImage image;
camera->snapshot(pixels);
- image.loadFromData(pixels, sizeof(pixels));
+ QBitmap bitmap(720, 576, pixels);
+ image = bitmap;
checkErrors();
- image = img_live->getScreenshot();
image = image.smoothScale(img_history[0]->width(), img_history[0]->height());
QPixmap pixmap;