MCL/sf/mw/qt: comparison src/openvg/qpaintengine

equal deleted inserted replaced

-:41300fa6a67c
+:3b1da2848fc7
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 VGMatrixMode matrixMode;    // Last matrix mode that was set.
 VGImageMode imageMode;      // Last image mode that was set.
 QRegion scissorRegion;  // Currently active scissor region.
 bool scissorActive;     // True if scissor region is active.
+bool scissorDirty;      // True if scissor is dirty after native painting.
 QPaintEngine::DirtyFlags dirty;
 QColor clearColor;      // Last clear color that was set.
 VGfloat clearOpacity;   // Opacity during the last clear.
 maskValid = false;
 maskIsSet = false;
 rawVG = false;
 scissorActive = false;
+scissorDirty = false;
 dirty = 0;
 clearOpacity = 1.0f;
 target[x] = (source[x>>3] >> (x&7)) & 1 ? fg : bg;
 }
 return dest;
 }
+// defined in qpixmapdata_vg.cpp.
+const uchar *qt_vg_imageBits(const QImage& image);
 static VGImage toVGImage
 (const QImage & image, Qt::ImageConversionFlags flags = Qt::AutoColor)
 {
 QImage img(image);
 img = image.convertToFormat(QImage::Format_ARGB32_Premultiplied, flags);
 format = VG_sARGB_8888_PRE;
 break;
 }
