[ros-diffs] [gschneider] 39179: - bcSize holds the size of the BITMAPHEADER structure (not the image size) and should already be set - Clean up unneeded comments

gschneider at svn.reactos.org gschneider at svn.reactos.org
Wed Jan 28 16:35:58 CET 2009


Author: gschneider
Date: Wed Jan 28 09:35:57 2009
New Revision: 39179

URL: http://svn.reactos.org/svn/reactos?rev=39179&view=rev
Log:
- bcSize holds the size of the BITMAPHEADER structure (not the image size) and should already be set
- Clean up unneeded comments

Modified:
    trunk/reactos/subsystems/win32/win32k/objects/dibobj.c

Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/dibobj.c?rev=39179&r1=39178&r2=39179&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Jan 28 09:35:57 2009
@@ -657,10 +657,7 @@
           coreheader->bcWidth = psurf->SurfObj.sizlBitmap.cx;
           coreheader->bcPlanes = 1;
           coreheader->bcBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat);
-          /* Resulting height may be smaller than original height */
           coreheader->bcHeight = psurf->SurfObj.sizlBitmap.cy;
-          coreheader->bcSize = DIB_GetDIBWidthBytes(coreheader->bcWidth,
-                              coreheader->bcBitCount) * coreheader->bcHeight;
           if (psurf->SurfObj.lDelta > 0)
              coreheader->bcHeight = -coreheader->bcHeight;
        }
@@ -668,7 +665,6 @@
        if (Info->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER))
        {
           Info->bmiHeader.biWidth = psurf->SurfObj.sizlBitmap.cx;
-          /* Resulting height may be smaller than original height */
           Info->bmiHeader.biHeight = psurf->SurfObj.sizlBitmap.cy;
           Info->bmiHeader.biPlanes = 1;
           Info->bmiHeader.biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat);
@@ -890,9 +886,6 @@
           if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
           {
              BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info;
-             coreheader->bcSize = DIB_GetDIBWidthBytes(DestSize.cx,
-                                                       coreheader->bcBitCount) * DestSize.cy;
-
              hDestBitmap = EngCreateBitmap(DestSize,
                                            DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount),
                                            BitmapFormat(coreheader->bcBitCount, BI_RGB),



More information about the Ros-diffs mailing list