Changeset 419 for trunk/src/kernel32/winres.cpp

Timestamp:

Aug 5, 1999, 1:44:35 PM (26 years ago)

Author:

sandervl

Message:

Bitmap conversion bugfix

File:

• trunk/src/kernel32/winres.cpp (modified) (3 diffs)

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.5 1999-07-24 14:14:06 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.6 1999-08-05 11:44:35 sandervl Exp $ */
 
 /*
@@ -297 +297 @@
   }
 
-  // EB: ->>> added imgsize
-  if(bmphdr->bmp2.cbImage == 0)
-    imgsize =  CalcBitmapSize(bmphdr->bmp2.cBitCount,
-                              bmphdr->bmp2.cx,
-                              bmphdr->bmp2.cy);
-  else
-    imgsize = bmphdr->bmp2.cbImage;
+  //SvL: Always recalculate bitmap size (donut.exe has wrong size)
+  imgsize =  CalcBitmapSize(bmphdr->bmp2.cBitCount,
+                            bmphdr->bmp2.cx,
+                            bmphdr->bmp2.cy);
 
   winbmphdr = (WINBITMAPINFOHEADER *)malloc(sizeof(WINBITMAPINFOHEADER) +
@@ -316 +313 @@
   //TODO: Identical except for BI_BITFIELDS (3L) type!
   winbmphdr->biCompression   = bmphdr->bmp2.ulCompression;
-  winbmphdr->biSizeImage     = bmphdr->bmp2.cbImage; //imgsize;
+  winbmphdr->biSizeImage     = imgsize;
   //TODO: Doesn't seem to be completely identical..
   winbmphdr->biClrUsed       = bmphdr->bmp2.cclrUsed;