diff options
Diffstat (limited to 'src/openvg')
| -rw-r--r-- | src/openvg/qpaintengine_vg.cpp | 2 | ||||
| -rw-r--r-- | src/openvg/qvg_symbian.cpp | 31 |
2 files changed, 3 insertions, 30 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index 1b0c5e8..3c2fd3d 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -1008,7 +1008,7 @@ VGPath QVGPaintEnginePrivate::roundedRectPath(const QRectF &rect, qreal xRadius, x1, y2 - (1 - KAPPA) * yRadius, x1, y2 - yRadius, x1, y1 + yRadius, // LineTo - x1, y1 + KAPPA * yRadius, // CurveTo + x1, y1 + (1 - KAPPA) * yRadius, // CurveTo x1 + (1 - KAPPA) * xRadius, y1, x1 + xRadius, y1 }; 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 |