]> granicus.if.org Git - imagemagick/commitdiff
Use the width and height of the extract area when no size is specified.
authorDirk Lemstra <dirk@git.imagemagick.org>
Sat, 1 Sep 2018 17:25:49 +0000 (19:25 +0200)
committerDirk Lemstra <dirk@git.imagemagick.org>
Sat, 1 Sep 2018 17:25:49 +0000 (19:25 +0200)
coders/gradient.c
coders/xc.c

index 7753bb97979a29b7c0aa759999d89799bb6a6fa1..04c7792e909b52f6547982dba257ca08bfaad3f4 100644 (file)
@@ -124,6 +124,21 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception)
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
   image=AcquireImage(image_info,exception);
+  if ((image_info->extract != (char *) NULL) &&
+      (image->columns == 0) && (image->rows == 0))
+    {
+      RectangleInfo
+        geometry;
+
+      int
+        flags;
+
+      flags=ParseAbsoluteGeometry(image_info->extract,&geometry);
+      if ((flags & WidthValue) != 0)
+        image->columns=geometry.width;
+      if ((flags & HeightValue) != 0)
+        image->rows=geometry.height;
+    }
   if (image->columns == 0)
     image->columns=1;
   if (image->rows == 0)
index 21c26920bf37001b6da87141bcdf309ea16c641a..441a852cccacb14eeb4979fe577bb5d521483ea1 100644 (file)
@@ -120,6 +120,21 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception)
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
   image=AcquireImage(image_info,exception);
+  if ((image_info->extract != (char *) NULL) &&
+      (image->columns == 0) && (image->rows == 0))
+    {
+      RectangleInfo
+        geometry;
+
+      int
+        flags;
+
+      flags=ParseAbsoluteGeometry(image_info->extract,&geometry);
+      if ((flags & WidthValue) != 0)
+        image->columns=geometry.width;
+      if ((flags & HeightValue) != 0)
+        image->rows=geometry.height;
+    }
   if (image->columns == 0)
     image->columns=1;
   if (image->rows == 0)