Changeset 570 for trunk/src

Timestamp:

Feb 13, 2010, 9:59:04 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed assertion in QVector::at() at startup.

File:

• trunk/src/gui/painting/qregion_pm.cpp (modified) (1 diff)

trunk/src/gui/painting/qregion_pm.cpp

@@ -111 +111 @@
     self->d->height = targetHeight;
     if (d->qt_rgn) {
-        if (d->qt_rgn->numRects) {
-            PRECTL rcls = new RECTL[d->qt_rgn->numRects];
-            for (int i = 0; i < d->qt_rgn->numRects; ++i) {
-                QRect r = d->qt_rgn->rects.at(i);
-                // note RECTL is inclusive-exclusive here
-                rcls[i].xLeft = r.left();
-                rcls[i].yBottom = d->height - (r.bottom() + 1);
-                rcls[i].xRight = r.right() + 1;
-                rcls[i].yTop = d->height - r.top();
+        if (d->qt_rgn->numRects > 0) {
+            if (d->qt_rgn->numRects == 1) {
+                // d->qt_rgn->rects is empty, use d->qt_rgn->extents instead
+                const QRect r = d->qt_rgn->extents;
+                RECTL rcl = { r.left(), d->height - (r.bottom() + 1),
+                              r.right() + 1, d->height - r.top() };
+                self->d->rgn = GpiCreateRegion(qt_display_ps(), 1, &rcl);
+            } else {
+                PRECTL rcls = new RECTL[d->qt_rgn->numRects];
+                for (int i = 0; i < d->qt_rgn->numRects; ++i) {
+                    QRect r = d->qt_rgn->rects.at(i);
+                    // note RECTL is inclusive-exclusive here
+                    rcls[i].xLeft = r.left();
+                    rcls[i].yBottom = d->height - (r.bottom() + 1);
+                    rcls[i].xRight = r.right() + 1;
+                    rcls[i].yTop = d->height - r.top();
+                }
+                self->d->rgn = GpiCreateRegion(qt_display_ps(),
+                                               d->qt_rgn->numRects, rcls);
+                delete[] rcls;
             }
-            self->d->rgn = GpiCreateRegion(qt_display_ps(),
-                                           d->qt_rgn->numRects, rcls);
             return;
         }