summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-03-29 08:06:52 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-03-29 08:06:52 (GMT)
commita5e1442d8960d3a9f363a8101d02e6fae804b6f8 (patch)
treee4ccac01df0d33b79dfd06e3f335766e25a34831 /src/gui/image
parent9e12625b31e1d95f023fe67deb50e8bf97903994 (diff)
downloadQt-a5e1442d8960d3a9f363a8101d02e6fae804b6f8.zip
Qt-a5e1442d8960d3a9f363a8101d02e6fae804b6f8.tar.gz
Qt-a5e1442d8960d3a9f363a8101d02e6fae804b6f8.tar.bz2
Make sure the blitter api works with Raster GS(x11 and win) and QWS
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qpixmap_blitter.cpp9
-rw-r--r--src/gui/image/qpixmap_blitter_p.h3
2 files changed, 10 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap_blitter.cpp b/src/gui/image/qpixmap_blitter.cpp
index a22bd8f..6dcf7c7 100644
--- a/src/gui/image/qpixmap_blitter.cpp
+++ b/src/gui/image/qpixmap_blitter.cpp
@@ -5,10 +5,13 @@
#include <private/qapplication_p.h>
#include <private/qgraphicssystem_p.h>
+#include <private/qblittable_p.h>
#include <private/qdrawhelper_p.h>
#ifndef QT_NO_BLITTABLE
+QT_BEGIN_NAMESPACE
+
static int global_ser_no = 0;
QBlittablePixmapData::QBlittablePixmapData(QPixmapData::PixelType type)
@@ -34,7 +37,7 @@ QBlittable *QBlittablePixmapData::blittable() const
{
if (!m_blittable) {
QBlittablePixmapData *that = const_cast<QBlittablePixmapData *>(this);
- that->m_blittable = QApplicationPrivate::graphicsSystem()->createBlittable(QRect(0,0,w,h));
+ that->m_blittable = QApplicationPrivate::graphicsSystem()->createBlittable(QSize(w,h));
}
return m_blittable;
@@ -42,7 +45,7 @@ QBlittable *QBlittablePixmapData::blittable() const
void QBlittablePixmapData::setBlittable(QBlittable *blittable)
{
- resize(blittable->rect().width(),blittable->rect().height());
+ resize(blittable->size().width(),blittable->size().height());
m_blittable = blittable;
}
@@ -259,6 +262,8 @@ QRectF QBlittablePixmapData::clipAndTransformRect(const QRectF &rect) const
}
return transformationRect;
}
+
+QT_END_NAMESPACE
#endif //QT_BLITTER_RASTEROVERLAY
#endif //QT_NO_BLITTABLE
diff --git a/src/gui/image/qpixmap_blitter_p.h b/src/gui/image/qpixmap_blitter_p.h
index 1d85cd3..b9f7630 100644
--- a/src/gui/image/qpixmap_blitter_p.h
+++ b/src/gui/image/qpixmap_blitter_p.h
@@ -5,6 +5,8 @@
#include <private/qpaintengine_blitter_p.h>
#ifndef QT_NO_BLITTABLE
+QT_BEGIN_NAMESPACE
+
class Q_GUI_EXPORT QBlittablePixmapData : public QPixmapData
{
// Q_DECLARE_PRIVATE(QBlittablePixmapData);
@@ -117,5 +119,6 @@ inline void QBlittablePixmapData::unmarkRasterOverlay(const QRectF &rect)
#endif
}
+QT_END_NAMESPACE
#endif // QT_NO_BLITTABLE
#endif // QPIXMAP_BLITTER_P_H