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

trunk/src/gui/image/qimage.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 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -50 +50 @@
 #include "qstringlist.h"
 #include "qvariant.h"
+
 #include <ctype.h>
 #include <stdlib.h>
@@ -61 +62 @@
 #include <qhash.h>
 
-#ifdef QT_RASTER_IMAGEENGINE
 #include <private/qpaintengine_raster_p.h>
-#else
-#include <qpaintengine.h>
-#endif
 
 #include <private/qimage_p.h>
@@ -106 +103 @@
     }
 
-
-// ### Qt 5: remove
-typedef void (*_qt_image_cleanup_hook)(int);
-Q_GUI_EXPORT _qt_image_cleanup_hook qt_image_cleanup_hook = 0;
-
-// ### Qt 5: rename
-typedef void (*_qt_image_cleanup_hook_64)(qint64);
-Q_GUI_EXPORT _qt_image_cleanup_hook_64 qt_image_cleanup_hook_64 = 0;
 
 static QImage rotated90(const QImage &src);
@@ -186 +175 @@
 }
 
+
+
+
+
+
+
+
 QImageData * QImageData::create(const QSize &size, QImage::Format format, int numColors)
 {
@@ -224 +220 @@
         return 0;
 
-    QImageData *d = new QImageData;
+    Q;
     d->colortable.resize(numColors);
     if (depth == 1) {
@@ -247 +243 @@
 
     if (!d->data) {
-        delete d;
         return 0;
     }
 
     d->ref.ref();
-    return d;
+    return d;
 
 }
@@ -258 +253 @@
 QImageData::~QImageData()
 {
-    if (is_cached && qt_image_cleanup_hook_64)
-        qt_image_cleanup_hook_64((((qint64) ser_no) << 32) | ((qint64) detach_no));
+    if (is_cached)
+        ((((qint64) ser_no) << 32) | ((qint64) detach_no));
     delete paintEngine;
     if (data && own_data)
@@ -345 +340 @@
     \class QImage
 
-    \ingroup multimedia
+    \ingroup 
     \ingroup shared
-    \mainclass
+
     \reentrant
 
@@ -382 +377 @@
     \note If you would like to load QImage objects in a static build of Qt,
     refer to the \l{How To Create Qt Plugins#Static Plugins}{Plugin HowTo}.
+
+
+
 
     \tableofcontents
@@ -452 +450 @@
     as a QRgb value indepedent of the image's format.
 
-    In case of monochrome and 8-bit images, the numColors() and
+    In case of monochrome and 8-bit images, the () and
     colorTable() functions provide information about the color
     components used to store the image data: The colorTable() function
@@ -487 +485 @@
     \l {QImage#Image Formats}{Image Formats} section).
 
-    The format(), bytesPerLine(), and numBytes() functions provide
+    The format(), bytesPerLine(), and () functions provide
     low-level information about the data stored in the image.
 
@@ -549 +547 @@
     size of the integer varies depending on the format. QImage
     supports several image formats described by the \l Format
-    enum. The monochrome (1-bit), 8-bit and 32-bit images are
-    available in all versions of Qt. In addition Qt for Embedded Linux
-    also supports 2-bit, 4-bit, and 16-bit images. For more information
-    about the Qt Extended specific formats, see the documentation of the \l
-    Format enum.
+    enum.
 
     Monochrome images are stored using 1-bit indexes into a color table
@@ -591 +585 @@
     The mirrored() function returns a mirror of the image in the
     desired direction, the scaled() returns a copy of the image scaled
-    to a rectangle of the desired measures, the rgbSwapped() function
-    constructs a BGR image from a RGB image, and the alphaChannel()
-    function constructs an image from this image's alpha channel.
+    to a rectangle of the desired measures, and the rgbSwapped() function
+    constructs a BGR image from a RGB image.
 
     The scaledToWidth() and scaledToHeight() functions return scaled
@@ -612 +605 @@
     \table
     \header \o Function \o Description
-    \row
-    \o setAlphaChannel()
-    \o Sets the alpha channel of the image.
     \row
     \o setDotsPerMeterX()
@@ -634 +624 @@
     monochrome and 8-bit formats.
     \row
-    \o setNumColors()
+    \o set()
     \o Resizes the color table. Only monochrome and 8-bit formats.
 
@@ -707 +697 @@
     \enum QImage::Format
 
-    The following image formats are available in all versions of Qt:
+    The following image formats are available in Qt. Values greater
+    than QImage::Format_RGB16 were added in Qt 4.4. See the notes
+    after the table.
 
     \value Format_Invalid   The image is invalid.
@@ -714 +706 @@
     \value Format_MonoLSB   The image is stored using 1-bit per pixel. Bytes are
                             packed with the less significant bit (LSB) first.
-    \value Format_Indexed8  The image is stored using 8-bit indexes into a colormap.
+
+    \value Format_Indexed8  The image is stored using 8-bit indexes
+                            into a colormap. 
+
     \value Format_RGB32     The image is stored using a 32-bit RGB format (0xffRRGGBB).
-    \value Format_ARGB32    The image is stored using a 32-bit ARGB format (0xAARRGGBB).
+
+    \value Format_ARGB32    The image is stored using a 32-bit ARGB
+                            format (0xAARRGGBB).
+
     \value Format_ARGB32_Premultiplied  The image is stored using a premultiplied 32-bit
                             ARGB format (0xAARRGGBB), i.e. the red,
@@ -725 +723 @@
                             using alpha blending) are faster using premultiplied ARGB32
                             than with plain ARGB32.
+
     \value Format_RGB16     The image is stored using a 16-bit RGB format (5-6-5).
+
     \value Format_ARGB8565_Premultiplied  The image is stored using a
                             premultiplied 24-bit ARGB format (8-5-6-5).
@@ -741 +741 @@
     \value Format_ARGB4444_Premultiplied  The image is stored using a
                             premultiplied 16-bit ARGB format (4-4-4-4).
+
+
+
+
+
+
 
     \sa format(), convertToFormat()
@@ -904 +910 @@
     If \a format is an indexed color format, the image color table is
     initially empty and must be sufficiently expanded with
-    setNumColors() or setColorTable() before the image is used.
+    set() or setColorTable() before the image is used.
 */
 QImage::QImage(uchar* data, int width, int height, Format format)
@@ -926 +932 @@
     If \a format is an indexed color format, the image color table is
     initially empty and must be sufficiently expanded with
-    setNumColors() or setColorTable() before the image is used.
+    set() or setColorTable() before the image is used.
 
     Unlike the similar QImage constructor that takes a non-const data buffer,
@@ -952 +958 @@
     If \a format is an indexed color format, the image color table is
     initially empty and must be sufficiently expanded with
-    setNumColors() or setColorTable() before the image is used.
+    set() or setColorTable() before the image is used.
 */
 QImage::QImage(uchar *data, int width, int height, int bytesPerLine, Format format)
@@ -972 +978 @@
     If \a format is an indexed color format, the image color table is
     initially empty and must be sufficiently expanded with
-    setNumColors() or setColorTable() before the image is used.
+    set() or setColorTable() before the image is used.
 
     Unlike the similar QImage constructor that takes a non-const data buffer,
@@ -1124 +1130 @@
     Use the constructor that accepts a width, a height and a format
     (i.e. specifying the depth and bit order), in combination with the
-    setNumColors() function, instead.
+    set() function, instead.
 
     \oldcode
@@ -1133 +1139 @@
         // For 8 bit images the default number of colors is 256. If
         // another number of colors is required it can be specified
-        // using the setNumColors() function.
-        image.setNumColors(numColors);
+        // using the set() function.
+        image.set(numColors);
     \endcode
 */
 
-QImage::QImage(int w, int h, int depth, int numColors, Endian bitOrder)
+QImage::QImage(int w, int h, int depth, int , Endian bitOrder)
     : QPaintDevice()
 {
-    d = QImageData::create(QSize(w, h), formatFor(depth, bitOrder), numColors);
+    d = QImageData::create(QSize(w, h), formatFor(depth, bitOrder), );
 }
 
@@ -1150 +1156 @@
     Use the constructor that accepts a size and a format
     (i.e. specifying the depth and bit order), in combination with the
-    setNumColors() function, instead.
+    set() function, instead.
 
     \oldcode
@@ -1161 +1167 @@
         // For 8 bit images the default number of colors is 256. If
         // another number of colors is required it can be specified
-        // using the setNumColors() function.
-        image.setNumColors(numColors);
+        // using the set() function.
+        image.set(numColors);
     \endcode
 */
@@ -1230 +1236 @@
             d->colortable[i] = colortable[i];
     } else if (numColors) {
-        setNumColors(numColors);
+        set(numColors);
     }
 }
@@ -1281 +1287 @@
             d->colortable[i] = colortable[i];
     } else if (numColors) {
-        setNumColors(numColors);
+        set(numColors);
     }
 }
