From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 15 Oct 2015 17:17:33 +0000 (-0400)
Subject: Only draw vertical gradient if gradient:vector is not specified
X-Git-Tag: 7.0.1-0~561
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f11a391a1d0ded2b4af92311fca972977661a88;p=imagemagick

Only draw vertical gradient if gradient:vector is not specified
---

diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index f72be325b..d370fb783 100644
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -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");