paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-01-04 11:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

+ Patch from Juergen Rathlev to remove use of QWord. Fixes bug #4117

Browse Source 
git-svn-id: trunk@859 -
This commit is contained in:
michael 2005-08-14 11:32:35 +00:00
parent e36bb224ae
commit 3ab45b5b19
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fcl/image/fpreadpng.pp
View File

@ -1,4 +1,5 @@
{
$Id: fpreadpng.pp,v 1.10 2003/10/19 21:09:51 luk Exp $
This file is part of the Free Pascal run time library.
Copyright (c) 2003 by the Free Pascal development team
@ -518,7 +519,7 @@ end;
function TFPReaderPNG.ColorGrayAlpha16 (CD:TColorData) : TFPColor;
var c : word;
begin
c := (CD and qword($FFFF0000)) shr 16;
c := (CD shr 16) and $FFFF;
with result do
begin
red := c;
@ -535,56 +536,59 @@ begin
begin
c := CD and $FF;
red := c + (c shl 8);
c := CD and $FF00;
green := c + (c shr 8);
c := (CD and $FF0000) shr 8;
blue := c + (c shr 8);
CD:=CD shr 8;
c := CD and $FF;
green := c + (c shl 8);
CD:=CD shr 8;
c := CD and $FF;
blue := c + (c shl 8);
alpha := alphaOpaque;
end;
end;
function TFPReaderPNG.ColorColor16 (CD:TColorData) : TFPColor;
var c : qword;
begin
with result do
begin
red := CD and $FFFF;
c := qword($FFFF0000);
green := (CD and c) shr 16;
c := c shl 16;
blue := (CD and c) shr 32;
CD:=CD shr 16;
green := CD and $FFFF;
CD:=CD shr 16;
blue := CD and $FFFF;
alpha := alphaOpaque;
end;
end;
function TFPReaderPNG.ColorColorAlpha8 (CD:TColorData) : TFPColor;
var c : qword;
var c : word;
begin
with result do
begin
c := CD and $FF;
red := c + (c shl 8);
c := CD and $FF00;
green := c + (c shr 8);
c := (CD and $FF0000) shr 8;
blue := c + (c shr 8);
c := (CD and qword($FF000000)) shr 16;
alpha := c + (c shr 8);
CD:=CD shr 8;
c := CD and $FF;
green := c + (c shl 8);
CD:=CD shr 8;
c := CD and $FF;
blue := c + (c shl 8);
CD:=CD shr 8;
c := CD and $FF;
alpha := c + (c shl 8);
end;
end;
function TFPReaderPNG.ColorColorAlpha16 (CD:TColorData) : TFPColor;
var c : qword;
begin
with result do
begin
red := CD and $FFFF;
c := qword($FFFF0000);
green := (CD and c) shr 16;
c := c shl 16;
blue := (CD and c) shr 32;
c := c shl 16;
alpha := (CD and c) shr 48;
CD:=CD shr 16;
green := CD and $FFFF;
CD:=CD shr 16;
blue := CD and $FFFF;
CD:=CD shr 16;
alpha := CD and $FFFF;
end;
end;
@ -830,3 +834,4 @@ end;
initialization
ImageHandlers.RegisterImageReader ('Portable Network Graphics', 'png', TFPReaderPNG);
end.