diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-14 14:00:52 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-14 14:00:52 (GMT) |
commit | 4d2936ffd9291d27d57d056794b44f872a1e13ad (patch) | |
tree | e498edbcf64eb819085dd9a80615bf6e1b6feade /src/openvg | |
parent | 37b9c2df53b281bddee26291855e0c7f01f52a7c (diff) | |
parent | 3b4b4eb7741863bb1876dcf1d9a4b7132b895b35 (diff) | |
download | Qt-4d2936ffd9291d27d57d056794b44f872a1e13ad.zip Qt-4d2936ffd9291d27d57d056794b44f872a1e13ad.tar.gz Qt-4d2936ffd9291d27d57d056794b44f872a1e13ad.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed audio-backend detection in configure tests.
Added support for using -L notation in the LIBS variable.
Remove redundant code in SgImage -> VGImage conversion on Symbian.
Fix incorrect dialog positioning on Symbian
Eliminated duplicated code from library handling.
Add QtOpenGL .def files
Moved the sis_targets feature profile to the correct directory.
Diffstat (limited to 'src/openvg')
-rw-r--r-- | src/openvg/qvg_symbian.cpp | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/openvg/qvg_symbian.cpp b/src/openvg/qvg_symbian.cpp index 0e6e773..ef0160c 100644 --- a/src/openvg/qvg_symbian.cpp +++ b/src/openvg/qvg_symbian.cpp @@ -112,25 +112,8 @@ static VGImage sgImageToVGImage(QEglContext *context, const RSgImage &sgImage) VGImage vgImage = VG_INVALID_HANDLE; - TInt err = 0; - - RSgDriver driver; - err = driver.Open(); - if (err != KErrNone) { - return vgImage; - } - - if (sgImage.IsNull()) { - driver.Close(); - return vgImage; - } - - TSgImageInfo sgImageInfo; - err = sgImage.GetInfo(sgImageInfo); - if (err != KErrNone) { - driver.Close(); + if (sgImage.IsNull()) return vgImage; - } const EGLint KEglImageAttribs[] = {EGL_IMAGE_PRESERVED_SYMBIAN, EGL_TRUE, EGL_NONE}; EGLImageKHR eglImage = QEgl::eglCreateImageKHR(QEgl::display(), @@ -139,22 +122,12 @@ static VGImage sgImageToVGImage(QEglContext *context, const RSgImage &sgImage) (EGLClientBuffer)&sgImage, (EGLint*)KEglImageAttribs); - if (!eglImage || eglGetError() != EGL_SUCCESS) { - driver.Close(); + if (!eglImage) return vgImage; - } vgImage = QVG::vgCreateEGLImageTargetKHR(eglImage); - if (!vgImage || vgGetError() != VG_NO_ERROR) { - QEgl::eglDestroyImageKHR(QEgl::display(), eglImage); - driver.Close(); - return vgImage; - } - //setSerialNumber(++qt_vg_pixmap_serial); - // release stuff QEgl::eglDestroyImageKHR(QEgl::display(), eglImage); - driver.Close(); return vgImage; } #endif |