diff options
| author | Jason Barron <jbarron@trolltech.com> | 2010-03-18 11:58:04 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2010-03-18 11:58:04 (GMT) |
| commit | bfb976c4ca539c7207083aa57e3d707dcad88bd5 (patch) | |
| tree | 9a1ea9a5bbe5221fcf9f2354a560724102bf1966 /src/openvg/qpixmapdata_vg.cpp | |
| parent | d7aa84d9f4ea9f34dfcdf4409508475a11015e9f (diff) | |
| download | Qt-bfb976c4ca539c7207083aa57e3d707dcad88bd5.zip Qt-bfb976c4ca539c7207083aa57e3d707dcad88bd5.tar.gz Qt-bfb976c4ca539c7207083aa57e3d707dcad88bd5.tar.bz2 | |
Fix compilation of OpenVG.
As simple as QEglContext::display -> QEgl::display.
Reviewed-by: Tom Cooksey
Diffstat (limited to 'src/openvg/qpixmapdata_vg.cpp')
| -rw-r--r-- | src/openvg/qpixmapdata_vg.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp index 8adf5af..53f6b4c 100644 --- a/src/openvg/qpixmapdata_vg.cpp +++ b/src/openvg/qpixmapdata_vg.cpp @@ -496,7 +496,7 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type) } const EGLint KEglImageAttribs[] = {EGL_IMAGE_PRESERVED_SYMBIAN, EGL_TRUE, EGL_NONE}; - EGLImageKHR eglImage = eglCreateImageKHR(QEglContext::display(), + EGLImageKHR eglImage = eglCreateImageKHR(QEgl::display(), EGL_NO_CONTEXT, EGL_NATIVE_PIXMAP_KHR, (EGLClientBuffer)sgImage, @@ -511,7 +511,7 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type) vgImage = vgCreateEGLImageTargetKHR(eglImage); if(vgGetError() != VG_NO_ERROR) { cleanup(); - eglDestroyImageKHR(QEglContext::display(), eglImage); + eglDestroyImageKHR(QEgl::display(), eglImage); SgDriver::Close(); return; } @@ -525,7 +525,7 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type) prevSize = QSize(w, h); setSerialNumber(++qt_vg_pixmap_serial); // release stuff - eglDestroyImageKHR(QEglContext::display(), eglImage); + eglDestroyImageKHR(QEgl::display(), eglImage); SgDriver::Close(); } else if (type == QPixmapData::FbsBitmap) { CFbsBitmap *bitmap = reinterpret_cast<CFbsBitmap*>(pixmap); @@ -620,7 +620,7 @@ void* QVGPixmapData::toNativeType(NativeType type) } const EGLint KEglImageAttribs[] = {EGL_IMAGE_PRESERVED_SYMBIAN, EGL_TRUE, EGL_NONE}; - EGLImageKHR eglImage = eglCreateImageKHR(QEglContext::display(), + EGLImageKHR eglImage = eglCreateImageKHR(QEgl::display(), EGL_NO_CONTEXT, EGL_NATIVE_PIXMAP_KHR, (EGLClientBuffer)sgImage, @@ -633,7 +633,7 @@ void* QVGPixmapData::toNativeType(NativeType type) VGImage dstVgImage = vgCreateEGLImageTargetKHR(eglImage); if(vgGetError() != VG_NO_ERROR) { - eglDestroyImageKHR(QEglContext::display(), eglImage); + eglDestroyImageKHR(QEgl::display(), eglImage); sgImage->Close(); SgDriver::Close(); return 0; @@ -649,7 +649,7 @@ void* QVGPixmapData::toNativeType(NativeType type) } // release stuff vgDestroyImage(dstVgImage); - eglDestroyImageKHR(QEglContext::display(), eglImage); + eglDestroyImageKHR(QEgl::display(), eglImage); SgDriver::Close(); return reinterpret_cast<void*>(sgImage); } else if (type == QPixmapData::FbsBitmap) { |