Changeset 561 for trunk/src/plugins/imageformats/gif

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/plugins/imageformats/gif/gif.pro (modified) (1 diff)
• src/plugins/imageformats/gif/main.cpp (modified) (3 diffs)
• src/plugins/imageformats/gif/qgifhandler.cpp (modified) (16 diffs)
• src/plugins/imageformats/gif/qgifhandler.h (modified) (3 diffs)

trunk/src/plugins/imageformats/gif/gif.pro

@@ -9 +9 @@
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats
 INSTALLS += target
+
+

trunk/src/plugins/imageformats/gif/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/plugins/imageformats/gif/qgifhandler.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -54 +54 @@
 
 #define Q_TRANSPARENT 0x00ffffff
+
+
+
+
 
 /*
@@ -136 +140 @@
     bool out_of_bounds;
     bool digress;
-    void nextY(QImage *image);
+    void nextY();
     void disposePrevious(QImage *image);
 };
@@ -233 +237 @@
     //    CompuServe Incorporated."
 
+
+
+
+
 #define LM(l, m) (((m)<<8)|l)
     digress = false;
-    int initial = length;
+    int initial = length;
     while (!digress && length) {
         length--;
@@ -334 +342 @@
 
                 QImage::Format format = trans_index >= 0 ? QImage::Format_ARGB32 : QImage::Format_RGB32;
-                if (image->isNull() || (image->size() != QSize(swidth, sheight)) || image->format() != format) {
+                if (image->isNull()) {
                     (*image) = QImage(swidth, sheight, format);
-                    memset(image->bits(), 0, image->numBytes());
+                    bpl = image->bytesPerLine();
+                    bits = image->bits();
+                    memset(bits, 0, image->byteCount());
 
                     // ### size of the upcoming frame, should rather
@@ -394 +404 @@
                                               qMax(backingstore.height(), h),
                                               QImage::Format_RGB32);
-                        memset(image->bits(), 0, image->numBytes());
+                        memset(());
                     }
+
+
                     for (int ln=0; ln<h; ln++) {
-                        memcpy(backingstore.scanLine(ln),
-                               image->scanLine(t+ln)+l, w*sizeof(QRgb));
+                        memcpy(ln),
+                               l, w*sizeof(QRgb));
                     }
                 }
@@ -471 +483 @@
                         firstcode=oldcode=code;
                         if (!out_of_bounds && image->height() > y && firstcode!=trans_index)
-                            ((QRgb*)image->scanLine(y))[x] = color(firstcode);
+                            ((QRgb*)y))[x] = color(firstcode);
                         x++;
                         if (x>=swidth) out_of_bounds = true;
@@ -478 +490 @@
                             x=left;
                             out_of_bounds = left>=swidth || y>=sheight;
-                            nextY(image);
+                            nextY();
                         }
                     } else {
@@ -516 +528 @@
                         QRgb *line = 0;
                         if (!out_of_bounds && h > y)
-                            line = (QRgb*)image->scanLine(y);
+                            line = (QRgb*)y);
                         while (sp>stack) {
                             const uchar index = *(--sp);
@@ -530 +542 @@
                                 x=left;
                                 out_of_bounds = left>=swidth || y>=sheight;
-                                nextY(image);
+                                nextY();
                                 if (!out_of_bounds && h > y)
-                                    line = (QRgb*)image->scanLine(y);
+                                    line = (QRgb*)y);
                             }
                         }
@@ -645 +657 @@
 }
 
-void QGIFFormat::nextY(QImage *image)
+void QGIFFormat::nextY()
 {
     int my;
@@ -661 +673 @@
         if (trans_index < 0) {
             for (i=1; i<=my; i++) {
-                memcpy(image->scanLine(y+i)+left*sizeof(QRgb), image->scanLine(y)+left*sizeof(QRgb),
+                memcpy(y)+left*sizeof(QRgb),
                        (right-left+1)*sizeof(QRgb));
             }
@@ -690 +702 @@
         if (trans_index < 0) {
             for (i=1; i<=my; i++) {
-                memcpy(image->scanLine(y+i)+left*sizeof(QRgb), image->scanLine(y)+left*sizeof(QRgb),
+                memcpy(y)+left*sizeof(QRgb),
                        (right-left+1)*sizeof(QRgb));
             }
@@ -714 +726 @@
         if (trans_index < 0) {
             for (i=1; i<=my; i++) {
-                memcpy(image->scanLine(y+i)+left*sizeof(QRgb), image->scanLine(y)+left*sizeof(QRgb),
+                memcpy(y)+left*sizeof(QRgb),
                        (right-left+1)*sizeof(QRgb));
             }

trunk/src/plugins/imageformats/gif/qgifhandler.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **