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

fixed a virtual method to method to return properly

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6719 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adi Oanca
2004-02-24 11:53:35 +00:00
parent 82cde293d6
commit a00a89d9c6
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/server/ViewDriver.cpp
+8 -9
View File
@@ -72,8 +72,7 @@ VDWIN_SETCURSOR,
extern RGBColor workspace_default_color; extern RGBColor workspace_default_color;
bool is_initialized=false; bool is_initialized = false;
VDView::VDView(BRect bounds) VDView::VDView(BRect bounds)
: BView(bounds,"viewdriver_view",B_FOLLOW_ALL, B_WILL_DRAW) : BView(bounds,"viewdriver_view",B_FOLLOW_ALL, B_WILL_DRAW)
@@ -1234,19 +1233,19 @@ void ViewDriver::CopyToBitmap(ServerBitmap *destbmp, const BRect &sourcerect)
} }
bool ViewDriver::AcquireBuffer(FBBitmap *fbmp) bool ViewDriver::AcquireBuffer(FBBitmap *bmp)
{ {
if(!fbmp || !is_initialized) if(!bmp || !is_initialized)
return false; return false;
screenwin->Lock(); screenwin->Lock();
framebuffer->Lock(); framebuffer->Lock();
fbmp->SetBytesPerRow(framebuffer->BytesPerRow()); bmp->SetBytesPerRow(framebuffer->BytesPerRow());
fbmp->SetSpace(framebuffer->ColorSpace()); bmp->SetSpace(framebuffer->ColorSpace());
fbmp->SetSize(framebuffer->Bounds().IntegerWidth(), framebuffer->Bounds().IntegerHeight()); bmp->SetSize(framebuffer->Bounds().IntegerWidth(), framebuffer->Bounds().IntegerHeight());
fbmp->SetBuffer(framebuffer->Bits()); bmp->SetBuffer(framebuffer->Bits());
fbmp->SetBitsPerPixel(framebuffer->ColorSpace(),framebuffer->BytesPerRow()); bmp->SetBitsPerPixel(framebuffer->ColorSpace(),framebuffer->BytesPerRow());
return true; return true;
} }
src/servers/app/server/ViewDriver.h
+10 -9
View File
@@ -102,19 +102,20 @@ public:
ViewDriver(void); ViewDriver(void);
~ViewDriver(void); ~ViewDriver(void);
bool Initialize(void); // Sets the driver virtual bool Initialize(void); // Sets the driver
void Shutdown(void); // You never know when you'll need this virtual void Shutdown(void); // You never know when you'll need this
// Drawing functions // Drawing functions
void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d); void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
void InvertRect(const BRect &r); virtual void InvertRect(const BRect &r);
virtual void StrokeLineArray(BPoint *pts, const int32 &numlines, const DrawData *d, RGBColor *colors); virtual void StrokeLineArray(BPoint *pts, const int32 &numlines,
const DrawData *d, RGBColor *colors);
void SetMode(const display_mode &mode); virtual void SetMode(const display_mode &mode);
bool DumpToFile(const char *path); virtual bool DumpToFile(const char *path);
VDWindow *screenwin; VDWindow *screenwin;
@@ -138,9 +139,9 @@ protected:
void CopyBitmap(ServerBitmap *bitmap, const BRect &source, const BRect &dest, const DrawData *d); void CopyBitmap(ServerBitmap *bitmap, const BRect &source, const BRect &dest, const DrawData *d);
void CopyToBitmap(ServerBitmap *target, const BRect &source); void CopyToBitmap(ServerBitmap *target, const BRect &source);
bool AcquireBuffer(FBBitmap *fbmp); virtual bool AcquireBuffer(FBBitmap *bmp);
void ReleaseBuffer(void); virtual void ReleaseBuffer(void);
void Invalidate(const BRect &r); virtual void Invalidate(const BRect &r);
// void BlitMono2RGB32(FT_Bitmap *src, BPoint pt, DrawData *d); // void BlitMono2RGB32(FT_Bitmap *src, BPoint pt, DrawData *d);
// void BlitGray2RGB32(FT_Bitmap *src, BPoint pt, DrawData *d); // void BlitGray2RGB32(FT_Bitmap *src, BPoint pt, DrawData *d);