Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed fToken to fAreaOffset and use it instead of fArea for the area offset. Less hacky.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16031 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2006-01-21 20:30:31 +00:00
parent 365a41fd5c
commit ccee0bb56d
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/os/interface/Bitmap.h
View File

@ -118,7 +118,7 @@ private:
int32 fBytesPerRow; int32 fBytesPerRow;
BWindow *fWindow; BWindow *fWindow;
int32 fServerToken; int32 fServerToken;
int32 fToken; int32 fAreaOffset;
uint8 unused; uint8 unused;
area_id fArea; area_id fArea;
area_id fOrigArea; area_id fOrigArea;

30
src/kits/interface/Bitmap.cpp
View File

@ -701,7 +701,7 @@ BBitmap::BBitmap(BRect bounds, uint32 flags, color_space colorSpace,
fBytesPerRow(0), fBytesPerRow(0),
fWindow(NULL), fWindow(NULL),
fServerToken(-1), fServerToken(-1),
fToken(-1), fAreaOffset(-1),
fArea(-1), fArea(-1),
fOrigArea(-1), fOrigArea(-1),
fFlags(0), fFlags(0),
@ -729,7 +729,7 @@ BBitmap::BBitmap(BRect bounds, color_space colorSpace, bool acceptsViews,
fBytesPerRow(0), fBytesPerRow(0),
fWindow(NULL), fWindow(NULL),
fServerToken(-1), fServerToken(-1),
fToken(-1), fAreaOffset(-1),
fArea(-1), fArea(-1),
fOrigArea(-1), fOrigArea(-1),
fFlags(0), fFlags(0),
@ -760,7 +760,7 @@ BBitmap::BBitmap(const BBitmap *source, bool acceptsViews,
fBytesPerRow(0), fBytesPerRow(0),
fWindow(NULL), fWindow(NULL),
fServerToken(-1), fServerToken(-1),
fToken(-1), fAreaOffset(-1),
fArea(-1), fArea(-1),
fOrigArea(-1), fOrigArea(-1),
fFlags(0), fFlags(0),
@ -798,7 +798,7 @@ BBitmap::BBitmap(BMessage *data)
fBytesPerRow(0), fBytesPerRow(0),
fWindow(NULL), fWindow(NULL),
fServerToken(-1), fServerToken(-1),
fToken(-1), fAreaOffset(-1),
fArea(-1), fArea(-1),
fOrigArea(-1), fOrigArea(-1),
fFlags(0), fFlags(0),
@ -933,6 +933,7 @@ BBitmap::UnlockBits()
area_id area_id
BBitmap::Area() const BBitmap::Area() const
{ {
const_cast<BBitmap *>(this)->AssertPtr();
return fArea; return fArea;
} }
@ -2258,15 +2259,8 @@ BBitmap::InitObject(BRect bounds, color_space colorSpace, uint32 flags,
// server side success // server side success
// Get token // Get token
link.Read<int32>(&fServerToken); link.Read<int32>(&fServerToken);
int32 areaOffset;
link.Read<area_id>(&fOrigArea); link.Read<area_id>(&fOrigArea);
link.Read<int32>(&areaOffset); link.Read<int32>(&fAreaOffset);
// TODO: We save the area offset into "fArea" because
// we need it into AssertPtr(), and we can't add any member
// to BBitmap due to binary compatibility
fArea = (area_id)areaOffset;
if (fOrigArea >= B_OK) { if (fOrigArea >= B_OK) {
fSize = size; fSize = size;
@ -2283,12 +2277,12 @@ BBitmap::InitObject(BRect bounds, color_space colorSpace, uint32 flags,
fServerToken = -1; fServerToken = -1;
fArea = -1; fArea = -1;
fOrigArea = -1; fOrigArea = -1;
fAreaOffset = -1;
// NOTE: why not "0" in case of error? // NOTE: why not "0" in case of error?
fFlags = flags; fFlags = flags;
} }
} }
fWindow = NULL; fWindow = NULL;
fToken = -1;
} }
fInitError = error; fInitError = error;
@ -2328,9 +2322,11 @@ BBitmap::CleanUp()
link.Attach<int32>(fServerToken); link.Attach<int32>(fServerToken);
link.Flush(); link.Flush();
delete_area(fArea); if (fArea >= 0)
delete_area(fArea);
fArea = -1; fArea = -1;
fServerToken = -1; fServerToken = -1;
fAreaOffset = -1;
} }
fBasePtr = NULL; fBasePtr = NULL;
} }
@ -2339,18 +2335,16 @@ BBitmap::CleanUp()
void void
BBitmap::AssertPtr() BBitmap::AssertPtr()
{ {
if (fBasePtr == NULL && InitCheck() == B_OK) { if (fBasePtr == NULL && fAreaOffset != -1 && InitCheck() == B_OK) {
// Offset was saved into "fArea" as we can't add // Offset was saved into "fArea" as we can't add
// any member variable due to Binary compatibility // any member variable due to Binary compatibility
int32 offset = (int32)fArea;
// Get the area in which the data resides // Get the area in which the data resides
fArea = clone_area("shared bitmap area", (void **)&fBasePtr, B_ANY_ADDRESS, fArea = clone_area("shared bitmap area", (void **)&fBasePtr, B_ANY_ADDRESS,
B_READ_AREA | B_WRITE_AREA, fOrigArea); B_READ_AREA | B_WRITE_AREA, fOrigArea);
if (fArea >= B_OK) { if (fArea >= B_OK) {
// Jump to the location in the area // Jump to the location in the area
fBasePtr = (int8 *)fBasePtr + offset; fBasePtr = (int8 *)fBasePtr + fAreaOffset;
} else } else
fBasePtr = NULL; fBasePtr = NULL;
} }