From bb24820bda3f872dda31c34db226844e8be4d6b3 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Thu, 26 May 2005 06:47:24 +0000
Subject: [PATCH] + Merged revisions 118 119

git-svn-id: branches/fixes_2_0@121 -
---
 fcl/image/fpimage.inc | 15 +++++++++------
 fcl/inc/inifiles.pp   |  3 +++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/fcl/image/fpimage.inc b/fcl/image/fpimage.inc
index ded02d135d..1d3c562c62 100644
--- a/fcl/image/fpimage.inc
+++ b/fcl/image/fpimage.inc
@@ -531,12 +531,15 @@ begin
       end
     else
       begin
-        OldPixels:=PFPIntegerArray(FData);
-        GetMem(FData,FWidth*FHeight*SizeOf(TFPColor));
-        for r:=0 to FHeight-1 do
-          for c:=0 to FWidth-1 do
-            Colors[c,r]:=FPalette.Color[OldPixels^[r*FWidth+c]];
-        FreeMem(OldPixels);
+        if Assigned(FData) then
+          begin
+          OldPixels:=PFPIntegerArray(FData);
+          GetMem(FData,FWidth*FHeight*SizeOf(TFPColor));
+          for r:=0 to FHeight-1 do
+            for c:=0 to FWidth-1 do
+              Colors[c,r]:=FPalette.Color[OldPixels^[r*FWidth+c]];
+          FreeMem(OldPixels);
+          end;
         FPalette.Free;
         FPalette:=nil;
       end;
diff --git a/fcl/inc/inifiles.pp b/fcl/inc/inifiles.pp
index c3b47d06c2..f6c96f2d0a 100644
--- a/fcl/inc/inifiles.pp
+++ b/fcl/inc/inifiles.pp
@@ -534,6 +534,9 @@ begin
            begin
              sIdent:=Trim(Copy(sLine, 1,  j - 1));
              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;
         oSection.KeyList.Add(TIniFileKey.Create(sIdent, sValue));