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

* This fixes the BitmapStream issues identified by #7740; the actual problem

Browse Source 
persists to be debugged further.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42297 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2011-06-24 16:48:05 +00:00
parent 9674328ebe
commit ee918f6365
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/translation/BitmapStream.cpp
+20 -10
View File
@@ -32,7 +32,7 @@ BBitmapStream::BBitmapStream(BBitmap* bitmap)
fBigEndianHeader = new TranslatorBitmap; fBigEndianHeader = new TranslatorBitmap;
// Extract header information if bitmap is available // Extract header information if bitmap is available
if (fBitmap != NULL) { if (fBitmap != NULL && fBitmap->InitCheck() == B_OK) {
fHeader.magic = B_TRANSLATOR_BITMAP; fHeader.magic = B_TRANSLATOR_BITMAP;
fHeader.bounds = fBitmap->Bounds(); fHeader.bounds = fBitmap->Bounds();
fHeader.rowBytes = fBitmap->BytesPerRow(); fHeader.rowBytes = fBitmap->BytesPerRow();
@@ -45,7 +45,8 @@ BBitmapStream::BBitmapStream(BBitmap* bitmap)
memcpy(fBigEndianHeader, &fHeader, sizeof(TranslatorBitmap)); memcpy(fBigEndianHeader, &fHeader, sizeof(TranslatorBitmap));
else else
SwapHeader(&fHeader, fBigEndianHeader); SwapHeader(&fHeader, fBigEndianHeader);
} } else
fBitmap = NULL;
} }
@@ -71,8 +72,8 @@ BBitmapStream::~BBitmapStream()
ssize_t ssize_t
BBitmapStream::ReadAt(off_t pos, void* buffer, size_t size) BBitmapStream::ReadAt(off_t pos, void* buffer, size_t size)
{ {
if (!fBitmap) if (fBitmap == NULL)
return B_ERROR; return B_NO_INIT;
if (size == 0) if (size == 0)
return B_OK; return B_OK;
if (pos >= fSize || pos < 0 || buffer == NULL) if (pos >= fSize || pos < 0 || buffer == NULL)
@@ -113,8 +114,8 @@ BBitmapStream::ReadAt(off_t pos, void* buffer, size_t size)
ssize_t ssize_t
BBitmapStream::WriteAt(off_t pos, const void* data, size_t size) BBitmapStream::WriteAt(off_t pos, const void* data, size_t size)
{ {
if (!size) if (size == 0)
return B_NO_ERROR; return B_OK;
if (!data || pos < 0 || pos > fSize) if (!data || pos < 0 || pos > fSize)
return B_BAD_VALUE; return B_BAD_VALUE;
@@ -128,6 +129,9 @@ BBitmapStream::WriteAt(off_t pos, const void* data, size_t size)
toWrite = sizeof(TranslatorBitmap) - pos; toWrite = sizeof(TranslatorBitmap) - pos;
dest = (reinterpret_cast<uint8 *> (&fHeader)) + pos; dest = (reinterpret_cast<uint8 *> (&fHeader)) + pos;
} else { } else {
if (fBitmap == NULL || !fBitmap->IsValid())
return B_ERROR;
toWrite = fHeader.dataSize - pos + sizeof(TranslatorBitmap); toWrite = fHeader.dataSize - pos + sizeof(TranslatorBitmap);
dest = (reinterpret_cast<uint8 *> (fBitmap->Bits())) + dest = (reinterpret_cast<uint8 *> (fBitmap->Bits())) +
pos - sizeof(TranslatorBitmap); pos - sizeof(TranslatorBitmap);
@@ -152,7 +156,7 @@ BBitmapStream::WriteAt(off_t pos, const void* data, size_t size)
if (B_HOST_IS_LENDIAN) if (B_HOST_IS_LENDIAN)
SwapHeader(fBigEndianHeader, &fHeader); SwapHeader(fBigEndianHeader, &fHeader);
if (fBitmap if (fBitmap != NULL
&& (fBitmap->Bounds() != fHeader.bounds && (fBitmap->Bounds() != fHeader.bounds
|| fBitmap->ColorSpace() != fHeader.colors || fBitmap->ColorSpace() != fHeader.colors
|| (uint32)fBitmap->BytesPerRow() != fHeader.rowBytes)) { || (uint32)fBitmap->BytesPerRow() != fHeader.rowBytes)) {
@@ -161,19 +165,25 @@ BBitmapStream::WriteAt(off_t pos, const void* data, size_t size)
delete fBitmap; delete fBitmap;
fBitmap = NULL; fBitmap = NULL;
} }
if (!fBitmap) { 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 BBitmap(fHeader.bounds, fHeader.colors);
if (!fBitmap) if (fBitmap == NULL)
return B_ERROR; return B_ERROR;
if (!fBitmap->IsValid()) {
status_t error = fBitmap->InitCheck();
delete fBitmap;
fBitmap = NULL;
return error;
}
if ((uint32)fBitmap->BytesPerRow() != fHeader.rowBytes) { if ((uint32)fBitmap->BytesPerRow() != fHeader.rowBytes) {
fprintf(stderr, "BitmapStream %ld %ld\n", fprintf(stderr, "BitmapStream %ld %ld\n",
fBitmap->BytesPerRow(), fHeader.rowBytes); fBitmap->BytesPerRow(), fHeader.rowBytes);
return B_MISMATCHED_VALUES; return B_MISMATCHED_VALUES;
} }
} }
if (fBitmap) if (fBitmap != NULL)
fSize = sizeof(TranslatorBitmap) + fBitmap->BitsLength(); fSize = sizeof(TranslatorBitmap) + fBitmap->BitsLength();
} }
} }