paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-02 06:22:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Merged revisions 118 119

Browse Source 
git-svn-id: branches/fixes_2_0@121 -
This commit is contained in:
michael 2005-05-26 06:47:24 +00:00
parent 1cfc23e1ac
commit bb24820bda
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fcl/image/fpimage.inc
View File

@ -531,12 +531,15 @@ begin
end end
else else
begin begin
OldPixels:=PFPIntegerArray(FData); if Assigned(FData) then
GetMem(FData,FWidth*FHeight*SizeOf(TFPColor)); begin
for r:=0 to FHeight-1 do OldPixels:=PFPIntegerArray(FData);
for c:=0 to FWidth-1 do GetMem(FData,FWidth*FHeight*SizeOf(TFPColor));
Colors[c,r]:=FPalette.Color[OldPixels^[r*FWidth+c]]; for r:=0 to FHeight-1 do
FreeMem(OldPixels); for c:=0 to FWidth-1 do
Colors[c,r]:=FPalette.Color[OldPixels^[r*FWidth+c]];
FreeMem(OldPixels);
end;
FPalette.Free; FPalette.Free;
FPalette:=nil; FPalette:=nil;
end; end;

3
fcl/inc/inifiles.pp
View File

@ -534,6 +534,9 @@ begin
begin begin
sIdent:=Trim(Copy(sLine, 1, j - 1)); sIdent:=Trim(Copy(sLine, 1, j - 1));
sValue:=Trim(Copy(sLine, j + 1, Length(sLine) - j)); sValue:=Trim(Copy(sLine, j + 1, Length(sLine) - j));
J:=Length(sValue);
If (J>0) and (sValue[1]='"') and (sValue[J]='"') then
sValue:=Copy(sValue,2,J-2);
end; end;
end; end;
oSection.KeyList.Add(TIniFileKey.Create(sIdent, sValue)); oSection.KeyList.Add(TIniFileKey.Create(sIdent, sValue));