diff options
-rw-r--r-- | src/openvg/qpixmapdata_vg.cpp | 18 | ||||
-rw-r--r-- | src/openvg/qpixmapdata_vg_p.h | 4 | ||||
-rw-r--r-- | src/openvg/qvg_symbian.cpp | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp index 724d06d..509882b 100644 --- a/src/openvg/qpixmapdata_vg.cpp +++ b/src/openvg/qpixmapdata_vg.cpp @@ -75,13 +75,13 @@ QVGPixmapData::QVGPixmapData(PixelType type) QVGPixmapData::~QVGPixmapData() { - destroyVGImageAndVGContext(); + destroyImageAndContext(); #if !defined(QT_NO_EGL) qt_vg_unregister_pixmap(this); #endif } -void QVGPixmapData::destroyVGImages() +void QVGPixmapData::destroyImages() { if (inImagePool) { QVGImagePool *pool = QVGImagePool::instance(); @@ -100,23 +100,23 @@ void QVGPixmapData::destroyVGImages() inImagePool = false; } -void QVGPixmapData::destroyVGImageAndVGContext() +void QVGPixmapData::destroyImageAndContext() { if (vgImage != VG_INVALID_HANDLE) { // We need to have a context current to destroy the image. #if !defined(QT_NO_EGL) if (context->isCurrent()) { - destroyVGImages(); + destroyImages(); } else { // We don't currently have a widget surface active, but we // need a surface to make the context current. So use the // shared pbuffer surface instead. context->makeCurrent(qt_vg_shared_surface()); - destroyVGImages(); + destroyImages(); context->lazyDoneCurrent(); } #else - destroyVGImages(); + destroyImages(); #endif } #if !defined(QT_NO_EGL) @@ -301,7 +301,7 @@ VGImage QVGPixmapData::toVGImage() #endif if (recreate && prevSize != QSize(w, h)) - destroyVGImages(); + destroyImages(); else if (recreate) cachedOpacity = -1.0f; // Force opacity image to be refreshed later. @@ -393,7 +393,7 @@ void QVGPixmapData::hibernate() return; forceToImage(); - destroyVGImageAndVGContext(); + destroyImageAndContext(); } void QVGPixmapData::reclaimImages() @@ -401,7 +401,7 @@ void QVGPixmapData::reclaimImages() if (!inImagePool) return; forceToImage(); - destroyVGImages(); + destroyImages(); } Q_DECL_IMPORT extern int qt_defaultDpiX(); diff --git a/src/openvg/qpixmapdata_vg_p.h b/src/openvg/qpixmapdata_vg_p.h index b8f01eb..7ffdc85 100644 --- a/src/openvg/qpixmapdata_vg_p.h +++ b/src/openvg/qpixmapdata_vg_p.h @@ -171,8 +171,8 @@ protected: void forceToImage(); QImage::Format sourceFormat() const; - void destroyVGImageAndVGContext(); - void destroyVGImages(); + void destroyImageAndContext(); + void destroyImages(); }; QT_END_NAMESPACE diff --git a/src/openvg/qvg_symbian.cpp b/src/openvg/qvg_symbian.cpp index b6bf858..c608c81 100644 --- a/src/openvg/qvg_symbian.cpp +++ b/src/openvg/qvg_symbian.cpp @@ -144,7 +144,7 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type) if (type == QPixmapData::SgImage && pixmap) { #if defined(QT_SYMBIAN_SUPPORTS_SGIMAGE) && !defined(QT_NO_EGL) RSgImage *sgImage = reinterpret_cast<RSgImage*>(pixmap); - destroyVGImages(); + destroyImages(); prevSize = QSize(); VGImage vgImage = sgImageToVGImage(context, *sgImage); |