From 32177439551e0c1b84ca5f7f7afa1cff96d406fd Mon Sep 17 00:00:00 2001 From: "mats.palmgren@bredband.net" Date: Fri, 8 Jun 2007 05:05:29 -0700 Subject: [PATCH] Fix GCC build error. b=363592 r=mkaply sr=benjamin --- gfx/src/windows/nsImageWin.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gfx/src/windows/nsImageWin.cpp b/gfx/src/windows/nsImageWin.cpp index 5ff48b4a696..7143f76a65a 100644 --- a/gfx/src/windows/nsImageWin.cpp +++ b/gfx/src/windows/nsImageWin.cpp @@ -2046,12 +2046,15 @@ CompositeBitsInMemory(HDC aTheHDC, int aDX, int aDY, int aDWidth, int aDHeight, ::GdiFlush(); // output the composed image +#ifdef _MSC_VER __try { +#endif ::StretchDIBits(aTheHDC, aDX, aDY, aDWidth, aDHeight, aSX, aSrcy, aSWidth, aSHeight, screenBits, (LPBITMAPINFO)&offbmi, 256 == aNumPaletteColors ? DIB_PAL_COLORS : DIB_RGB_COLORS, SRCCOPY); +#ifdef _MSC_VER } __except (EXCEPTION_EXECUTE_HANDLER) { /* yeah this is ugly - certain printer drivers crash in the StretchDIBits */ /* workaround is to subtract one from aSrcy */ @@ -2061,6 +2064,7 @@ CompositeBitsInMemory(HDC aTheHDC, int aDX, int aDY, int aDWidth, int aDHeight, 256 == aNumPaletteColors ? DIB_PAL_COLORS : DIB_RGB_COLORS, SRCCOPY); } +#endif ::SelectObject(memDC, oldBitmap); }