i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed incorrect usage of "new" - thanks korli!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42305 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2011-06-24 18:32:48 +00:00
parent cefef1c371
commit 6ee17ffbe8
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/translation/BitmapStream.cpp
+10 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009, Haiku, Inc. * Copyright 2002-2011, Haiku, Inc.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -10,6 +10,8 @@
#include <BitmapStream.h> #include <BitmapStream.h>
#include <new>
#include <string.h> #include <string.h>
#include <Bitmap.h> #include <Bitmap.h>
@@ -29,7 +31,11 @@ BBitmapStream::BBitmapStream(BBitmap* bitmap)
fDetached = false; fDetached = false;
fPosition = 0; fPosition = 0;
fSize = 0; fSize = 0;
fBigEndianHeader = new TranslatorBitmap; fBigEndianHeader = new (std::nothrow) TranslatorBitmap;
if (fBigEndianHeader == NULL) {
fBitmap = NULL;
return;
}
// Extract header information if bitmap is available // Extract header information if bitmap is available
if (fBitmap != NULL && fBitmap->InitCheck() == B_OK) { if (fBitmap != NULL && fBitmap->InitCheck() == B_OK) {
@@ -168,7 +174,8 @@ BBitmapStream::WriteAt(off_t pos, const void* data, size_t size)
if (fBitmap == NULL) { if (fBitmap == NULL) {
if (fHeader.bounds.left > 0.0 || fHeader.bounds.top > 0.0) if (fHeader.bounds.left > 0.0 || fHeader.bounds.top > 0.0)
DEBUGGER("non-origin bounds!"); DEBUGGER("non-origin bounds!");
fBitmap = new BBitmap(fHeader.bounds, fHeader.colors); fBitmap = new (std::nothrow )BBitmap(fHeader.bounds,
fHeader.colors);
if (fBitmap == NULL) if (fBitmap == NULL)
return B_ERROR; return B_ERROR;
if (!fBitmap->IsValid()) { if (!fBitmap->IsValid()) {