Changeset 27785 in vbox for trunk/src

Timestamp:

Mar 29, 2010 12:21:23 PM (15 years ago)

Author:

vboxsync

Message:

2d: Additional assertion check + some cleaning

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -2450 +2450 @@
                 {
                     VBoxVHWASurfaceBase *pCurSurf = (*it);
-                    if(pCurSurf != pSurf)
+                    Assert(pCurSurf);
+                    if (pCurSurf != pSurf)
                     {
                         mDisplay.updateVGA(pCurSurf);
@@ -2727 +2728 @@
     Assert(mDisplay.getVGA() == mDisplay.getPrimary());
 #endif
-    if(pSrcSurf->getComplexList()->current() != NULL)
+    if (pSrcSurf->getComplexList()->current() != NULL)
     {
         Assert(pDstSurf);
-        if(pDstSurf != mDisplay.getPrimary())
+        if (pDstSurf != mDisplay.getPrimary())
         {
             mDisplay.updateVGA(pDstSurf);
@@ -2759 +2760 @@
     mRepaintNeeded = true;
 
-    if(pCmd->u.in.flags & VBOXVHWA_CKEY_DESTBLT)
+    if (pCmd->u.in.flags & VBOXVHWA_CKEY_DESTBLT)
     {
         VBoxVHWAColorKey ckey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low);
         pSurf->setDstBltCKey(&ckey);
     }
-    if(pCmd->u.in.flags & VBOXVHWA_CKEY_DESTOVERLAY)
+    if (pCmd->u.in.flags & VBOXVHWA_CKEY_DESTOVERLAY)
     {
         VBoxVHWAColorKey ckey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low);
         pSurf->setDefaultDstOverlayCKey(&ckey);
     }
-    if(pCmd->u.in.flags & VBOXVHWA_CKEY_SRCBLT)
+    if (pCmd->u.in.flags & VBOXVHWA_CKEY_SRCBLT)
     {
         VBoxVHWAColorKey ckey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low);
         pSurf->setSrcBltCKey(&ckey);
     }
-    if(pCmd->u.in.flags & VBOXVHWA_CKEY_SRCOVERLAY)
+    if (pCmd->u.in.flags & VBOXVHWA_CKEY_SRCOVERLAY)
     {
         VBoxVHWAColorKey ckey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low);