r=mkaply, a=blizzard

Regression on 256 color from earlier system color checkin

gfx/src/os2/nsDeviceContextOS2.cpp

@@ -657,9 +657,13 @@ NS_IMETHODIMP nsDeviceContextOS2::GetILColorSpace(IL_ColorSpace*& aColorSpace)
       //
       // Note: the image library doesn't use the reserved colors, so it doesn't
       // matter what they're set to...
+#ifdef XP_OS2
+      IL_ColorMap* colorMap = IL_NewCubeColorMap(0, 0, COLOR_CUBE_SIZE);
+#else /* This code causes traps on 256 color */
       IL_RGB  reserved[10];
       memset(reserved, 0, sizeof(reserved));
       IL_ColorMap* colorMap = IL_NewCubeColorMap(reserved, 10, COLOR_CUBE_SIZE + 10);
+#endif
       if (nsnull == colorMap) {
         return NS_ERROR_OUT_OF_MEMORY;
       }
@@ -757,9 +761,13 @@ NS_IMETHODIMP nsDeviceContextOS2::GetPaletteInfo(nsPaletteInfo& aPaletteInfo)
       }
   
       // Now set the color cube entries.
+#ifdef XP_OS2
+      NI_RGB*       map = colorSpace->cmap.map;
+#else /* Combined with changes in GetILColor Space, this traps */
       NI_RGB*       map = colorSpace->cmap.map + 10;
+#endif
 
-      for (i = 10; i < COLOR_CUBE_SIZE; i++, map++) {
+      for (i = 10; i < COLOR_CUBE_SIZE+10; i++, map++) {
         aulTable[i] = MK_RGB( map->red, map->green, map->blue);
       }
   

gfx/src/os2/nsImageOS2.cpp

@@ -281,7 +281,7 @@ nsresult nsImageOS2::Draw( nsIRenderingContext &aContext,
       // > There's probably a really good reason why ROP_SRCAND does the
       // > right thing in true colour...
 
-      long lRop = (mDeviceDepth <= 8) ? ROP_NOTSRCAND : ROP_SRCAND;
+      long lRop = ROP_SRCAND;
 
       // Apply mask to target, clear pels we will fill in from the image
       DrawBitmap( surf->mPS, 4, aptl, lRop, PR_TRUE);
@@ -552,7 +552,7 @@ nsImageOS2::DrawTile(nsIRenderingContext &aContext, nsDrawingSurface aSurface,
                else
                {
                   // For some reason, only ROP_NOTSRCAND seems to work here....
-                  long lRop = (mDeviceDepth <= 8) ? ROP_NOTSRCAND : ROP_SRCAND;
+                  long lRop = ROP_SRCAND;
 
                   // Apply mask to target, clear pels we will fill in from the image
                   GpiSetBitmap( mPS, hBmpMask);