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

Removed some dependencies from old pattern-passing method

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4947 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2003-10-04 22:12:18 +00:00
parent b02917dae8
commit 5c26d5df06
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/server/BitmapDriver.cpp
+6 -10
View File
@@ -58,10 +58,6 @@
extern RGBColor workspace_default_color; // defined in AppServer.cpp extern RGBColor workspace_default_color; // defined in AppServer.cpp
//TODO: Remove the need for these
extern int64 patsolidhigh64;
extern int8 *patsolidhigh;
void HLine_32Bit(graphics_card_info i, uint16 x, uint16 y, uint16 length, rgb_color col); void HLine_32Bit(graphics_card_info i, uint16 x, uint16 y, uint16 length, rgb_color col);
void HLine_16Bit(graphics_card_info i, uint16 x, uint16 y, uint16 length, uint16 col); void HLine_16Bit(graphics_card_info i, uint16 x, uint16 y, uint16 length, uint16 col);
void HLine_16Bit(graphics_card_info i, uint16 x, uint16 y, uint16 length, uint8 col); void HLine_16Bit(graphics_card_info i, uint16 x, uint16 y, uint16 length, uint8 col);
@@ -860,8 +856,8 @@ void BitmapDriver::FillEllipse(BRect r, LayerData *ldata, const Pattern &pat)
pstart = y - half; pstart = y - half;
for (pix = pstart; pix < pstart + thick; pix++) for (pix = pstart; pix < pstart + thick; pix++)
{ {
Line( BPoint(cx - x, cy + pix), BPoint(cx + x, cy + pix), ldata, patsolidhigh); Line( BPoint(cx - x, cy + pix), BPoint(cx + x, cy + pix), ldata, pat_solidhigh);
Line( BPoint(cx - x, cy - pix), BPoint(cx + x, cy - pix), ldata, patsolidhigh); Line( BPoint(cx - x, cy - pix), BPoint(cx + x, cy - pix), ldata, pat_solidhigh);
} }
if (d < 0) if (d < 0)
d += b_sq_4 * x++ + b_sq_6; d += b_sq_4 * x++ + b_sq_6;
@@ -885,8 +881,8 @@ void BitmapDriver::FillEllipse(BRect r, LayerData *ldata, const Pattern &pat)
pstart = yp - half2; pstart = yp - half2;
for (pix = pstart; pix < pstart + thick2; pix++) for (pix = pstart; pix < pstart + thick2; pix++)
{ {
Line( BPoint(cx - xp, cy + pix), BPoint(cx + xp, cy + pix), ldata, patsolidhigh); Line( BPoint(cx - xp, cy + pix), BPoint(cx + xp, cy + pix), ldata, pat_solidhigh);
Line( BPoint(cx - xp, cy - pix), BPoint(cx + xp, cy - pix), ldata, patsolidhigh); Line( BPoint(cx - xp, cy - pix), BPoint(cx + xp, cy - pix), ldata, pat_solidhigh);
} }
if (dp < 0) if (dp < 0)
dp += b_sq_4 * xp++ + b_sq_6; dp += b_sq_4 * xp++ + b_sq_6;
@@ -902,8 +898,8 @@ void BitmapDriver::FillEllipse(BRect r, LayerData *ldata, const Pattern &pat)
pstart = x - half; pstart = x - half;
for (pix = pstart; pix < pstart + thick; pix++) for (pix = pstart; pix < pstart + thick; pix++)
{ {
Line( BPoint(cx - pix, cy + y), BPoint(cx + pix, cy + y), ldata, patsolidhigh); Line( BPoint(cx - pix, cy + y), BPoint(cx + pix, cy + y), ldata, pat_solidhigh);
Line( BPoint(cx - pix, cy - y), BPoint(cx + pix, cy - y), ldata, patsolidhigh); Line( BPoint(cx - pix, cy - y), BPoint(cx + pix, cy - y), ldata, pat_solidhigh);
} }
if (d < 0) if (d < 0)
src/servers/app/server/ScreenDriver.cpp
+1 -4
View File
@@ -49,6 +49,7 @@
#include "FontFamily.h" #include "FontFamily.h"
#include "LayerData.h" #include "LayerData.h"
#include "PNGDump.h" #include "PNGDump.h"
#include "PatternHandler.h"
#ifdef DEBUG_DRIVER_MODULE #ifdef DEBUG_DRIVER_MODULE
# include <stdio.h> # include <stdio.h>
@@ -68,10 +69,6 @@ SDWIN_MOVECURSOR,
SDWIN_SETCURSOR, SDWIN_SETCURSOR,
}; };
//TODO: Remove the need for these
int64 patsolidhigh64=0xFFFFFFFFLL;
int8 *patsolidhigh=(int8*)&patsolidhigh64;
extern RGBColor workspace_default_color; extern RGBColor workspace_default_color;
FrameBuffer::FrameBuffer(const char *title, uint32 space, status_t *st,bool debug) FrameBuffer::FrameBuffer(const char *title, uint32 space, status_t *st,bool debug)