(svn r10193) -Fix r10190: somehow an other partly-patch was applied too
This commit is contained in:
@@ -29,56 +29,6 @@ void Blitter_32bppBase::SetHorizontalLine(void *video, int width, uint8 color)
|
||||
}
|
||||
}
|
||||
|
||||
void Blitter_32bppBase::DrawLine(void *video, int x, int y, int x2, int y2, uint8 color)
|
||||
{
|
||||
int dy;
|
||||
int dx;
|
||||
int stepx;
|
||||
int stepy;
|
||||
int frac;
|
||||
|
||||
dy = (y2 - y) * 2;
|
||||
if (dy < 0) {
|
||||
dy = -dy;
|
||||
stepy = -1;
|
||||
} else {
|
||||
stepy = 1;
|
||||
}
|
||||
|
||||
dx = (x2 - x) * 2;
|
||||
if (dx < 0) {
|
||||
dx = -dx;
|
||||
stepx = -1;
|
||||
} else {
|
||||
stepx = 1;
|
||||
}
|
||||
|
||||
this->SetPixel(video, x, y, color);
|
||||
if (dx > dy) {
|
||||
frac = dy - (dx >> 1);
|
||||
while (x != x2) {
|
||||
if (frac >= 0) {
|
||||
y += stepy;
|
||||
frac -= dx;
|
||||
}
|
||||
x += stepx;
|
||||
frac += dy;
|
||||
this->SetPixel(video, x, y, color);
|
||||
}
|
||||
} else {
|
||||
frac = dx - (dy >> 1);
|
||||
while (y != y2) {
|
||||
if (frac >= 0) {
|
||||
x += stepx;
|
||||
frac -= dy;
|
||||
}
|
||||
y += stepy;
|
||||
frac += dx;
|
||||
this->SetPixel(video, x, y, color);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Blitter_32bppBase::CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch)
|
||||
{
|
||||
int direction = (height < 0) ? -1 : 1;
|
||||
|
Reference in New Issue
Block a user