Changeset 4140 for trunk/src/gdi32/dibitmap.cpp

Timestamp:

Sep 1, 2000, 3:36:15 AM (25 years ago)

Author:

phaller

Message:

.

File:

• trunk/src/gdi32/dibitmap.cpp (modified) (2 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.8 2000-08-18 18:14:56 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.9 2000-09-01 01:36:14 phaller Exp $ */
 
 /*
@@ -29 +29 @@
   HBITMAP rc;
 
-    //TEMPORARY HACK TO PREVENT CRASH IN OPEN32 (WSeB GA)
-
-    iHeight = lpbmih->biHeight;
-    if(lpbmih->biHeight < 0)
-    {
-        dprintf(("GDI32: CreateDIBitmap negative height! (%d,%d)", lpbmih->biWidth, lpbmih->biHeight));
-        ((BITMAPINFOHEADER *)lpbmih)->biHeight = -lpbmih->biHeight;
-    }
-
-    rc = O32_CreateDIBitmap(hdc, lpbmih, fdwInit, lpbInit, lpbmi, fuUsage);
-
-    dprintf(("GDI32: CreateDIBitmap %x %x %x %x returned %x", hdc, fdwInit, lpbInit, fuUsage, rc));
-
-    ((BITMAPINFOHEADER *)lpbmih)->biHeight = iHeight;
-
-    return rc;
+  //TEMPORARY HACK TO PREVENT CRASH IN OPEN32 (WSeB GA)
+
+  iHeight = lpbmih->biHeight;
+  if(lpbmih->biHeight < 0)
+  {
+    dprintf(("GDI32: CreateDIBitmap negative height! (%d,%d)", lpbmih->biWidth, lpbmih->biHeight));
+    ((BITMAPINFOHEADER *)lpbmih)->biHeight = -lpbmih->biHeight;
+  }
+
+  // 2000/09/01 PH Netscape 4.7
+  // If color depth of lpbhmi is 16 bit and lpbmi is 8 bit,
+  // Open32 will crash since it won't allocate any palette color memory,
+  // however wants to copy it later on ...
+  int biBitCount = lpbmih->biBitCount;
+  
+  if (lpbmih->biBitCount != lpbmi->bmiHeader.biBitCount)
+  {
+    dprintf(("GDI32: CreateDIBitmap: color depths of bitmaps differ! (%d,%d\n",
+             lpbmih->biBitCount,
+             lpbmi->bmiHeader.biBitCount));
+             
+    ((BITMAPINFOHEADER *)lpbmih)->biBitCount = lpbmi->bmiHeader.biBitCount;
+  }
+
+  rc = O32_CreateDIBitmap(hdc, lpbmih, fdwInit, lpbInit, lpbmi, fuUsage);
+
+  dprintf(("GDI32: CreateDIBitmap %x %x %x %x returned %x", hdc, fdwInit, lpbInit, fuUsage, rc));
+
+  ((BITMAPINFOHEADER *)lpbmih)->biHeight   = iHeight;
+  ((BITMAPINFOHEADER *)lpbmih)->biBitCount = biBitCount;
+
+  return rc;
 }
 //******************************************************************************