Changeset 769 for trunk/src/gui/image/qimage.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qimage.cpp (modified) (2 diffs)

trunk/src/gui/image/qimage.cpp

@@ -119 +119 @@
 }
 
-extern int qt_defaultDpiX();
-extern int qt_defaultDpiY();
+extern int qt_defaultDpiX();
+extern int qt_defaultDpiY();
 
 QBasicAtomicInt qimage_serial_number = Q_BASIC_ATOMIC_INITIALIZER(1);
@@ -5668 +5668 @@
     detach();
 
-    *this = convertToFormat(QImage::Format_ARGB32_Premultiplied);
+    QImage converted = convertToFormat(QImage::Format_ARGB32_Premultiplied);
+    if (!converted.isNull())
+        *this = converted;
+    else
+        return;
 
     // Slight optimization since alphachannels are returned as 8-bit grays.