+ Added .assign method

fcl/image/fpimage.inc

@@ -294,3 +294,38 @@ begin
 end;
 
 
+Procedure TFPCustomImage.Assign(Source: TPersistent);
+
+Var
+  Src : TFPCustomImage;
+  X,Y : Integer;
+
+begin
+  If Source is TFPCustomImage then
+    begin
+    Src:=TFPCustomImage(Source);
+    // Copy extra info
+    FExtra.Assign(Src.Fextra);
+    // Copy palette if needed.
+    UsePalette:=Src.UsePalette;
+    If UsePalette then
+      begin
+      Palette.Count:=0;
+      Palette.Build(Src);
+      end;
+    // Copy image.  
+    SetSize(Src.Width,Src.height);
+    If UsePalette then
+      For x:=0 to Src.Width-1 do
+        For y:=0 to src.Height-1 do
+          pixels[X,Y]:=src.pixels[X,Y]
+    else  
+      For x:=0 to Src.Width-1 do
+        For y:=0 to src.Height-1 do
+          self[X,Y]:=src[X,Y];
+    end
+  else  
+    Inherited Assign(Source);
+end;
+
+    

fcl/image/fpimage.pp

@@ -72,7 +72,7 @@ type
       property Count : integer read GetCount write SetCount;
   end;
 
-  TFPCustomImage = class
+  TFPCustomImage = class(TPersistent)
     private
       FOnProgress : TFPImgProgressEvent;
       FExtra : TStringlist;
@@ -106,6 +106,7 @@ type
     public
       constructor create (AWidth,AHeight:integer); virtual;
       destructor destroy; override;
+      procedure Assign(Source: TPersistent); override;
       // Saving and loading
       procedure LoadFromStream (Str:TStream; Handler:TFPCustomImageReader);
       procedure LoadFromFile (const filename:String; Handler:TFPCustomImageReader);

fcl/image/fpwritexpm.pp

@@ -32,8 +32,10 @@ function ColorToHex (c:TFPColor; size:integer) : string;
 var fmt : string;
     l : integer;
 begin
+{
   with c do
     write ('color=',red,',',green,',',blue,',',alpha);
+}
   l := size div 3;
   fmt := inttostr(l);
   fmt := '%'+fmt+'.'+fmt+'x';
@@ -88,7 +90,7 @@ begin
     for r := 0 to c-1 do
       begin
       if img.palette[r] <> colTransparent then
-        l.Add (format('"%s c #%s",',[p[r],ColorToHex(img.palette.color[r],12)]))
+        l.Add (format('"%s c #%s",',[p[r],ColorToHex(img.palette.color[r],6)]))
       else
         l.Add (format('"%s c None",',[p[r]]));
       end;