+ Merged revisions 118 119

git-svn-id: branches/fixes_2_0@121 -

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;

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));