FCL/sf/mw/qt: comparison src/openvg/qpixmapdata

equal deleted inserted replaced

-:41300fa6a67c
+:2f34d5167611
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 **
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include "../src/gui/egl/qegl_p.h"
 #include "qpixmapdata_vg_p.h"
 #include "qpaintengine_vg_p.h"
 #include <QtGui/private/qdrawhelper_p.h>
 #include "qvg_p.h"
 #include "qvgimagepool_p.h"
+#include <private/qt_s60_p.h>
+#include <fbs.h>
 #ifdef QT_SYMBIAN_SUPPORTS_SGIMAGE
-#include <graphics/sgimage.h>
+#include <sgresource/sgimage.h>
 typedef EGLImageKHR (*pfnEglCreateImageKHR)(EGLDisplay, EGLContext, EGLenum, EGLClientBuffer, EGLint*);
 typedef EGLBoolean (*pfnEglDestroyImageKHR)(EGLDisplay, EGLImageKHR);
 typedef VGImage (*pfnVgCreateEGLImageTargetKHR)(VGeglImageKHR);
-#endif
+#endif // QT_SYMBIAN_SUPPORTS_SGIMAGE
 QT_BEGIN_NAMESPACE
 static int qt_vg_pixmap_serial = 0;
 }
 // This function works around QImage::bits() making a deep copy if the
 // QImage is not const.  We force it to be const and then get the bits.
 // XXX: Should add a QImage::constBits() in the future to replace this.
-static inline const uchar *qt_vg_imageBits(const QImage& image)
+const uchar *qt_vg_imageBits(const QImage& image)
 {
 return image.bits();
 }
 VGImage QVGPixmapData::toVGImage()
 }
 return VG_INVALID_HANDLE;
 }
 #if defined(Q_OS_SYMBIAN)
