Changeset 51369 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 23, 2014 12:26:48 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93870

Message:

FE/Qt: Runtime UI: Another try to fix QImage frame-buffer crash: Take into account contents shifting while calculating sub-image.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp

@@ -313 +313 @@
                     (rect.y() + iContentsShiftY) * image.bytesPerLine();
 
+    /* Restrain boundaries: */
+    int iSubImageWidth = qMin(rect.width(), image.width() - iContentsShiftX);
+    int iSubImageHeight = qMin(rect.height(), image.height() - iContentsShiftY);
+
     /* Create sub-image (no copy involved): */
     QImage subImage = QImage(image.bits() + offset,
-                             rect.width(), rect.height(),
+                             iSubImageWidth, iSubImageHeight,
                              image.bytesPerLine(), image.format());