@@ -1347 +1353 @@
 {
     if (d) {
-        if (d->is_cached && qt_image_cleanup_hook_64 && d->ref == 1)
-            qt_image_cleanup_hook_64(cacheKey());
+        if (d->is_cached && d->ref == 1)
+            (cacheKey());
 
         if (d->ref != 1 || d->ro_data)
@@ -1590 +1596 @@
 
 /*!
+
     \fn int QImage::numColors() const
 
     Returns the size of the color table for the image.
 
-    Notice that numColors() returns 0 for 32-bpp images because these
+    \sa setColorCount()
+*/
+int QImage::numColors() const
+{
+    return d ? d->colortable.size() : 0;
+}
+
+/*!
+    \since 4.6
+    \fn int QImage::colorCount() const
+
+    Returns the size of the color table for the image.
+
+    Notice that colorCount() returns 0 for 32-bpp images because these
     images do not use color tables, but instead encode pixel values as
     ARGB quadruplets.
 
-    \sa setNumColors(), {QImage#Image Information}{Image Information}
-*/
-int QImage::numColors() const
+    \sa set(), {QImage#Image Information}{Image Information}
+*/
+int QImage::() const
 {
     return d ? d->colortable.size() : 0;
@@ -1622 +1642 @@
     Returns a pointer to the scanline pointer table. This is the
     beginning of the data block for the image.
+
 
     Use the bits() or scanLine() function instead.
@@ -1637 +1658 @@
     if (!d->jumptable) {
         d->jumptable = (uchar **)malloc(d->height*sizeof(uchar *));
+
+
         uchar *data = d->data;
         int height = d->height;
@@ -1657 +1680 @@
     if (!d->jumptable) {
         d->jumptable = (uchar **)malloc(d->height*sizeof(uchar *));
+
+
         uchar *data = d->data;
         int height = d->height;
@@ -1692 +1717 @@
     d->colortable = colors;
     d->has_alpha_clut = false;
-    for (int i = 0; i < d->colortable.size(); ++i)
-        d->has_alpha_clut |= (qAlpha(d->colortable.at(i)) != 255);
+    for (int i = 0; i < d->colortable.size(); ++i) {
+        if (qAlpha(d->colortable.at(i)) != 255) {
+            d->has_alpha_clut = true;
+            break;
+        }
+    }
 }
 
@@ -1700 +1729 @@
     or an empty list if the image does not have a color table
 
-    \sa setColorTable(), numColors(), color()
+    \sa setColorTable(), (), color()
 */
 QVector<QRgb> QImage::colorTable() const
@@ -1709 +1738 @@
 
 /*!
+
+
+
+
+
+
+
+
+
+
+
+
     Returns the number of bytes occupied by the image data.
 
@@ -1714 +1755 @@
     Information}
 */
-int QImage::numBytes() const
+int QImage::() const
 {
     return d ? d->nbytes : 0;
@@ -1722 +1763 @@
     Returns the number of bytes per image scanline.
 
-    This is equivalent to numBytes()/ height().
+    This is equivalent to / height().
 
     \sa scanLine()
@@ -1745 +1786 @@
 QRgb QImage::color(int i) const
 {
-    Q_ASSERT(i < numColors());
+    Q_ASSERT(i < ());
     return d ? d->colortable.at(i) : QRgb(uint(-1));
 }
@@ -1756 +1797 @@
 
     If \a index is outside the current size of the color table, it is
-    expanded with setNumColors().
-
-    \sa color(), numColors(), setColorTable(), {QImage#Pixel Manipulation}{Pixel
+    expanded with set().
+
+    \sa color(), (), setColorTable(), {QImage#Pixel Manipulation}{Pixel
     Manipulation}
 */
@@ -1776 +1817 @@
 
     if (i >= d->colortable.size())
-        setNumColors(i+1);
+        set(i+1);
     d->colortable[i] = c;
     d->has_alpha_clut |= (qAlpha(c) != 255);
@@ -1833 +1874 @@
     current return value.
 
-    \sa scanLine(), numBytes()
+    \sa scanLine(), ()
 */
 uchar *QImage::bits()
@@ -2014 +2055 @@
 
 /*!
+
     Resizes the color table to contain \a numColors entries.
+
+
+
+
+
+
+
+
+
+
+
+
 
     If the color table is expanded, all the extra colors will be set to
@@ -2023 +2077 @@
     otherwise the results are undefined.
 
-    \sa numColors(), colorTable(), setColor(), {QImage#Image
+    \sa (), colorTable(), setColor(), {QImage#Image
     Transformations}{Image Transformations}
 */
 
-void QImage::setNumColors(int numColors)
+void QImage::set)
 {
     if (!d) {
-        qWarning("QImage::setNumColors: null image");
+        qWarning("QImage::set: null image");
         return;
     }
@@ -2040 +2094 @@
         return;
 
-    if (numColors == d->colortable.size())
+    if ( == d->colortable.size())
         return;
-    if (numColors <= 0) {                        // use no color table
+    if ( <= 0) {                        // use no color table
         d->colortable = QVector<QRgb>();
         return;
     }
     int nc = d->colortable.size();
-    d->colortable.resize(numColors);
-    for (int i = nc; i < numColors; ++i)
+    d->colortable.resize();
+    for (int i = nc; i < ; ++i)
         d->colortable[i] = 0;
-
 }
 
@@ -2371 +2424 @@
     switch (dithermode) {
     case Diffuse: {
-        int *line1 = new int[w];
-        int *line2 = new int[w];
+        QScopedArrayPointer<int> lineBuffer(new int[w * 2]);
+        int *line1 = lineBuffer.data();
+        int *line2 = lineBuffer.data() + w;
         int bmwidth = (w+7)/8;
 
@@ -2452 +2506 @@
             }
         }
-        delete [] line1;
-        delete [] line2;
     } break;
     case Ordered: {
@@ -2594 +2646 @@
 static void convert_ARGB_PM_to_Mono(QImageData *dst, const QImageData *src, Qt::ImageConversionFlags flags)
 {
-    QImageData *tmp = QImageData::create(QSize(src->width, src->height), QImage::Format_ARGB32);
-    convert_ARGB_PM_to_ARGB(tmp, src, flags);
-    dither_to_Mono(dst, tmp, flags, false);
-    delete tmp;
+    QScopedPointer<QImageData> tmp(QImageData::create(QSize(src->width, src->height), QImage::Format_ARGB32));
+    convert_ARGB_PM_to_ARGB(tmp.data(), src, flags);
+    dither_to_Mono(dst, tmp.data(), flags, false);
 }
 
@@ -2746 +2797 @@
             int* line2[3];
             int* pv[3];
-            line1[0] = new int[src->width];
-            line2[0] = new int[src->width];
-            line1[1] = new int[src->width];
-            line2[1] = new int[src->width];
-            line1[2] = new int[src->width];
-            line2[2] = new int[src->width];
-            pv[0] = new int[src->width];
-            pv[1] = new int[src->width];
-            pv[2] = new int[src->width];
+            QScopedArrayPointer<int> lineBuffer(new int[src->width * 9]);
+            line1[0] = lineBuffer.data();
+            line2[0] = lineBuffer.data() + src->width;
+            line1[1] = lineBuffer.data() + src->width * 2;
+            line2[1] = lineBuffer.data() + src->width * 3;
+            line1[2] = lineBuffer.data() + src->width * 4;
+            line2[2] = lineBuffer.data() + src->width * 5;
+            pv[0] = lineBuffer.data() + src->width * 6;
+            pv[1] = lineBuffer.data() + src->width * 7;
+            pv[2] = lineBuffer.data() + src->width * 8;
 
             int endian = (QSysInfo::ByteOrder == QSysInfo::BigEndian);
@@ -2817 +2869 @@
                 dest_data += dst->bytes_per_line;
             }
-            delete [] line1[0];
-            delete [] line2[0];
-            delete [] line1[1];
-            delete [] line2[1];
-            delete [] line1[2];
-            delete [] line2[2];
-            delete [] pv[0];
-            delete [] pv[1];
-            delete [] pv[2];
         } else { // OrderedDither
             for (int y = 0; y < src->height; y++) {
@@ -2858 +2901 @@
             Q_ASSERT(dst->colortable.size() > trans);
             dst->colortable[trans] = 0;
-            QImageData *mask = QImageData::create(QSize(src->width, src->height), QImage::Format_Mono);
-            dither_to_Mono(mask, src, flags, true);
+            Q);
+            dither_to_Mono(mask, src, flags, true);
             uchar *dst_data = dst->data;
             const uchar *mask_data = mask->data;
@@ -2871 +2914 @@
             }
             dst->has_alpha_clut = true;
-            delete mask;
         }
 
@@ -2884 +2926 @@
 static void convert_ARGB_PM_to_Indexed8(QImageData *dst, const QImageData *src, Qt::ImageConversionFlags flags)
 {
-    QImageData *tmp = QImageData::create(QSize(src->width, src->height), QImage::Format_ARGB32);
-    convert_ARGB_PM_to_ARGB(tmp, src, flags);
-    convert_RGB_to_Indexed8(dst, tmp, flags);
-    delete tmp;
+    QScopedPointer<QImageData> tmp(QImageData::create(QSize(src->width, src->height), QImage::Format_ARGB32));
+    convert_ARGB_PM_to_ARGB(tmp.data(), src, flags);
+    convert_RGB_to_Indexed8(dst, tmp.data(), flags);
 }
 
@@ -2905 +2946 @@
 
     QVector<QRgb> colorTable = fix_color_table(src->colortable, dest->format);
+
+
+
+
+
+
 
     int w = src->width;
@@ -3607 +3654 @@
 
     If the \a position is not valid, the results are undefined.
+
+
+
 
     \sa setPixel(), valid(), {QImage#Pixel Manipulation}{Pixel
@@ -3666 +3716 @@
 
     If \a position is not a valid coordinate pair in the image, or if
-    \a index_or_rgb >= numColors() in the case of monochrome and
+    \a index_or_rgb >= () in the case of monochrome and
     8-bit images, the result is undefined.
 
@@ -3827 +3877 @@
         if (d->colortable.isEmpty())
             return true;
-        for (int i = 0; i < numColors(); i++)
+        for (int i = 0; i < (); i++)
             if (!qIsGray(d->colortable.at(i)))
                 return false;
@@ -3854 +3904 @@
         return allGray();
     case 8: {
-        for (int i = 0; i < numColors(); i++)
+        for (int i = 0; i < (); i++)
             if (d->colortable.at(i) != qRgb(i,i,i))
                 return false;
@@ -3945 +3995 @@
         return copy();
 
-    QImage img;
-    QTransform wm;
-    wm.scale((qreal)newSize.width() / width(), (qreal)newSize.height() / height());
-    img = transformed(wm, mode);
+    QTransform wm = QTransform::fromScale((qreal)newSize.width() / width(), (qreal)newSize.height() / height());
+    QImage img = transformed(wm, mode);
     return img;
 }
@@ -3975 +4023 @@
         return QImage();
 
-    QTransform wm;
     qreal factor = (qreal) w / width();
-    wm.scale(factor, factor);
+    cale(factor, factor);
     return transformed(wm, mode);
 }
@@ -4004 +4051 @@
         return QImage();
 
-    QTransform wm;
     qreal factor = (qreal) h / height();
-    wm.scale(factor, factor);
+    cale(factor, factor);
     return transformed(wm, mode);
 }
@@ -4079 +4125 @@
 
     QImage mask(d->width, d->height, Format_MonoLSB);
-    dither_to_Mono(mask.d, d, flags, true);
+    if (!mask.isNull())
+        dither_to_Mono(mask.d, d, flags, true);
     return mask;
 }
@@ -4123 +4170 @@
     int h = height();
     QImage m(w, h, Format_MonoLSB);
-    m.setNumColors(2);
+    m.set(2);
     m.setColor(0, QColor(Qt::color0).rgba());
     m.setColor(1, QColor(Qt::color1).rgba());
@@ -4275 +4322 @@
     // Create result image, copy colormap
     QImage result(d->width, d->height, d->format);
+
+
+
+
+
     result.d->colortable = d->colortable;
     result.d->has_alpha_clut = d->has_alpha_clut;
@@ -4625 +4677 @@
     specified \a format. If \a format is not specified (which is the default),
     the loader probes the file for a header to guess the file format.
-
-    If the loading of the image failed, this object is a null image.
-
-    \sa load(), save(), {QImage#Reading and Writing Image
-    Files}{Reading and Writing Image Files}
-*/
+    binary \a data. The loader attempts to read the image, either using the
+    optional image \a format specified or by determining the image format from
+    the data.
+
+    If \a format is not specified (which is the default), the loader probes the
+    file for a header to determine the file format. If \a format is specified,
+    it must be one of the values returned by QImageReader::supportedImageFormats().
+
+    If the loading of the image fails, the image returned will be a null image.
+
+    \sa load(), save(), {QImage#Reading and Writing Image Files}{Reading and Writing Image Files}
+ */
+
 QImage QImage::fromData(const uchar *data, int size, const char *format)
 {
@@ -4757 +4816 @@
     return s;
 }
-#endif
+#endif
 
 
@@ -4847 +4906 @@
 
     if (d->format != Format_RGB32) {
-        if (d->colortable != i.d->colortable)
-            return false;
         if (d->format >= Format_ARGB32) { // all bits defined
             const int n = d->width * d->depth / 8;
@@ -4861 +4918 @@
             }
         } else {
-            int w = width();
-            int h = height();
+            const int w = width();
+            const int h = height();
+            const QVector<QRgb> &colortable = d->colortable;
+            const QVector<QRgb> &icolortable = i.d->colortable;
             for (int y=0; y<h; ++y) {
                 for (int x=0; x<w; ++x) {
-                    if (pixelIndex(x, y) != i.pixelIndex(x, y))
+                    if ()
                         return false;
                 }
@@ -4994 +5053 @@
     \fn void QImage::setOffset(const QPoint& offset)
 
-    Sets the the number of pixels by which the image is intended to be
+    Sets the number of pixels by which the image is intended to be
     offset by when positioning relative to other images, to \a offset.
 
@@ -5252 +5311 @@
         return 0;
 
-#ifdef QT_RASTER_IMAGEENGINE
     if (!d->paintEngine) {
         d->paintEngine = new QRasterPaintEngine(const_cast<QImage *>(this));
     }
-#endif
+
     return d->paintEngine;
 }
@@ -5262 +5320 @@
 
 /*!
-    \reimp
+    \
 
     Returns the size for the specified \a metric on the device.
@@ -5580 +5638 @@
     format if the function succeeds.
 
-    Use one of the composition mods in QPainter::CompositionMode instead.
+    Use one of the composition modes in QPainter::CompositionMode instead.
+
+    \warning This function is expensive.
 
     \sa alphaChannel(), {QImage#Image Transformations}{Image
@@ -5656 +5716 @@
 
 /*!
+
+
     Returns the alpha channel of the image as a new grayscale QImage in which
     each pixel's red, green, and blue values are given the alpha value of the
@@ -5664 +5726 @@
     this function on QPixmaps.
 
+
+
+
+
+
     \sa setAlphaChannel(), hasAlphaChannel(),
     {QPixmap#Pixmap Information}{Pixmap},
@@ -5678 +5745 @@
 
     QImage image(w, h, Format_Indexed8);
-    image.setNumColors(256);
+    image.set(256);
 
     // set up gray scale table.
@@ -5730 +5797 @@
     channel, otherwise returns false.
 
-    \sa alphaChannel(), {QImage#Image Information}{Image Information}
+    \sa {QImage#Image Information}{Image Information}
 */
 bool QImage::hasAlphaChannel() const
@@ -5808 +5875 @@
 static QImage rotated90(const QImage &image) {
     QImage out(image.height(), image.width(), image.format());
-    if (image.numColors() > 0)
+    if (image.() > 0)
         out.setColorTable(image.colorTable());
     int w = image.width();
@@ -5847 +5914 @@
     default:
         for (int y=0; y<h; ++y) {
-            if (image.numColors())
+            if (image.())
                 for (int x=0; x<w; ++x)
                     out.setPixel(h-y-1, x, image.pixelIndex(x, y));
@@ -5867 +5934 @@
 static QImage rotated270(const QImage &image) {
     QImage out(image.height(), image.width(), image.format());
-    if (image.numColors() > 0)
+    if (image.() > 0)
         out.setColorTable(image.colorTable());
     int w = image.width();
@@ -5906 +5973 @@
     default:
         for (int y=0; y<h; ++y) {
-            if (image.numColors())
+            if (image.())
                 for (int x=0; x<w; ++x)
                     out.setPixel(y, w-x-1, image.pixelIndex(x, y));
@@ -6046 +6113 @@
                 // colors are left in the color table, so pick that one as transparent
                 dImage.d->colortable.append(0x0);
-                memset(dImage.bits(), dImage.d->colortable.size() - 1, dImage.numBytes());
+                memset(dImage.bits(), dImage.d->colortable.size() - 1, dImage.());
             } else {
-                memset(dImage.bits(), 0, dImage.numBytes());
+                memset(dImage.bits(), 0, dImage.());
             }
             break;
@@ -6055 +6122 @@
         case 24:
         case 32:
-            memset(dImage.bits(), 0x00, dImage.numBytes());
+            memset(dImage.bits(), 0x00, dImage.());
             break;
     }