Changeset 561 for trunk/tools/qvfb/qvfbview.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qvfb/qvfbview.cpp (modified) (8 diffs)

trunk/tools/qvfb/qvfbview.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -90 +90 @@
 QVFbView::QVFbView(int id, int w, int h, int d, Rotation r, QWidget *parent)
         : QVFbAbstractView(parent),
-          viewdepth(d), viewFormat(DefaultFormat), rsh(0), gsh(0), bsh(0), rmax(15), gmax(15), bmax(15),
+          viewdepth(d), viewFormat(DefaultFormat), rgb_swapped(0), rsh(0), gsh(0), bsh(0), rmax(15), gmax(15), bmax(15),
         contentsWidth(w), contentsHeight(h), gred(1.0), ggreen(1.0), gblue(1.0),
         gammatable(0), refreshRate(30), animation(0),
@@ -109 +109 @@
     }
 
-    connect(mView, SIGNAL(displayDataChanged(const QRect &)),
-            SLOT(refreshDisplay(const QRect &)));
+    connect(mView, SIGNAL(displayDataChanged(QRect)),
+            SLOT(refreshDisplay(QRect)));
 #ifdef Q_WS_X11
     connect(mView, SIGNAL(displayEmbedRequested(WId)),
@@ -458 +458 @@
         break;
     }
+
+    case 2: {
+        if (requiredSize > buffer.size())
+            buffer.resize(requiredSize);
+
+        // XXX: hw: replace by drawhelper functionality
+
+        const int pixelsPerByte = 4;
+        quint8 *src = reinterpret_cast<quint8*>(mView->data())
+                      + r.y() * mView->linestep() + r.x() / pixelsPerByte;
+        const int align = qMin(r.width(), (4 - (r.x() & 3)) & 3);
+        const int doAlign = (align > 0 ? 1 : 0);
+        const int tail = qMin(r.width(), (r.width() - align) & 3);
+        const int doTail = (tail > 0 ? 1 : 0);
+        const int width8 = (r.width() - align) / pixelsPerByte;
+        const int stride = mView->linestep() - (width8 + doAlign);
+
+        uchar *b = reinterpret_cast<uchar*>(buffer.data());
+        img = QImage(b, r.width(), r.height(), QImage::Format_RGB32);
+        for (int y = 0; y < r.height(); ++y) {
+            quint32 *dest = reinterpret_cast<quint32*>(img.scanLine(y));
+            quint8 c;
+
+            if (doAlign) {
+                switch (align) {
+                case 3: c = ((*src & 0x30) >> 4) * 0x55;
+                        *dest++ = qRgb(c, c, c);
+                case 2: c = ((*src & 0x0c) >> 2) * 0x55;
+                        *dest++ = qRgb(c, c, c);
+                case 1: c = ((*src & 0x03)) * 0x55;
+                        *dest++ = qRgb(c, c, c);
+                }
+                ++src;
+            }
+            for (int i = 0; i < width8; ++i) {
+                c = ((*src & 0xc0) >> 6) * 0x55;
+                *dest++ = qRgb(c, c, c);
+                c = ((*src & 0x30) >> 4) * 0x55;
+                *dest++ = qRgb(c, c, c);
+                c = ((*src & 0x0c) >> 2) * 0x55;
+                *dest++ = qRgb(c, c, c);
+                c = ((*src & 0x03)) * 0x55;
+                *dest++ = qRgb(c, c, c);
+
+                ++src;
+            }
+            if (doTail) {
+                switch (tail) {
+                case 3: c = ((*src & 0x0c) >> 2) * 0x55;
+                        dest[2] = qRgb(c, c, c);
+                case 2: c = ((*src & 0x30) >> 4) * 0x55;
+                        dest[1] = qRgb(c, c, c);
+                case 1: c = ((*src & 0xc0) >> 6) * 0x55;
+                        dest[0] = qRgb(c, c, c);
+                }
+            }
+            src += stride;
+        }
+        break;
+    }
+
     case 4: {
         if (requiredSize > buffer.size())
@@ -536 +597 @@
                    QImage::Format_Indexed8);
         img.setColorTable(mView->clut());
-        if (img.numColors() <= 0)
+        if (img.colorCount() <= 0)
             img = QImage();
         break;
     }
+
+    if (rgb_swapped)
+        img = img.rgbSwapped();
 
     if ( brightness != 255 ) {
@@ -550 +614 @@
                 img = img.convertToFormat(QImage::Format_RGB32);
 
-            // NOTE: calling bits() may change numBytes(), so do not
+            // NOTE: calling bits() may change byteCount(), so do not
             // pass them as parameters (which are evaluated right-to-left).
             QRgb *b = (QRgb*)img.bits();
-            int n = img.numBytes()/4;
+            int n = img.byteCount()/4;
             dim(b,n,brightness);
         }