-const uchar *pixels = img.bits();
+const uchar *pixels = qt_vg_imageBits(img);
 VGImage vgImg = QVGImagePool::instance()->createPermanentImage
 (format, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
 vgImageSubData
 (vgImg, pixels, img.bytesPerLine(), format, 0, 0,
 img = image.convertToFormat(QImage::Format_ARGB32_Premultiplied, flags);
 format = VG_sARGB_8888_PRE;
 break;
 }
-const uchar *pixels = img.bits() + bpp * sr.x() +
+const uchar *pixels = qt_vg_imageBits(img) + bpp * sr.x() +
 img.bytesPerLine() * sr.y();
 VGImage vgImg = QVGImagePool::instance()->createPermanentImage
 (format, sr.width(), sr.height(), VG_IMAGE_QUALITY_FASTER);
 vgImageSubData
 painter.begin(&img);
 painter.setOpacity(opacity);
 painter.drawImage(0, 0, image);
 painter.end();
-const uchar *pixels = img.bits();
+const uchar *pixels = qt_vg_imageBits(img);
 VGImage vgImg = QVGImagePool::instance()->createPermanentImage
 (VG_sARGB_8888_PRE, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
 vgImageSubData
 (vgImg, pixels, img.bytesPerLine(), VG_sARGB_8888_PRE, 0, 0,
 painter.begin(&img);
 painter.setOpacity(opacity);
 painter.drawImage(QPoint(0, 0), image, sr);
 painter.end();
-const uchar *pixels = img.bits();
+const uchar *pixels = qt_vg_imageBits(img);
 VGImage vgImg = QVGImagePool::instance()->createPermanentImage
 (VG_sARGB_8888_PRE, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
 vgImageSubData
 (vgImg, pixels, img.bytesPerLine(), VG_sARGB_8888_PRE, 0, 0,
 if (isDefaultClipRegion(region)) {
 // The scissor region is the entire drawing surface,
 // so there is no point doing any scissoring.
 vgSeti(VG_SCISSORING, VG_FALSE);
 d->scissorActive = false;
+d->scissorDirty = false;
 return;
 }
 } else
 #endif
 {
 if (isDefaultClipRegion(region)) {
 // The scissor region is the entire drawing surface,
 // so there is no point doing any scissoring.
 vgSeti(VG_SCISSORING, VG_FALSE);
 d->scissorActive = false;
+d->scissorDirty = false;
 return;
 }
 } else
 #endif
 // Disable the scissor completely if the system clip is empty.
 if (region.isEmpty()) {
 vgSeti(VG_SCISSORING, VG_FALSE);
 d->scissorActive = false;
+d->scissorDirty = false;
 return;
 }
 }
-if (d->scissorActive && region == d->scissorRegion)
+if (d->scissorActive && region == d->scissorRegion && !d->scissorDirty)
 return;
 QVector<QRect> rects = region.rects();
 int count = rects.count();
 if (count > d->maxScissorRects)
 params[i * 4 + 3] = rects[i].height();
 }
 vgSetiv(VG_SCISSOR_RECTS, count * 4, params.data());
 vgSeti(VG_SCISSORING, VG_TRUE);
+d->scissorDirty = false;
 d->scissorActive = true;
 d->scissorRegion = region;
 }
 QRegion QVGPaintEngine::defaultClipRegion()
 VGImage vgImage = VG_INVALID_HANDLE;
 metrics = ti.fontEngine->boundingBox(glyph);
 if (!scaledImage.isNull()) {  // Not a space character
 if (scaledImage.format() == QImage::Format_Indexed8) {
 vgImage = vgCreateImage(VG_A_8, scaledImage.width(), scaledImage.height(), VG_IMAGE_QUALITY_FASTER);
-vgImageSubData(vgImage, scaledImage.bits(), scaledImage.bytesPerLine(), VG_A_8, 0, 0, scaledImage.width(), scaledImage.height());
+vgImageSubData(vgImage, qt_vg_imageBits(scaledImage), scaledImage.bytesPerLine(), VG_A_8, 0, 0, scaledImage.width(), scaledImage.height());
 } else if (scaledImage.format() == QImage::Format_Mono) {
 QImage img = scaledImage.convertToFormat(QImage::Format_Indexed8);
 vgImage = vgCreateImage(VG_A_8, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
-vgImageSubData(vgImage, img.bits(), img.bytesPerLine(), VG_A_8, 0, 0, img.width(), img.height());
+vgImageSubData(vgImage, qt_vg_imageBits(img), img.bytesPerLine(), VG_A_8, 0, 0, img.width(), img.height());
 } else {
 QImage img = scaledImage.convertToFormat(QImage::Format_ARGB32_Premultiplied);
 vgImage = vgCreateImage(VG_sARGB_8888_PRE, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
-vgImageSubData(vgImage, img.bits(), img.bytesPerLine(), VG_sARGB_8888_PRE, 0, 0, img.width(), img.height());
+vgImageSubData(vgImage, qt_vg_imageBits(img), img.bytesPerLine(), VG_sARGB_8888_PRE, 0, 0, img.width(), img.height());
 }
 }
 origin[0] = -metrics.x.toReal() + 0.5f;
 origin[1] = -metrics.y.toReal() + 0.5f;
 escapement[0] = metrics.xoff.toReal();
 d->forceBrushChange = true;
 d->penType = (VGPaintType)0;
 d->brushType = (VGPaintType)0;
 d->clearColor = QColor();
 d->fillPaint = d->brushPaint;
+d->scissorDirty = true;
 restoreState(QPaintEngine::AllDirty);
 d->dirty = dirty;
 d->rawVG = false;
 vgSetPaint(d->penPaint, VG_STROKE_PATH);
 vgSetPaint(d->brushPaint, VG_FILL_PATH);
 (VG_sARGB_8888_PRE, img.width(), img.height(),
 VG_IMAGE_QUALITY_FASTER);
 if (vgImage == VG_INVALID_HANDLE)
 return;
 vgImageSubData
-(vgImage, img.bits() + img.bytesPerLine() * (img.height() - 1),
+(vgImage, qt_vg_imageBits(img) + img.bytesPerLine() * (img.height() - 1),
 -(img.bytesPerLine()), VG_sARGB_8888_PRE, 0, 0,
 img.width(), img.height());
 vgDrawImage(vgImage);
 vgDestroyImage(vgImage);
 params[i * 4 + 3] = rects[i].height();
 }
 vgSetiv(VG_SCISSOR_RECTS, count * 4, params.data());
 vgSeti(VG_SCISSORING, VG_TRUE);
+d->scissorDirty = false;
 d->scissorActive = true;
 d->scissorRegion = region;
 }
 void QVGCompositionHelper::clearScissor()
 {
-if (d->scissorActive) {
+if (d->scissorActive || d->scissorDirty) {
 vgSeti(VG_SCISSORING, VG_FALSE);
 d->scissorActive = false;
+d->scissorDirty = false;
 }
 }
 #endif // !QVG_NO_SINGLE_CONTEXT && !QT_NO_EGL

branch	RCL_3
changeset 4	3b1da2848fc7
parent 3	41300fa6a67c
child 7	3f74d0d4af4c