Bug 285054: ConvertDDBtoDIB violates windows APIs, Don't select bitmap into HDC. r=biesi sr=tor
git-svn-id: svn://10.0.0.236/trunk@171355 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1661,7 +1661,6 @@ nsImageWin::ConvertDDBtoDIB()
|
||||
{
|
||||
PRInt32 numbytes,tWidth,tHeight;
|
||||
BITMAP srcinfo;
|
||||
HBITMAP oldbits;
|
||||
HDC memPrDC;
|
||||
UINT palType;
|
||||
|
||||
@@ -1670,7 +1669,6 @@ nsImageWin::ConvertDDBtoDIB()
|
||||
|
||||
if (mHBitmap != nsnull){
|
||||
memPrDC = ::CreateDC("DISPLAY",NULL,NULL,NULL);
|
||||
oldbits = (HBITMAP)::SelectObject(memPrDC,mHBitmap);
|
||||
|
||||
numbytes = ::GetObject(mHBitmap,sizeof(BITMAP),&srcinfo);
|
||||
|
||||
@@ -1697,7 +1695,6 @@ nsImageWin::ConvertDDBtoDIB()
|
||||
|
||||
numbytes = ::GetDIBits(memPrDC, mHBitmap, 0, srcinfo.bmHeight, mImageBits,
|
||||
(LPBITMAPINFO)mBHead, palType);
|
||||
::SelectObject(memPrDC,oldbits);
|
||||
DeleteDC(memPrDC);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user