Changeset 651 for trunk/src/openvg

Timestamp:

Mar 8, 2010, 12:52:58 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/openvg/qpaintengine_vg.cpp (modified) (28 diffs)
• src/openvg/qpaintengine_vg_p.h (modified) (1 diff)
• src/openvg/qpixmapdata_vg.cpp (modified) (5 diffs)
• src/openvg/qpixmapdata_vg_p.h (modified) (1 diff)
• src/openvg/qpixmapfilter_vg.cpp (modified) (1 diff)
• src/openvg/qpixmapfilter_vg_p.h (modified) (1 diff)
• src/openvg/qvg.h (modified) (1 diff)
• src/openvg/qvg_p.h (modified) (1 diff)
• src/openvg/qvgcompositionhelper_p.h (modified) (1 diff)
• src/openvg/qvgimagepool.cpp (modified) (1 diff)
• src/openvg/qvgimagepool_p.h (modified) (1 diff)
• src/openvg/qwindowsurface_vg.cpp (modified) (1 diff)
• src/openvg/qwindowsurface_vg_p.h (modified) (1 diff)
• src/openvg/qwindowsurface_vgegl.cpp (modified) (1 diff)
• src/openvg/qwindowsurface_vgegl_p.h (modified) (1 diff)

trunk/src/openvg/qpaintengine_vg.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -189 +189 @@
     bool maskValid;         // True if vgMask() contains valid data.
     bool maskIsSet;         // True if mask would be fully set if it was valid.
+
     bool rawVG;             // True if processing a raw VG escape.
 
@@ -356 +357 @@
     maskValid = false;
     maskIsSet = false;
+
     rawVG = false;
 
@@ -1543 +1545 @@
 {
     QTransform::TransformationType type = transform.type();
-    return (type == QTransform::TxNone || type == QTransform::TxTranslate);
+    if (type == QTransform::TxNone || type == QTransform::TxTranslate)
+        return true;
+    if (type == QTransform::TxRotate) {
+        // Check for 0, 90, 180, and 270 degree rotations.
+        // (0 might happen after 4 rotations of 90 degrees).
+        qreal m11 = transform.m11();
+        qreal m12 = transform.m12();
+        qreal m21 = transform.m21();
+        qreal m22 = transform.m22();
+        if (m11 == 0.0f && m22 == 0.0f) {
+            if (m12 == 1.0f && m21 == -1.0f)
+                return true;    // 90 degrees.
+            else if (m12 == -1.0f && m21 == 1.0f)
+                return true;    // 270 degrees.
+        } else if (m12 == 0.0f && m21 == 0.0f) {
+            if (m11 == -1.0f && m22 == -1.0f)
+                return true;    // 180 degrees.
+            else if (m11 == 1.0f && m22 == 1.0f)
+                return true;    // 0 degrees.
+        }
+    }
+    return false;
 }
 
@@ -1665 +1688 @@
         d->maskValid = false;
         d->maskIsSet = true;
+
         d->maskRect = QRect();
         vgSeti(VG_MASKING, VG_FALSE);
@@ -1670 +1694 @@
     }
 
-#if defined(QVG_NO_RENDER_TO_MASK)
     // We don't have vgRenderToMask(), so handle simple QRectF's only.
     if (path.shape() == QVectorPath::RectangleHint &&
@@ -1680 +1703 @@
                     points[5] - points[1]);
         clip(rect.toRect(), op);
-    }
-#else
+        return;
+    }
+
+#if !defined(QVG_NO_RENDER_TO_MASK)
     QPaintDevice *pdev = paintDevice();
     int width = pdev->width();
@@ -1712 +1737 @@
     d->maskValid = true;
     d->maskIsSet = false;
+
 #endif
 }
@@ -1732 +1758 @@
             d->maskValid = false;
             d->maskIsSet = true;
+
             d->maskRect = QRect();
             vgSeti(VG_MASKING, VG_FALSE);
@@ -1747 +1774 @@
                 d->maskValid = false;
                 d->maskIsSet = true;
