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

Some cleanup to make it easier to read.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12064 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2005-03-27 03:33:23 +00:00
parent ac13e18b22
commit a2a622616f
1 changed files with 74 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/drawing/DisplayDriverImpl.cpp
+31 -52
View File
@@ -2591,49 +2591,38 @@ void DisplayDriverImpl::BlitMono2RGB32(FT_Bitmap *src, const BPoint &pt, const D
ReleaseBuffer(); ReleaseBuffer();
} }
void DisplayDriverImpl::BlitGray2RGB32(FT_Bitmap *src, const BPoint &pt, const DrawData *d) void
DisplayDriverImpl::BlitGray2RGB32(FT_Bitmap *src, const BPoint &pt, const DrawData *d)
{ {
// pointers to the top left corner of the area to be copied in each bitmap
uint8 *srcbuffer=NULL, *destbuffer=NULL;
FBBitmap framebuffer; FBBitmap framebuffer;
if(!AcquireBuffer(&framebuffer)) {
if(!AcquireBuffer(&framebuffer))
{
printf("Couldn't acquire framebuffer in DisplayDriverImpl::BlitGray2RGB32\n"); printf("Couldn't acquire framebuffer in DisplayDriverImpl::BlitGray2RGB32\n");
return; return;
} }
// index pointers which are incremented during the course of the blit rgb_color highcolor = d->highcolor.GetColor32();
uint8 *srcindex=NULL, *destindex=NULL, *rowptr=NULL; rgb_color lowcolor = d->lowcolor.GetColor32();
rgb_color highcolor=d->highcolor.GetColor32(), lowcolor=d->lowcolor.GetColor32(); float rstep,gstep,bstep,astep;
float rstep, gstep, bstep, astep;
rstep = float(highcolor.red - lowcolor.red) / 255.0; rstep = float(highcolor.red - lowcolor.red) / 255.0;
gstep = float(highcolor.green - lowcolor.green) / 255.0; gstep = float(highcolor.green - lowcolor.green) / 255.0;
bstep = float(highcolor.blue - lowcolor.blue) / 255.0; bstep = float(highcolor.blue - lowcolor.blue) / 255.0;
astep = float(highcolor.alpha - lowcolor.alpha) / 255.0; astep = float(highcolor.alpha - lowcolor.alpha) / 255.0;
// increment values for the index pointers // increment values for the index pointers
int32 x=(int32)pt.x, int32 x = (int32)pt.x;
y=(int32)pt.y, int32 y = (int32)pt.y;
srcinc=src->pitch, int32 srcinc = src->pitch;
// destinc=dest->BytesPerRow(), int32 destinc = framebuffer.BytesPerRow();
destinc=framebuffer.BytesPerRow(), int32 srcwidth = src->width;
srcwidth=src->width, int32 srcheight = src->rows;
srcheight=src->rows, int32 incval=0;
incval=0;
int16 i,j; // pointers to the top left corner of the area to be copied in each bitmap
uint8 *srcbuffer = (uint8 *)src->buffer;
uint8 *destbuffer= (uint8 *)framebuffer.Bits() + (y * framebuffer.BytesPerRow() + (x * 4));
// starting point in source bitmap if (y < 0) {
srcbuffer=(uint8*)src->buffer;
// starting point in destination bitmap
destbuffer=(uint8*)framebuffer.Bits()+(y*framebuffer.BytesPerRow()+(x*4));
if(y<0)
{
if (y < pt.y) if (y < pt.y)
y++; y++;
@@ -2644,22 +2633,19 @@ void DisplayDriverImpl::BlitGray2RGB32(FT_Bitmap *src, const BPoint &pt, const D
destbuffer += incval * destinc; destbuffer += incval * destinc;
} }
if(y+srcheight>framebuffer.Bounds().IntegerHeight()) if (y + srcheight > framebuffer.Bounds().IntegerHeight()) {
{
if(y > pt.y) if(y > pt.y)
y--; y--;
srcheight -= (y + srcheight - 1) - framebuffer.Bounds().IntegerHeight(); srcheight -= (y + srcheight - 1) - framebuffer.Bounds().IntegerHeight();
} }
if(x+srcwidth>framebuffer.Bounds().IntegerWidth()) if (x + srcwidth > framebuffer.Bounds().IntegerWidth()) {
{
if(x > pt.x) if(x > pt.x)
x--; x--;
srcwidth -= (x + srcwidth - 1) - framebuffer.Bounds().IntegerWidth(); srcwidth -= (x + srcwidth - 1) - framebuffer.Bounds().IntegerWidth();
} }
if(x<0) if (x < 0) {
{
if(x < pt.x) if(x < pt.x)
x++; x++;
incval = 0 - x; incval = 0 - x;
@@ -2668,33 +2654,26 @@ void DisplayDriverImpl::BlitGray2RGB32(FT_Bitmap *src, const BPoint &pt, const D
destbuffer += incval * 4; destbuffer += incval * 4;
} }
// index pointers which are incremented during the course of the blit
uint8 *srcindex = srcbuffer;
uint8 *destindex = destbuffer;
uint8 *rowptr = NULL;
int32 value; int32 value;
srcindex=srcbuffer; for (int32 i = 0; i < srcheight; i++) {
destindex=destbuffer;
for(i=0; i<srcheight; i++)
{
rowptr = destindex; rowptr = destindex;
for(j=0;j<srcwidth;j++) for(int32 j = 0; j < srcwidth; j++) {
{
value = *(srcindex + j) ^ 255; value = *(srcindex + j) ^ 255;
if(value!=255) if (value != 255) {
{ if(d->draw_mode == B_OP_COPY) {
if(d->draw_mode==B_OP_COPY)
{
rowptr[0] = uint8(highcolor.blue - (value * bstep)); rowptr[0] = uint8(highcolor.blue - (value * bstep));
rowptr[1] = uint8(highcolor.green - (value * gstep)); rowptr[1] = uint8(highcolor.green - (value * gstep));
rowptr[2] = uint8(highcolor.red - (value * rstep)); rowptr[2] = uint8(highcolor.red - (value * rstep));
rowptr[3] = 255; rowptr[3] = 255;
} } else if (d->draw_mode == B_OP_OVER) {
else if(highcolor.alpha>127) {
if(d->draw_mode==B_OP_OVER)
{
if(highcolor.alpha>127)
{
rowptr[0] = uint8(highcolor.blue - (value * (float(highcolor.blue - rowptr[0]) / 255.0))); rowptr[0] = uint8(highcolor.blue - (value * (float(highcolor.blue - rowptr[0]) / 255.0)));
rowptr[1] = uint8(highcolor.green - (value * (float(highcolor.green - rowptr[1]) / 255.0))); rowptr[1] = uint8(highcolor.green - (value * (float(highcolor.green - rowptr[1]) / 255.0)));
rowptr[2] = uint8(highcolor.red - (value * (float(highcolor.red - rowptr[2]) / 255.0))); rowptr[2] = uint8(highcolor.red - (value * (float(highcolor.red - rowptr[2]) / 255.0)));
@@ -2703,12 +2682,12 @@ void DisplayDriverImpl::BlitGray2RGB32(FT_Bitmap *src, const BPoint &pt, const D
} }
} }
rowptr += 4; rowptr += 4;
} }
srcindex += srcinc; srcindex += srcinc;
destindex += destinc; destindex += destinc;
} }
ReleaseBuffer(); ReleaseBuffer();
} }