Minor cleanup.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14768 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -677,9 +677,8 @@ palette_converter()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/////////////
|
// #pragma mark -
|
||||||
// BBitmap //
|
|
||||||
/////////////
|
|
||||||
|
|
||||||
// constructor
|
// constructor
|
||||||
/*! \brief Creates and initializes a BBitmap.
|
/*! \brief Creates and initializes a BBitmap.
|
||||||
@@ -812,10 +811,10 @@ BBitmap::BBitmap(BMessage *data)
|
|||||||
int32 flags = 0;
|
int32 flags = 0;
|
||||||
data->FindInt32("_bmflags", &flags);
|
data->FindInt32("_bmflags", &flags);
|
||||||
|
|
||||||
int32 rowbytes = 0;
|
int32 rowBytes = 0;
|
||||||
data->FindInt32("_rowbytes", &rowbytes);
|
data->FindInt32("_rowbytes", &rowBytes);
|
||||||
|
|
||||||
InitObject(bounds, cspace, flags, rowbytes, B_MAIN_SCREEN_ID);
|
InitObject(bounds, cspace, flags, rowBytes, B_MAIN_SCREEN_ID);
|
||||||
|
|
||||||
if (data->HasData("_data", B_RAW_TYPE) && InitCheck() == B_OK) {
|
if (data->HasData("_data", B_RAW_TYPE) && InitCheck() == B_OK) {
|
||||||
ssize_t size = 0;
|
ssize_t size = 0;
|
||||||
@@ -825,15 +824,11 @@ BBitmap::BBitmap(BMessage *data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (fFlags & B_BITMAP_ACCEPTS_VIEWS) {
|
if (fFlags & B_BITMAP_ACCEPTS_VIEWS) {
|
||||||
BArchivable *obj;
|
|
||||||
BMessage message;
|
BMessage message;
|
||||||
int i = 0;
|
int32 i = 0;
|
||||||
|
|
||||||
while (data->FindMessage("_view", i++, &message) == B_OK) {
|
while (data->FindMessage("_view", i++, &message) == B_OK) {
|
||||||
obj = instantiate_object(&message);
|
if (BView *view = dynamic_cast<BView *>(instantiate_object(&message)))
|
||||||
BView *view = dynamic_cast<BView *>(obj);
|
|
||||||
|
|
||||||
if (view)
|
|
||||||
AddChild(view);
|
AddChild(view);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user