3398fe88f4
both gcc3 and 4 agree
19 lines
1.0 KiB
Plaintext
19 lines
1.0 KiB
Plaintext
$OpenBSD: patch-FeLib_Source_bitmap_cpp,v 1.2 2010/05/23 15:58:02 espie Exp $
|
|
--- FeLib/Source/bitmap.cpp.orig Tue Oct 26 21:35:47 2004
|
|
+++ FeLib/Source/bitmap.cpp Sat May 22 07:28:38 2010
|
|
@@ -2047,10 +2047,10 @@ void cachedfont::PrintCharacter(const blitdata B) cons
|
|
|
|
for(; SrcLine != EndLine; ++SrcLine, ++SrcMaskLine, ++DestLine)
|
|
{
|
|
- const ulong* FontPtr = reinterpret_cast<const ulong*>(*SrcLine + B.Src.X);
|
|
- const ulong* EndPtr = FontPtr + 5;
|
|
- const ulong* MaskPtr = reinterpret_cast<const ulong*>(*SrcMaskLine + B.Src.X);
|
|
- ulong* DestPtr = reinterpret_cast<ulong*>(*DestLine + B.Dest.X);
|
|
+ const uint32_t* FontPtr = reinterpret_cast<const uint32_t*>(*SrcLine + B.Src.X);
|
|
+ const uint32_t* EndPtr = FontPtr + 5;
|
|
+ const uint32_t* MaskPtr = reinterpret_cast<const uint32_t*>(*SrcMaskLine + B.Src.X);
|
|
+ uint32_t* DestPtr = reinterpret_cast<uint32_t*>(*DestLine + B.Dest.X);
|
|
|
|
for(; FontPtr != EndPtr; ++DestPtr, ++MaskPtr, ++FontPtr)
|
|
*DestPtr = *DestPtr & *MaskPtr | *FontPtr;
|