(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 9ca0e17634a7c5d2d027c99fd6e2c05076efe3c7..cafb1dff932068e63665f8099f6a53b6329ab4ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2010-06-22  6.6.2-8 Cristy  <quetzlzacatenango@image...>
   * Skip byte when DDS bitcount is 32 (reference
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16487).
+  * Montage now uses final background setting (e.g. montage -background none ...
+    -background lightblue show:).
 
 2010-06-17  6.6.2-7 Cristy  <quetzlzacatenango@image...>
   * Support new label:pointsize property.

diff --git a/magick/montage.c b/magick/montage.c
index 7b5f8ca6da223e2977e7e22065133391de34b51a..f6c0a33ed9f798cd98d556a5949f5c4413b305ce 100644 (file)
--- a/magick/montage.c
+++ b/magick/montage.c
@@ -579,6 +579,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
   */
   tile_image=AcquireImage(NULL);
   montage=AcquireImage(clone_info);
+  montage->background_color=montage_info->background_color;
   montage->scene=0;
   images_per_page=(number_images-1)/(tiles_per_row*tiles_per_column)+1;
   tiles=0;
@@ -881,6 +882,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
             return((Image *) NULL);
           }
         montage=GetNextImageInList(montage);
+        montage->background_color=montage_info->background_color;
         image_list+=tiles_per_page;
         number_images-=tiles_per_page;
       }
@@ -891,7 +893,5 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
   master_list=(Image **) RelinquishMagickMemory(master_list);
   draw_info=DestroyDrawInfo(draw_info);
   clone_info=DestroyImageInfo(clone_info);
-  while (GetPreviousImageInList(montage) != (Image *) NULL)
-    montage=GetPreviousImageInList(montage);
-  return(montage);
+  return(GetFirstImageInList(montage));
 }