paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-29 12:30:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

carbon: fix brush hatch pattern drawin for powerpc (bug #16373), patch by Jonas Maebe

Browse Source 
git-svn-id: trunk@25241 -
This commit is contained in:
dmitry 2010-05-07 14:45:58 +00:00
parent 9fec99f41d
commit 74e4aaeec6
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lcl/interfaces/carbon/carbongdiobjects.pp
View File

@ -1479,25 +1479,9 @@ begin
AImage); AImage);
end; end;
procedure DrawMaskPattern(info: UnivPtr; c: CGContextRef); MWPascal;
var
ABrush: TCarbonBrush absolute info;
AImage: CGImageRef;
RGBA: array[0..3] of Single;
ARect: CGRect;
begin
AImage := ABrush.FBitmap.CGImage;
ARect := GetCGRect(0, 0, CGImageGetWidth(AImage), CGImageGetHeight(AImage));
CGContextClipToMask(c, ARect, AImage);
ABrush.GetRGBA(R2_COPYPEN, RGBA[0], RGBA[1], RGBA[2], RGBA[3]);
CGContextSetRGBFillColor(c, RGBA[0], RGBA[1], RGBA[2], RGBA[3]);
CGContextFillRect(c, ARect);
end;
procedure TCarbonBrush.SetHatchStyle(AHatch: PtrInt); procedure TCarbonBrush.SetHatchStyle(AHatch: PtrInt);
const const
HATCH_DATA: array[HS_HORIZONTAL..HS_DIAGCROSS] of array[0..7] of Word = HATCH_DATA: array[HS_HORIZONTAL..HS_DIAGCROSS] of array[0..7] of Byte =
( (
{ HS_HORIZONTAL } ($FF, $FF, $FF, $00, $FF, $FF, $FF, $FF), { HS_HORIZONTAL } ($FF, $FF, $FF, $00, $FF, $FF, $FF, $FF),
{ HS_VERTICAL } ($F7, $F7, $F7, $F7, $F7, $F7, $F7, $F7), { HS_VERTICAL } ($F7, $F7, $F7, $F7, $F7, $F7, $F7, $F7),
@ -1512,8 +1496,8 @@ begin
if AHatch in [HS_HORIZONTAL..HS_DIAGCROSS] then if AHatch in [HS_HORIZONTAL..HS_DIAGCROSS] then
begin begin
FillChar(ACallBacks, SizeOf(ACallBacks), 0); FillChar(ACallBacks, SizeOf(ACallBacks), 0);
ACallBacks.drawPattern := @DrawMaskPattern; ACallBacks.drawPattern := @DrawBitmapPattern;
FBitmap := TCarbonBitmap.Create(8, 8, 1, 1, cbaWord, cbtMask, @HATCH_DATA[AHatch]); FBitmap := TCarbonBitmap.Create(8, 8, 1, 1, cbaByte, cbtMask, @HATCH_DATA[AHatch]);
FColored := False; FColored := False;
FCGPattern := CGPatternCreate(Self, GetCGRect(0, 0, 8, 8), FCGPattern := CGPatternCreate(Self, GetCGRect(0, 0, 8, 8),
CGAffineTransformIdentity, 8, 8, kCGPatternTilingConstantSpacing, CGAffineTransformIdentity, 8, 8, kCGPatternTilingConstantSpacing,