]> granicus.if.org Git - imagemagick/commitdiff
Only draw vertical gradient if gradient:vector is not specified
authorCristy <urban-warrior@imagemagick.org>
Thu, 15 Oct 2015 17:17:33 +0000 (13:17 -0400)
committerCristy <urban-warrior@imagemagick.org>
Thu, 15 Oct 2015 17:17:33 +0000 (13:17 -0400)
MagickCore/paint.c

index f72be325b08cacbe68f594fb7bd811e0ced65494..d370fb78305637694dbeddb20cec011b54d11429 100644 (file)
@@ -449,8 +449,6 @@ MagickExport MagickBooleanType GradientImage(Image *image,
     (void) ParseAbsoluteGeometry(artifact,&gradient->bounding_box);
   gradient->gradient_vector.x2=(double) image->columns-1.0;
   gradient->gradient_vector.y2=(double) image->rows-1.0;
-  if ((type == LinearGradient) && (gradient->gradient_vector.y2 != 0.0))
-    gradient->gradient_vector.x2=0.0;
   artifact=GetImageArtifact(image,"gradient:vector");
   if (artifact != (const char *) NULL)
     {
@@ -463,6 +461,9 @@ MagickExport MagickBooleanType GradientImage(Image *image,
       if ((flags & PsiValue) != 0)
         gradient->gradient_vector.y2=geometry_info.psi;
     }
+  else
+    if ((type == LinearGradient) && (gradient->gradient_vector.y2 != 0.0))
+      gradient->gradient_vector.x2=0.0;
   gradient->center.x=(double) gradient->gradient_vector.x2/2.0;
   gradient->center.y=(double) gradient->gradient_vector.y2/2.0;
   artifact=GetImageArtifact(image,"gradient:center");