+
                 d->maskRect = QRect();
             } else {
@@ -1764 +1792 @@
                         d->maskValid = false;
                         d->maskIsSet = false;
+
                         d->maskRect = QRect();
                         d->modifyMask(this, VG_FILL_MASK, r);
@@ -1772 +1801 @@
                 d->maskValid = false;
                 d->maskIsSet = false;
+
                 d->maskRect = clipRect;
                 vgSeti(VG_MASKING, VG_FALSE);
@@ -1782 +1812 @@
         {
             QRect r = d->transform.mapRect(rect);
-            if (d->maskIsSet && isDefaultClipRect(r)) {
+            if (!d->maskValid) {
+                // Mask has not been used yet, so intersect with
+                // the previous scissor-based region in maskRect.
+                if (d->scissorMask)
+                    r = r.intersect(d->maskRect);
+                if (isDefaultClipRect(r)) {
+                    // The clip is the full window, so turn off clipping.
+                    d->maskIsSet = true;
+                    d->maskRect = QRect();
+                } else {
+                    // Activate the scissor on a smaller maskRect.
+                    d->maskIsSet = false;
+                    d->maskRect = r;
+                }
+                d->scissorMask = true;
+                updateScissor();
+            } else if (d->maskIsSet && isDefaultClipRect(r)) {
                 // Intersecting a full-window clip with a full-window
                 // region is the same as turning off clipping.
@@ -1789 +1835 @@
                 d->maskValid = false;
                 d->maskIsSet = true;
+
                 d->maskRect = QRect();
             } else {
@@ -1830 +1877 @@
             d->maskValid = false;
             d->maskIsSet = true;
+
             d->maskRect = QRect();
             vgSeti(VG_MASKING, VG_FALSE);
@@ -1845 +1893 @@
                 d->maskValid = false;
                 d->maskIsSet = true;
+
                 d->maskRect = QRect();
             } else {
@@ -1858 +1907 @@
                     d->maskValid = false;
                     d->maskIsSet = false;
+
                     d->maskRect = clip.boundingRect();
                     vgSeti(VG_MASKING, VG_FALSE);
@@ -1864 +1914 @@
                     d->maskValid = false;
                     d->maskIsSet = false;
+
                     d->maskRect = QRect();
                     d->modifyMask(this, VG_FILL_MASK, r);
@@ -1888 +1939 @@
                 d->maskValid = false;
                 d->maskIsSet = true;
+
                 d->maskRect = QRect();
             } else {
@@ -1966 +2018 @@
         d->maskValid = false;
         d->maskIsSet = true;
+
         d->maskRect = QRect();
         vgSeti(VG_MASKING, VG_FALSE);
@@ -2001 +2054 @@
     d->maskValid = true;
     d->maskIsSet = false;
+
 #else
     QPaintEngineEx::clip(path, op);
@@ -2044 +2098 @@
     maskValid = true;
     maskIsSet = false;
+
 }
 
@@ -2065 +2120 @@
     maskValid = true;
     maskIsSet = false;
+
 }
 
@@ -2097 +2153 @@
 #if !defined(QVG_SCISSOR_CLIP)
         // Combine the system clip with the simple mask rectangle.
-        if (!d->maskRect.isNull()) {
+        if () {
             if (region.isEmpty())
                 region = d->maskRect;
@@ -2188 +2244 @@
         d->maskValid = false;
         d->maskIsSet = true;
+
         d->maskRect = QRect();
         s->clipRegion = defaultClipRegion();
@@ -2197 +2254 @@
         d->maskValid = false;
         d->maskIsSet = false;
+
         d->maskRect = QRect();
     }
@@ -2315 +2373 @@
     QVGPainterState *s = state();
     if (!s->clipEnabled || s->clipOperation == Qt::NoClip) {
-        // The transform will either be identity or a simple translation,
-        // so do a simpler version of "r = d->transform.map(rect).toRect()".
-        QRect r = QRect(qRound(rect.x() + d->transform.dx()),
-                        qRound(rect.y() + d->transform.dy()),
-                        qRound(rect.width()),
-                        qRound(rect.height()));
+        QRect r = d->transform.mapRect(rect).toRect();
         int height = paintDevice()->height();
         if (d->clearColor != color || d->clearOpacity != s->opacity) {
@@ -3399 +3452 @@
         d->maskValid = false;
         d->maskIsSet = false;
+
         d->maskRect = QRect();
         clipEnabledChanged();

trunk/src/openvg/qpaintengine_vg_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qpixmapdata_vg.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -47 +47 @@
 
 #ifdef QT_SYMBIAN_SUPPORTS_SGIMAGE
+
+
 #include <graphics/sgimage.h>
 typedef EGLImageKHR (*pfnEglCreateImageKHR)(EGLDisplay, EGLContext, EGLenum, EGLClientBuffer, EGLint*);
 typedef EGLBoolean (*pfnEglDestroyImageKHR)(EGLDisplay, EGLImageKHR);
 typedef VGImage (*pfnVgCreateEGLImageTargetKHR)(VGeglImageKHR);
-#endif
+#endif
 
 QT_BEGIN_NAMESPACE
@@ -426 +428 @@
 
 #if defined(Q_OS_SYMBIAN)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void QVGPixmapData::cleanup()
 {
@@ -511 +541 @@
         SgDriver::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
@@ -594 +666 @@
         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

trunk/src/openvg/qpixmapdata_vg_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qpixmapfilter_vg.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qpixmapfilter_vg_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qvg.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qvg_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qvgcompositionhelper_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qvgimagepool.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qvgimagepool_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qwindowsurface_vg.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qwindowsurface_vg_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qwindowsurface_vgegl.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/openvg/qwindowsurface_vgegl_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])