Attachment 313545 Details for Bug 455867 – salbmp.cxx diff between 2.3.0 and 2.4.1

[patch] salbmp.cxx diff between 2.3.0 and 2.4.1

ooo-salbmp.diff (text/plain), 2.68 KB, created by Tomas Hoger on 2008-08-06 10:03:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Hoger

Created: 2008-08-06 10:03:38 UTC

Size: 2.68 KB

patch

obsolete

>--- vcl/unx/source/gdi/salbmp.cxx	2007-06-27 22:49:34.000000000 +0200
>+++ vcl/unx/source/gdi/salbmp.cxx.new	2008-02-26 19:15:21.000000000 +0100
>@@ -2,11 +2,11 @@
>  *
>  *  OpenOffice.org - a multi-platform office productivity suite
>  *
>- *  $RCSfile$
>+ *  $RCSfile: salbmp.cxx,v $
>  *
>- *  $Revision$
>+ *  $Revision: 1.29.178.2 $
>  *
>- *  last change: $Author$ $Date$
>+ *  last change: $Author: hr $ $Date: 2008/02/26 18:15:21 $
>  *
>  *  The Contents of this file are made available subject to
>  *  the terms of GNU Lesser General Public License Version 2.1.
>@@ -43,6 +43,7 @@
> #include <sys/types.h>
> #endif
> #include <prex.h>
>+#include "Xproto.h"
> #include <postx.h>
> #include <salunx.h>
> #ifndef _OSL_ENDIAN_H_
>@@ -138,11 +139,18 @@ BitmapBuffer* X11SalBitmap::ImplCreateDI
> {
> 	DBG_ASSERT( nBitCount == 1 || nBitCount == 4 || nBitCount == 8 || nBitCount == 16 || nBitCount == 24, "Unsupported BitCount!" );
> 
>-	BitmapBuffer* pDIB;
>+	BitmapBuffer* pDIB = NULL;
> 
> 	if( rSize.Width() && rSize.Height() )
> 	{
>-		pDIB = new BitmapBuffer;
>+        try
>+        {
>+            pDIB = new BitmapBuffer;
>+        }
>+        catch( std::bad_alloc& )
>+        {
>+            pDIB = NULL;
>+        }
> 
> 		if( pDIB )
> 		{
>@@ -179,7 +187,15 @@ BitmapBuffer* X11SalBitmap::ImplCreateDI
> 				pDIB->maPalette.SetEntryCount( nColors );
> 			}
> 
>-			pDIB->mpBits = new BYTE[ pDIB->mnScanlineSize * pDIB->mnHeight ];
>+            try
>+            {
>+                pDIB->mpBits = new BYTE[ pDIB->mnScanlineSize * pDIB->mnHeight ];
>+            }
>+            catch(std::bad_alloc&)
>+            {
>+                delete pDIB;
>+                pDIB = NULL;
>+            }
> 		}
> 	}
> 	else
>@@ -211,7 +227,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDI
> 		// so better catch the XError
>         pXLib->PushXErrorLevel( true );
> 		XImage*	pImage = XGetImage( pXDisp, aDrawable, nX, nY, nWidth, nHeight, AllPlanes, ZPixmap );
>-		bool bWasError = pXLib->HasXErrorOccured();
>+		bool bWasError = pXLib->HasXErrorOccured() && pXLib->GetLastXErrorRequestCode() == X_GetImage;
> 		pXLib->PopXErrorLevel();
> 
> 		if( ! bWasError && pImage && pImage->data )
>@@ -708,7 +724,15 @@ bool X11SalBitmap::Create( const SalBitm
> 		// TODO: reference counting...
> 		mpDIB = new BitmapBuffer( *rSalBmp.mpDIB );
> 		// TODO: get rid of this when BitmapBuffer gets copy constructor
>-		mpDIB->mpBits = new BYTE[ mpDIB->mnScanlineSize * mpDIB->mnHeight ];
>+        try
>+        {
>+            mpDIB->mpBits = new BYTE[ mpDIB->mnScanlineSize * mpDIB->mnHeight ];
>+        }
>+        catch( std::bad_alloc& )
>+        {
>+            delete mpDIB;
>+            mpDIB = NULL;
>+        }
> 
> 		if( mpDIB )
> 			memcpy( mpDIB->mpBits, rSalBmp.mpDIB->mpBits, mpDIB->mnScanlineSize * mpDIB->mnHeight );

Actions: View | Diff

Attachments on bug 455867: 312137 | 312140 | 312141 | 312838 | 312840 | 313545