Changeset 846 for trunk/src/gui/image/qimage.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qimage.h (modified) (4 diffs)

trunk/src/gui/image/qimage.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -170 +170 @@
 #endif
     int colorCount() const;
+
 
     QRgb color(int i) const;
@@ -183 +184 @@
     uchar *bits();
     const uchar *bits() const;
+
 #ifdef QT_DEPRECATED
     QT_DEPRECATED int numBytes() const;
@@ -190 +192 @@
     uchar *scanLine(int);
     const uchar *scanLine(int) const;
+
     int bytesPerLine() const;