--- oup/current/Global/OniImgClass.pas	2007/05/27 20:03:41	204
+++ oup/current/Global/OniImgClass.pas	2007/08/17 21:09:51	244
@@ -413,9 +413,9 @@ begin
     link := link div 256;
     images[i] := TOniImage.Create;
     images[i].LoadFromTXMP(ConnectionID, link);
-    SetLength(FImages, 1);
-    NewImage(width, height, ifA1R5G5B5, FImages[0]);
   end;
+  SetLength(FImages, 1);
+  NewImage(width, height, images[0].Format {ifA1R5G5B5}, FImages[0]);
   for y := 0 to rows - 1 do
   begin
     for x := 0 to cols - 1 do
@@ -425,12 +425,12 @@ begin
       y_start := 0;
       for i := 0 to x do
         if i < x then
-          x_start := x_start + images[i].Image[0].Width;
+          x_start := x_start + images[i].Image[1].Width;
       for i := 0 to y do
         if i < y then
-          y_start := y_start + images[i].Image[0].Height;
-      CopyRect(images[imgid].Image[0], 0, 0, images[imgid].Image[0].Width,
-          images[imgid].Image[0].Height, FImages[0], x_start, y_start);
+          y_start := y_start + images[i].Image[1].Height; 
+      CopyRect(images[imgid].Image[1], 0, 0, images[imgid].Image[1].Width,
+          images[imgid].Image[1].Height, FImages[0], x_start, y_start);
     end;
   end;
   for i := 0 to linkcount - 1 do