From 9977d172f0ea3227abb59637f365b3ba465eb117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sun, 15 Jun 2008 10:41:54 +0000 Subject: [PATCH] Keep the last changes more in the style of the rest of the file. (Nice catch, btw, Michael!) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25961 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/drawing/Painter/Painter.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/servers/app/drawing/Painter/Painter.cpp b/src/servers/app/drawing/Painter/Painter.cpp index 392e8db52e..b3c1361d54 100644 --- a/src/servers/app/drawing/Painter/Painter.cpp +++ b/src/servers/app/drawing/Painter/Painter.cpp @@ -1269,24 +1269,24 @@ copy_bitmap_row_bgr32_alpha(uint8* dst, const uint8* src, int32 numPixels, template void -Painter::_TransparentMagicToAlpha(sourcePixel *buffer, uint32 width, +Painter::_TransparentMagicToAlpha(sourcePixel* buffer, uint32 width, uint32 height, uint32 sourceBytesPerRow, sourcePixel transparentMagic, - BBitmap *output) const + BBitmap* output) const { - sourcePixel *sourceRow = buffer; - uint32 *destRow = (uint32 *)output->Bits(); + uint8* sourceRow = (uint8*)buffer; + uint8* destRow = (uint8*)output->Bits(); uint32 destBytesPerRow = output->BytesPerRow(); for (uint32 y = 0; y < height; y++) { - sourcePixel *pixel = sourceRow; - uint32 *destPixel = destRow; + sourcePixel* pixel = (sourcePixel*)sourceRow; + uint32* destPixel = (uint32*)destRow; for (uint32 x = 0; x < width; x++, pixel++, destPixel++) { if (*pixel == transparentMagic) *destPixel &= 0x00ffffff; } - (char *)sourceRow += sourceBytesPerRow; - (char *)destRow += destBytesPerRow; + sourceRow += sourceBytesPerRow; + destRow += destBytesPerRow; } }