paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-05 13:00:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

carbon: reverting bitmap changes

Browse Source 
git-svn-id: trunk@26362 -
This commit is contained in:
dmitry 2010-06-30 18:53:04 +00:00
parent 30bc04f322
commit 092b33065c
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,9 +409,9 @@ const
BITMAPINFOMAP: array[TCarbonBitmapType] of CGBitmapInfo = (
{cbtMask} kCGImageAlphaNone,
{cbtGray} kCGImageAlphaNone,
{cbtRGB} kCGImageAlphaNoneSkipFirst or kCGBitmapByteOrder32Little,
{cbtARGB} kCGImageAlphaFirst or kCGBitmapByteOrder32Little,
{cbtRGBA} kCGImageAlphaLast or kCGBitmapByteOrder32Little,
{cbtRGB} kCGImageAlphaNoneSkipFirst,
{cbtARGB} kCGImageAlphaFirst,
{cbtRGBA} kCGImageAlphaLast,
{cbtBGR} kCGImageAlphaNoneSkipFirst or kCGBitmapByteOrder32Little,
{cbtBGRA} kCGImageAlphaFirst or kCGBitmapByteOrder32Little
);

10
lcl/interfaces/carbon/carbonobject.inc
View File

@ -655,10 +655,8 @@ begin
//ADesc.PaletteColorCount := 0;
//ADesc.BitOrder := riboReversedBits;
//ADesc.ByteOrder := riboMSBFirst;
ADesc.BitOrder := riboBitsInOrder;
ADesc.ByteOrder := riboLSBFirst;
ADesc.BitOrder := riboReversedBits;
ADesc.ByteOrder := riboMSBFirst;
BPR := CGImageGetBytesPerRow(ABitmap.CGImage) and $FF;
if BPR and $F = 0 then ADesc.LineEnd := rileDQWordBoundary // 128bit aligned
@ -689,7 +687,7 @@ begin
if ADesc.Format = ricfGray then Exit;
// alpha
case AlphaInfo and kCGBitmapAlphaInfoMask of
case AlphaInfo of
kCGImageAlphaNone,
kCGImageAlphaNoneSkipLast,
kCGImageAlphaNoneSkipFirst: begin
@ -701,7 +699,7 @@ begin
ADesc.AlphaPrec := Prec;
end;
case AlphaInfo and kCGBitmapAlphaInfoMask of
case AlphaInfo of
kCGImageAlphaNone,
kCGImageAlphaNoneSkipLast: begin
// RGBx

8
lcl/interfaces/carbon/carbonproc.pp
View File

@ -599,10 +599,8 @@ begin
// Width and Height skipped
Desc.PaletteColorCount := 0;
//Desc.BitOrder := riboReversedBits;
//Desc.ByteOrder := riboMSBFirst;
Desc.BitOrder := riboBitsInOrder;
Desc.ByteOrder := riboLSBFirst;
Desc.BitOrder := riboReversedBits;
Desc.ByteOrder := riboMSBFirst;
Desc.LineEnd := rileDQWordBoundary; // 128bit aligned
Desc.LineOrder := riloTopToBottom;
@ -620,7 +618,7 @@ begin
Desc.GreenShift := 08;
Desc.BlueShift := 00;
Desc.MaskBitOrder := riboBitsInOrder;
Desc.MaskBitOrder := riboReversedBits;
Desc.MaskBitsPerPixel := 1;
Desc.MaskLineEnd := rileByteBoundary;
Desc.MaskShift := 0;