summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAnders Bakken <anders.bakken@nokia.com>2009-03-30 16:00:49 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2009-03-30 16:02:55 (GMT)
commit9340b75300d90d055056cdd68d10725de7829bdd (patch)
tree40d0f1710ccf4820cab5bffe7cbbe68b42c2d2ad /src
parent1e7d1500e9351d8fc0cd7d3bc017e974aa45b035 (diff)
downloadQt-9340b75300d90d055056cdd68d10725de7829bdd.zip
Qt-9340b75300d90d055056cdd68d10725de7829bdd.tar.gz
Qt-9340b75300d90d055056cdd68d10725de7829bdd.tar.bz2
Compile with QT_NO_DIRECTFB_PREALLOCATED
Use the right surface for locking/unlocking. Reviewed-by: TrustMe
Diffstat (limited to 'src')
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index 87a5910..3a6b3a2 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -161,13 +161,13 @@ IDirectFBSurface* QDirectFBScreen::createDFBSurface(const QImage &img, SurfaceCr
if (surface) {
char *mem;
int bpl;
- surface->Lock(dfbSurface, DSLF_WRITE, (void**)&mem, &bpl);
+ surface->Lock(surface, DSLF_WRITE, (void**)&mem, &bpl);
const int h = img.height();
for (int i = 0; i < h; ++i) {
memcpy(mem, img.scanLine(i), bpl);
mem += bpl;
}
- surface->Unlock(ret);
+ surface->Unlock(surface);
}
#endif
#ifndef QT_NO_DIRECTFB_PALETTE