+static CFbsBitmap* createBlitCopy(CFbsBitmap* bitmap)
+{
+CFbsBitmap *copy = q_check_ptr(new CFbsBitmap);
+if(!copy)
+return 0;
+if (copy->Create(bitmap->SizeInPixels(), bitmap->DisplayMode()) != KErrNone) {
+delete copy;
+copy = 0;
+return 0;
+}
+CFbsBitmapDevice* bitmapDevice = 0;
+CFbsBitGc *bitmapGc = 0;
+QT_TRAP_THROWING(bitmapDevice = CFbsBitmapDevice::NewL(copy));
+QT_TRAP_THROWING(bitmapGc = CFbsBitGc::NewL());
+bitmapGc->Activate(bitmapDevice);
+bitmapGc->BitBlt(TPoint(), bitmap);
+delete bitmapGc;
+delete bitmapDevice;
+return copy;
+}
 void QVGPixmapData::cleanup()
 {
 is_null = w = h = 0;
 recreate = false;
 source = QImage();
 destroyImages();
 prevSize = QSize();
 TInt err = 0;
-err = SgDriver::Open();
+RSgDriver driver;
-if(err != KErrNone) {
+err = driver.Open();
+if (err != KErrNone) {
 cleanup();
 return;
 }
-if(sgImage->IsNull()) {
+if (sgImage->IsNull()) {
 cleanup();
-SgDriver::Close();
+driver.Close();
 return;
 }
 TSgImageInfo sgImageInfo;
 err = sgImage->GetInfo(sgImageInfo);
-if(err != KErrNone) {
+if (err != KErrNone) {
 cleanup();
-SgDriver::Close();
+driver.Close();
 return;
 }
 pfnEglCreateImageKHR eglCreateImageKHR = (pfnEglCreateImageKHR) eglGetProcAddress("eglCreateImageKHR");
 pfnEglDestroyImageKHR eglDestroyImageKHR = (pfnEglDestroyImageKHR) eglGetProcAddress("eglDestroyImageKHR");
 pfnVgCreateEGLImageTargetKHR vgCreateEGLImageTargetKHR = (pfnVgCreateEGLImageTargetKHR) eglGetProcAddress("vgCreateEGLImageTargetKHR");
-if(eglGetError() != EGL_SUCCESS || !eglCreateImageKHR || !eglDestroyImageKHR || !vgCreateEGLImageTargetKHR) {
+if (eglGetError() != EGL_SUCCESS || !eglCreateImageKHR || !eglDestroyImageKHR || !vgCreateEGLImageTargetKHR) {
 cleanup();
-SgDriver::Close();
+driver.Close();
 return;
 }
 const EGLint KEglImageAttribs[] = {EGL_IMAGE_PRESERVED_SYMBIAN, EGL_TRUE, EGL_NONE};
 EGLImageKHR eglImage = eglCreateImageKHR(context->display(),
 EGL_NO_CONTEXT,
 EGL_NATIVE_PIXMAP_KHR,
 (EGLClientBuffer)sgImage,
 (EGLint*)KEglImageAttribs);
-if(eglGetError() != EGL_SUCCESS) {
+if (eglGetError() != EGL_SUCCESS) {
 cleanup();
-SgDriver::Close();
+driver.Close();
 return;
 }
 vgImage = vgCreateEGLImageTargetKHR(eglImage);
-if(vgGetError() != VG_NO_ERROR) {
+if (vgGetError() != VG_NO_ERROR) {
 cleanup();
-eglDestroyImageKHR(context->display(), eglImage);
+eglDestroyImageKHR(QEglContext::display(), eglImage);
-SgDriver::Close();
+driver.Close();
 return;
 }
 w = sgImageInfo.iSizeInPixels.iWidth;
 h = sgImageInfo.iSizeInPixels.iHeight;
 source = QImage();
 recreate = false;
 prevSize = QSize(w, h);
 setSerialNumber(++qt_vg_pixmap_serial);
 // release stuff
-eglDestroyImageKHR(context->display(), eglImage);
+eglDestroyImageKHR(QEglContext::display(), eglImage);
-SgDriver::Close();
+driver.Close();
 } else if (type == QPixmapData::FbsBitmap) {
+CFbsBitmap *bitmap = reinterpret_cast<CFbsBitmap*>(pixmap);
+bool deleteSourceBitmap = false;
+#ifdef Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE
+// Rasterize extended bitmaps
+TUid extendedBitmapType = bitmap->ExtendedBitmapType();
+if (extendedBitmapType != KNullUid) {
+bitmap = createBlitCopy(bitmap);
+deleteSourceBitmap = true;
+}
+#endif
+if (bitmap->IsCompressedInRAM()) {
+bitmap = createBlitCopy(bitmap);
+deleteSourceBitmap = true;
+}
+TDisplayMode displayMode = bitmap->DisplayMode();
+QImage::Format format = qt_TDisplayMode2Format(displayMode);
+TSize size = bitmap->SizeInPixels();
+bitmap->BeginDataAccess();
+uchar *bytes = (uchar*)bitmap->DataAddress();
+QImage img = QImage(bytes, size.iWidth, size.iHeight, format);
+img = img.copy();
+bitmap->EndDataAccess();
+if(displayMode == EGray2) {
+//Symbian thinks set pixels are white/transparent, Qt thinks they are foreground/solid
+//So invert mono bitmaps so that masks work correctly.
+img.invertPixels();
+} else if(displayMode == EColor16M) {
+img = img.rgbSwapped(); // EColor16M is BGR
+}
+fromImage(img, Qt::AutoColor);
+if(deleteSourceBitmap)
+delete bitmap;
 }
 #else
 Q_UNUSED(pixmap);
 Q_UNUSED(type);
 #endif
 {
 #if defined(QT_SYMBIAN_SUPPORTS_SGIMAGE) && !defined(QT_NO_EGL)
 if (type == QPixmapData::SgImage) {
 toVGImage();
-if(!isValid() || vgImage == VG_INVALID_HANDLE)
+if (!isValid() || vgImage == VG_INVALID_HANDLE)
 return 0;
 TInt err = 0;
-err = SgDriver::Open();
+RSgDriver driver;
-if(err != KErrNone)
+err = driver.Open();
+if (err != KErrNone)
 return 0;
 TSgImageInfo sgInfo;
 sgInfo.iPixelFormat = EUidPixelFormatARGB_8888_PRE;
 sgInfo.iSizeInPixels.SetSize(w, h);
-sgInfo.iUsage = ESgUsageOpenVgImage | ESgUsageOpenVgTarget;
+sgInfo.iUsage = ESgUsageBitOpenVgImage | ESgUsageBitOpenVgSurface;
-sgInfo.iShareable = ETrue;
-sgInfo.iCpuAccess = ESgCpuAccessNone;
-sgInfo.iScreenId = KSgScreenIdMain; //KSgScreenIdAny;
-sgInfo.iUserAttributes = NULL;
-sgInfo.iUserAttributeCount = 0;
 RSgImage *sgImage = q_check_ptr(new RSgImage());
 err = sgImage->Create(sgInfo, NULL, NULL);
-if(err != KErrNone) {
+if (err != KErrNone) {
-SgDriver::Close();
+driver.Close();
 return 0;
 }
 pfnEglCreateImageKHR eglCreateImageKHR = (pfnEglCreateImageKHR) eglGetProcAddress("eglCreateImageKHR");
 pfnEglDestroyImageKHR eglDestroyImageKHR = (pfnEglDestroyImageKHR) eglGetProcAddress("eglDestroyImageKHR");
 pfnVgCreateEGLImageTargetKHR vgCreateEGLImageTargetKHR = (pfnVgCreateEGLImageTargetKHR) eglGetProcAddress("vgCreateEGLImageTargetKHR");
-if(eglGetError() != EGL_SUCCESS || !eglCreateImageKHR || !eglDestroyImageKHR || !vgCreateEGLImageTargetKHR) {
+if (eglGetError() != EGL_SUCCESS || !eglCreateImageKHR || !eglDestroyImageKHR || !vgCreateEGLImageTargetKHR) {
-SgDriver::Close();
+driver.Close();
 return 0;
 }
 const EGLint KEglImageAttribs[] = {EGL_IMAGE_PRESERVED_SYMBIAN, EGL_TRUE, EGL_NONE};
 EGLImageKHR eglImage = eglCreateImageKHR(context->display(),
 EGL_NO_CONTEXT,
 EGL_NATIVE_PIXMAP_KHR,
 (EGLClientBuffer)sgImage,
 (EGLint*)KEglImageAttribs);
-if(eglGetError() != EGL_SUCCESS) {
+if (eglGetError() != EGL_SUCCESS) {
 sgImage->Close();
-SgDriver::Close();
+driver.Close();
 return 0;
 }
 VGImage dstVgImage = vgCreateEGLImageTargetKHR(eglImage);
-if(vgGetError() != VG_NO_ERROR) {
+if (vgGetError() != VG_NO_ERROR) {
-eglDestroyImageKHR(context->display(), eglImage);
+eglDestroyImageKHR(QEglContext::display(), eglImage);
 sgImage->Close();
-SgDriver::Close();
+driver.Close();
 return 0;
 }
 vgCopyImage(dstVgImage, 0, 0,
 vgImage, 0, 0,
 w, h, VG_FALSE);
-if(vgGetError() != VG_NO_ERROR) {
+if (vgGetError() != VG_NO_ERROR) {
 sgImage->Close();
 sgImage = 0;
 }
 // release stuff
 vgDestroyImage(dstVgImage);
-eglDestroyImageKHR(context->display(), eglImage);
+eglDestroyImageKHR(QEglContext::display(), eglImage);
-SgDriver::Close();
+driver.Close();
 return reinterpret_cast<void*>(sgImage);
 } else if (type == QPixmapData::FbsBitmap) {
-return 0;
+CFbsBitmap *bitmap = q_check_ptr(new CFbsBitmap);
+if (bitmap) {
+if (bitmap->Create(TSize(source.width(), source.height()),
+EColor16MAP) == KErrNone) {
+const uchar *sptr = qt_vg_imageBits(source);
+bitmap->BeginDataAccess();
+uchar *dptr = (uchar*)bitmap->DataAddress();
+Mem::Copy(dptr, sptr, source.byteCount());
+bitmap->EndDataAccess();
+} else {
+delete bitmap;
+bitmap = 0;
+}
+}
+return reinterpret_cast<void*>(bitmap);
 }
 #else
 Q_UNUSED(type);
 return 0;
 #endif

changeset 18	2f34d5167611
parent 3	41300fa6a67c
child 19	fcece45ef507