commit 33e9da6ee222c000535f02c299c1ae7cbee529bd
author cristy <urban-warrior@git.imagemagick.org> Fri Oct 21 19:08:58 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Fri Oct 21 19:08:58 2011 +0000
tree 23fc922e45175872339868fcc6cb561a753814cc
parent 5201002e1ba0118594060d26142b48bdfb1320a2

coders/msl.c

diff --git a/coders/msl.c b/coders/msl.c
index 2c10ce1..c5baf69 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -1698,7 +1698,8 @@
                       if ((flags & HeightValue) == 0)
                         geometry.height=geometry.width;
                       (void) GetOneVirtualMagickPixel(msl_info->image[n],
-                        geometry.x,geometry.y,&target,&exception);
+                        TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+                        &exception);
                       break;
                     }
                   ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -1712,7 +1713,8 @@
                     {
                       geometry.x=StringToLong(value);
                       (void) GetOneVirtualMagickPixel(msl_info->image[n],
-                        geometry.x,geometry.y,&target,&exception);
+                        TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+                        &exception);
                       break;
                     }
                   ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -1726,7 +1728,8 @@
                     {
                       geometry.y=StringToLong(value);
                       (void) GetOneVirtualMagickPixel(msl_info->image[n],
-                        geometry.x,geometry.y,&target,&exception);
+                        TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+                        &exception);
                       break;
                     }
                   ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3730,7 +3733,8 @@
                       if ((flags & HeightValue) == 0)
                         geometry.height=geometry.width;
                       (void) GetOneVirtualMagickPixel(msl_info->image[n],
-                        geometry.x,geometry.y,&target,&exception);
+                        TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+                        &exception);
                       break;
                     }
                   ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3756,7 +3760,8 @@
                     {
                       geometry.x=StringToLong(value);
                       (void) GetOneVirtualMagickPixel(msl_info->image[n],
-                        geometry.x,geometry.y,&target,&exception);
+                        TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+                        &exception);
                       break;
                     }
                   ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3770,7 +3775,8 @@
                     {
                       geometry.y=StringToLong(value);
                       (void) GetOneVirtualMagickPixel(msl_info->image[n],
-                        geometry.x,geometry.y,&target,&exception);
+                        TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+                        &exception);
                       break;
                     }
                   ThrowMSLException(OptionError,"UnrecognizedAttribute",

coders/svg.c

diff --git a/coders/svg.c b/coders/svg.c
index ddaaca4..17adda7 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2910,6 +2910,7 @@
 #else
           p=gdk_pixbuf_get_pixels(pixel_info);
 #endif
+          GetPixelInfo(image,&fill_color);
           for (y=0; y < (ssize_t) image->rows; y++)
           {
             q=GetAuthenticPixels(image,0,y,image->columns,1,exception);