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

Looks like there is an ancient bitmap archiving format that doesn't know about

Browse Source 
bytes per row or flags. This fixes bug #518.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17346 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-05-06 10:04:05 +00:00
parent 47b3e74e2d
commit 630e0d5f82
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Bitmap.cpp
+21 -6
View File
@@ -240,15 +240,30 @@ BBitmap::BBitmap(BMessage *data)
fFlags(0), fFlags(0),
fInitError(B_NO_INIT) fInitError(B_NO_INIT)
{ {
int32 flags;
if (data->FindInt32("_bmflags", &flags) != B_OK) {
// this bitmap is archived in some archaic format
flags = 0;
bool acceptsViews;
if (data->FindBool("_view_ok", &acceptsViews) == B_OK && acceptsViews)
flags |= B_BITMAP_ACCEPTS_VIEWS;
bool contiguous;
if (data->FindBool("_contiguous", &contiguous) == B_OK && contiguous)
flags |= B_BITMAP_IS_CONTIGUOUS;
}
int32 rowBytes;
if (data->FindInt32("_rowbytes", &rowBytes) != B_OK) {
rowBytes = -1;
// bytes per row are computed in InitObject(), then
}
BRect bounds; BRect bounds;
color_space cspace; color_space cspace;
int32 flags;
int32 rowBytes;
if (data->FindRect("_frame", &bounds) == B_OK if (data->FindRect("_frame", &bounds) == B_OK
&& data->FindInt32("_cspace", (int32*)&cspace) == B_OK && data->FindInt32("_cspace", (int32*)&cspace) == B_OK) {
&& data->FindInt32("_bmflags", &flags) == B_OK
&& data->FindInt32("_rowbytes", &rowBytes) == B_OK) {
_InitObject(bounds, cspace, flags, rowBytes, B_MAIN_SCREEN_ID); _InitObject(bounds, cspace, flags, rowBytes, B_MAIN_SCREEN_ID);
} }