status-im
/
qzxing
mirror of https://github.com/status-im/qzxing.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverted changes of the merged commit 812238d1f5/

This commit is contained in:
favoritas37 2015-05-16 15:40:40 +03:00
parent d10cabd000
commit 4c0843478d
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/imagehandler.cpp
View File

@ -4,7 +4,6 @@
#include <QPainter> #include <QPainter>
#include <QStyleOptionGraphicsItem> #include <QStyleOptionGraphicsItem>
#include <QDebug> #include <QDebug>
#include <private/qquickimage_p.h>
ImageHandler::ImageHandler(QObject *parent) : ImageHandler::ImageHandler(QObject *parent) :
QObject(parent) QObject(parent)
@ -17,22 +16,7 @@ QImage ImageHandler::extractQImage(QObject *imageObj,
{ {
QGraphicsObject *item = qobject_cast<QGraphicsObject*>(imageObj); QGraphicsObject *item = qobject_cast<QGraphicsObject*>(imageObj);
if (!item && (imageObj->metaObject()->className() == "QQuickImage")) { if (!item ) {
QQuickImage *quickimage = static_cast<QQuickImage*>(imageObj);
if (!quickImage) {
qDebug() << "quickimage is NULL";
return QImage();
}
QImage img(quickimage->image());
if(offsetX == 0 && offsetY == 0 && width == 0 && height == 0)
return img;
else
{
return img.copy(offsetX, offsetY, width, height);
}
} else if (!item) {
qDebug() << "Item is NULL"; qDebug() << "Item is NULL";
return QImage(); return QImage();
} }