Changeset 561 for trunk/src/gui/image/qpixmapdata.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)
• src/gui/image/qpixmapdata.cpp (modified) (9 diffs)

trunk/src/gui/image/qpixmapdata.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 QtGui module 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$
 **
@@ -41 +41 @@
 
 #include "qpixmapdata_p.h"
+#include <QtCore/qbuffer.h>
 #include <QtGui/qbitmap.h>
 #include <QtGui/qimagereader.h>
+#include <private/qgraphicssystem_p.h>
+#include <private/qapplication_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -49 +52 @@
                                      0x10, 0x20, 0x40, 0x80 };
 
+QPixmapData *QPixmapData::create(int w, int h, PixelType type)
+{
+    QPixmapData *data;
+    QGraphicsSystem* gs = QApplicationPrivate::graphicsSystem();
+    if (gs)
+        data = gs->createPixmapData(static_cast<QPixmapData::PixelType>(type));
+    else
+        data = QGraphicsSystem::createDefaultPixmapData(static_cast<QPixmapData::PixelType>(type));
+    data->resize(w, h);
+    return data;
+}
+
+
 QPixmapData::QPixmapData(PixelType pixelType, int objectId)
-    : ref(0), detach_no(0), type(pixelType), id(objectId), ser_no(0), is_cached(false)
-{
-
+    : w(0),
+      h(0),
+      d(0),
+      is_null(true),
+      ref(0),
+      detach_no(0),
+      type(pixelType),
+      id(objectId),
+      ser_no(0),
+      is_cached(false)
+{
 }
 
@@ -59 +83 @@
 }
 
-void QPixmapData::fromFile(const QString &fileName, const char *format,
+QPixmapData *QPixmapData::createCompatiblePixmapData() const
+{
+    QPixmapData *d;
+    QGraphicsSystem *gs = QApplicationPrivate::graphicsSystem();
+    if (gs)
+        d = gs->createPixmapData(pixelType());
+    else
+        d = QGraphicsSystem::createDefaultPixmapData(pixelType());
+    return d;
+}
+
+static QImage makeBitmapCompliantIfNeeded(QPixmapData *d, const QImage &image, Qt::ImageConversionFlags flags)
+{
+    if (d->pixelType() == QPixmapData::BitmapType) {
+        QImage img = image.convertToFormat(QImage::Format_MonoLSB, flags);
+
+        // make sure image.color(0) == Qt::color0 (white)
+        // and image.color(1) == Qt::color1 (black)
+        const QRgb c0 = QColor(Qt::black).rgb();
+        const QRgb c1 = QColor(Qt::white).rgb();
+        if (img.color(0) == c0 && img.color(1) == c1) {
+            img.invertPixels();
+            img.setColor(0, c1);
+            img.setColor(1, c0);
+        }
+        return img;
+    }
+
+    return image;
+}
+
+bool QPixmapData::fromFile(const QString &fileName, const char *format,
                            Qt::ImageConversionFlags flags)
 {
-    const QImage image = QImageReader(fileName, format).read();
+    QImage image = QImageReader(fileName, format).read();
     if (image.isNull())
-        return;
-
-    fromImage(image, flags);
+        return false;
+    fromImage(makeBitmapCompliantIfNeeded(this, image, flags), flags);
+    return !isNull();
+}
+
+bool QPixmapData::fromData(const uchar *buf, uint len, const char *format, Qt::ImageConversionFlags flags)
+{
+    QByteArray a = QByteArray::fromRawData(reinterpret_cast<const char *>(buf), len);
+    QBuffer b(&a);
+    b.open(QIODevice::ReadOnly);
+    QImage image = QImageReader(&b, format).read();
+    fromImage(makeBitmapCompliantIfNeeded(this, image, flags), flags);
+    return !isNull();
 }
 
@@ -72 +137 @@
 {
     fromImage(data->toImage().copy(rect), Qt::AutoColor);
+}
+
+bool QPixmapData::scroll(int dx, int dy, const QRect &rect)
+{
+    Q_UNUSED(dx);
+    Q_UNUSED(dy);
+    Q_UNUSED(rect);
+    return false;
 }
 
@@ -129 +202 @@
         return QBitmap();
 
-    mask.setNumColors(2);
+    mask.setColorCount(2);
     mask.setColor(0, QColor(Qt::color0).rgba());
     mask.setColor(1, QColor(Qt::color1).rgba());
@@ -177 +250 @@
 }
 
+#if defined(Q_OS_SYMBIAN)
+void* QPixmapData::toNativeType(NativeType /* type */)
+{
+    return 0;
+}
+
+void QPixmapData::fromNativeType(void* /* pixmap */, NativeType /* typre */)
+{
+    return;
+}
+#endif
+
 QT_END_NAMESPACE