MCL/sf/mw/qt: comparison src/plugins/imageformats/gif/qgifhandler.cpp

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 plugins of the Qt Toolkit.
 **
 #include <qvariant.h>
 QT_BEGIN_NAMESPACE
 #define Q_TRANSPARENT 0x00ffffff
+// avoid going through QImage::scanLine() which calls detach
+#define FAST_SCAN_LINE(bits, bpl, y) (bits + (y) * bpl)
 /*
 Incremental image decoder for GIF image format.
 This subclass of QImageFormat decodes GIF format images,
 bool needfirst;
 int x, y;
 int frame;
 bool out_of_bounds;
 bool digress;
-void nextY(QImage *image);
+void nextY(unsigned char *bits, int bpl);
 void disposePrevious(QImage *image);
 };
 /*!
 Constructs a QGIFFormat.
 {
 // We are required to state that
 //    "The Graphics Interchange Format(c) is the Copyright property of
 //    CompuServe Incorporated. GIF(sm) is a Service Mark property of
 //    CompuServe Incorporated."
+image->detach();
+int bpl = image->bytesPerLine();
+unsigned char *bits = image->bits();
 #define LM(l, m) (((m)<<8)|l)
 digress = false;
 const int initial = length;
 while (!digress && length) {
 sheight = newtop + newheight;
 QImage::Format format = trans_index >= 0 ? QImage::Format_ARGB32 : QImage::Format_RGB32;
 if (image->isNull()) {
 (*image) = QImage(swidth, sheight, format);
-memset(image->bits(), 0, image->byteCount());
+bpl = image->bytesPerLine();
+bits = image->bits();
+memset(bits, 0, image->byteCount());
 // ### size of the upcoming frame, should rather
 // be known before decoding it.
 *nextSize = QSize(swidth, sheight);
 }
 || backingstore.height() < h) {
 // We just use the backing store as a byte array
 backingstore = QImage(qMax(backingstore.width(), w),
 qMax(backingstore.height(), h),
 QImage::Format_RGB32);
-memset(image->bits(), 0, image->byteCount());
+memset(bits, 0, image->byteCount());
 }
+const int dest_bpl = backingstore.bytesPerLine();
+unsigned char *dest_data = backingstore.bits();
 for (int ln=0; ln<h; ln++) {
-memcpy(backingstore.scanLine(ln),
+memcpy(FAST_SCAN_LINE(dest_data, dest_bpl, ln),
-image->scanLine(t+ln)+l, w*sizeof(QRgb));
+FAST_SCAN_LINE(bits, bpl, t+ln) + l, w*sizeof(QRgb));
 }
 }
 count=0;
 if (lcmap) {
 // Left the block end arrive
 } else {
 if (needfirst) {
 firstcode=oldcode=code;
 if (!out_of_bounds && image->height() > y && firstcode!=trans_index)
-((QRgb*)image->scanLine(y))[x] = color(firstcode);
+((QRgb*)FAST_SCAN_LINE(bits, bpl, y))[x] = color(firstcode);
 x++;
 if (x>=swidth) out_of_bounds = true;
 needfirst=false;
 if (x>=left+width) {
 x=left;
 out_of_bounds = left>=swidth || y>=sheight;
-nextY(image);
+nextY(bits, bpl);
 }
 } else {
 incode=code;
 if (code>=max_code) {
 *sp++=firstcode;
 oldcode=incode;
 const int h = image->height();
 const QRgb *map = lcmap ? localcmap : globalcmap;
 QRgb *line = 0;
 if (!out_of_bounds && h > y)
-line = (QRgb*)image->scanLine(y);
+line = (QRgb*)FAST_SCAN_LINE(bits, bpl, y);
 while (sp>stack) {
 const uchar index = *(--sp);
 if (!out_of_bounds && h > y && index!=trans_index) {
 if (index > ncols)
 line[x] = Q_TRANSPARENT;
 x++;
 if (x>=swidth) out_of_bounds = true;
 if (x>=left+width) {
 x=left;
 out_of_bounds = left>=swidth || y>=sheight;
-nextY(image);
+nextY(bits, bpl);
 if (!out_of_bounds && h > y)
-line = (QRgb*)image->scanLine(y);
+line = (QRgb*)FAST_SCAN_LINE(bits, bpl, y);
 }
 }
 }
 }
 }
 *(line+col+i) = color;
 }
 }
 }
-void QGIFFormat::nextY(QImage *image)
+void QGIFFormat::nextY(unsigned char *bits, int bpl)
 {
 int my;
 switch (interlace) {
 case 0: // Non-interlaced
 // if (!out_of_bounds) {
 int i;
 my = qMin(7, bottom-y);
 // Don't dup with transparency
 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(FAST_SCAN_LINE(bits, bpl, y+i)+left*sizeof(QRgb), FAST_SCAN_LINE(bits, bpl, y)+left*sizeof(QRgb),
 (right-left+1)*sizeof(QRgb));
 }
 }
 // if (!out_of_bounds) {
 int i;
 my = qMin(3, bottom-y);
 // Don't dup with transparency
 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(FAST_SCAN_LINE(bits, bpl, y+i)+left*sizeof(QRgb), FAST_SCAN_LINE(bits, bpl, y)+left*sizeof(QRgb),
 (right-left+1)*sizeof(QRgb));
 }
 }
 // if (!out_of_bounds) {
 int i;
 my = qMin(1, bottom-y);
 // Don't dup with transparency
 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(FAST_SCAN_LINE(bits, bpl, y+i)+left*sizeof(QRgb), FAST_SCAN_LINE(bits, bpl, y)+left*sizeof(QRgb),
 (right-left+1)*sizeof(QRgb));
 }
 }
 // if (!out_of_bounds) {
 //     ### Changed: QRect(left, y, right - left + 1, my + 1);

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