Changeset 90017 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 5, 2021 1:02:52 AM (3 years ago)

Author:

vboxsync

Message:

DevVGA: Style fixes. Removed irrelevant 32-bit comment (not supported, see 4 assertions up). bugref:9904

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -3927 +3927 @@
                                VERR_INVALID_PARAMETER);
 
-        uint32_t cbFileData = pFileHdr->cbFileSize - pFileHdr->offBits;
-        uint32_t cbImageData = pThisCC->cxLogo * pThisCC->cyLogo * pThisCC->cLogoPlanes;
-
-        /* TBD: Take 32bit rows padding into account */
+        uint32_t const cbFileData  = pFileHdr->cbFileSize - pFileHdr->offBits;
+        uint32_t       cbImageData = (uint32_t)pThisCC->cxLogo * pThisCC->cyLogo * pThisCC->cLogoPlanes;
         if (pThisCC->cLogoBits == 4)
-        {
             cbImageData /= 2;
-        } else if (pThisCC->cLogoBits == 24)
-        {
+        else if (pThisCC->cLogoBits == 24)
             cbImageData *= 3;
-        }
-
         AssertLogRelMsgReturn(cbImageData <= cbFileData,
-            ("Wrong BMP header data %d\n", cbImageData),
-            VERR_INVALID_PARAMETER);
+                              ("Wrong BMP header data %u\n", cbImageData),
+                              VERR_INVALID_PARAMETER);
 
         /*