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

* Fixed warnings.

Browse Source 
* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29859 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-04-02 08:18:29 +00:00
parent c79e9de0f6
commit 65e2393c21
1 changed files with 109 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/drawing/Painter/Painter.cpp
+16 -15
View File
@@ -459,8 +459,9 @@ Painter::StraightLine(BPoint a, BPoint b, const rgb_color& c) const
} while (fBaseRenderer.next_clip_box()); } while (fBaseRenderer.next_clip_box());
return true; return true;
}
} else if (a.y == b.y) { if (a.y == b.y) {
// horizontal // horizontal
int32 y = (int32)a.y; int32 y = (int32)a.y;
uint8* dst = fBuffer.row_ptr(y); uint8* dst = fBuffer.row_ptr(y);
@@ -949,8 +950,8 @@ Painter::FillRectVerticalGradient(BRect r,
int32 gradientArraySize = r.IntegerHeight() + 1; int32 gradientArraySize = r.IntegerHeight() + 1;
uint32 gradientArray[gradientArraySize]; uint32 gradientArray[gradientArraySize];
int32 gradientTop = gradient.Start().y; int32 gradientTop = (int32)gradient.Start().y;
int32 gradientBottom = gradient.End().y; int32 gradientBottom = (int32)gradient.End().y;
int32 colorCount = gradientBottom - gradientTop + 1; int32 colorCount = gradientBottom - gradientTop + 1;
if (colorCount < 0) { if (colorCount < 0) {
// Gradient is upside down. That's currently not supported by this // Gradient is upside down. That's currently not supported by this
@@ -1981,9 +1982,9 @@ Painter::_DrawBitmapNearestNeighborCopy32(agg::rendering_buffer& srcBuffer,
// Do not calculate more filter weights than necessary and also // Do not calculate more filter weights than necessary and also
// keep the stack based allocations reasonably sized // keep the stack based allocations reasonably sized
if (fClippingRegion->Frame().IntegerWidth() + 1 < dstWidth) if (fClippingRegion->Frame().IntegerWidth() + 1 < (int32)dstWidth)
dstWidth = fClippingRegion->Frame().IntegerWidth() + 1; dstWidth = fClippingRegion->Frame().IntegerWidth() + 1;
if (fClippingRegion->Frame().IntegerHeight() + 1 < dstHeight) if (fClippingRegion->Frame().IntegerHeight() + 1 < (int32)dstHeight)
dstHeight = fClippingRegion->Frame().IntegerHeight() + 1; dstHeight = fClippingRegion->Frame().IntegerHeight() + 1;
// When calculating less filter weights than specified by viewRect, // When calculating less filter weights than specified by viewRect,
@@ -1991,12 +1992,12 @@ Painter::_DrawBitmapNearestNeighborCopy32(agg::rendering_buffer& srcBuffer,
uint32 filterWeightXIndexOffset = 0; uint32 filterWeightXIndexOffset = 0;
uint32 filterWeightYIndexOffset = 0; uint32 filterWeightYIndexOffset = 0;
if (fClippingRegion->Frame().left > viewRect.left) { if (fClippingRegion->Frame().left > viewRect.left) {
filterWeightXIndexOffset = fClippingRegion->Frame().left filterWeightXIndexOffset = (int32)(fClippingRegion->Frame().left
- viewRect.left; - viewRect.left);
} }
if (fClippingRegion->Frame().top > viewRect.top) { if (fClippingRegion->Frame().top > viewRect.top) {
filterWeightYIndexOffset = fClippingRegion->Frame().top filterWeightYIndexOffset = (int32)(fClippingRegion->Frame().top
- viewRect.top; - viewRect.top);
} }
// should not pose a problem with stack overflows // should not pose a problem with stack overflows
@@ -2102,9 +2103,9 @@ Painter::_DrawBitmapBilinearCopy32(agg::rendering_buffer& srcBuffer,
// Do not calculate more filter weights than necessary and also // Do not calculate more filter weights than necessary and also
// keep the stack based allocations reasonably sized // keep the stack based allocations reasonably sized
if (fClippingRegion->Frame().IntegerWidth() + 1 < dstWidth) if (fClippingRegion->Frame().IntegerWidth() + 1 < (int32)dstWidth)
dstWidth = fClippingRegion->Frame().IntegerWidth() + 1; dstWidth = fClippingRegion->Frame().IntegerWidth() + 1;
if (fClippingRegion->Frame().IntegerHeight() + 1 < dstHeight) if (fClippingRegion->Frame().IntegerHeight() + 1 < (int32)dstHeight)
dstHeight = fClippingRegion->Frame().IntegerHeight() + 1; dstHeight = fClippingRegion->Frame().IntegerHeight() + 1;
// When calculating less filter weights than specified by viewRect, // When calculating less filter weights than specified by viewRect,
@@ -2112,12 +2113,12 @@ Painter::_DrawBitmapBilinearCopy32(agg::rendering_buffer& srcBuffer,
uint32 filterWeightXIndexOffset = 0; uint32 filterWeightXIndexOffset = 0;
uint32 filterWeightYIndexOffset = 0; uint32 filterWeightYIndexOffset = 0;
if (fClippingRegion->Frame().left > viewRect.left) { if (fClippingRegion->Frame().left > viewRect.left) {
filterWeightXIndexOffset = fClippingRegion->Frame().left filterWeightXIndexOffset = (int32)(fClippingRegion->Frame().left
- viewRect.left; - viewRect.left);
} }
if (fClippingRegion->Frame().top > viewRect.top) { if (fClippingRegion->Frame().top > viewRect.top) {
filterWeightYIndexOffset = fClippingRegion->Frame().top filterWeightYIndexOffset = (int32)(fClippingRegion->Frame().top
- viewRect.top; - viewRect.top);
} }
struct FilterInfo { struct FilterInfo {