...

diff --git a/ChangeLog b/ChangeLog
index 1ea4bc3dd1759e709585301629a08e50a840b30e..a5658897dac4253fccc2170fc8818a543cbb0e12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2018-07-06  7.0.8-6 Cristy  <quetzlzacatenango@image...>
   * Improve SVG support for tspan element.
+  * Add support for -fx image.extent.
 
 2018-07-04  7.0.8-5 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.8-5, GIT revision 14514:bba545bbb:20180704.

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 8a5990a55246ef23cc633593a1ff2da5deaf0326..491c78121fe01d0729f34beed601c11d7c39332c 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -1607,6 +1607,17 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel,
         return(FxChannelStatistics(fx_info,image,channel,symbol,exception));
       break;
     }
+    case 'E':
+    case 'e':
+    {
+      if (LocaleCompare(symbol,"extent") == 0)
+        {
+          if (image->extent != 0)
+            return(image->extent);
+          return(GetBlobSize(image));
+        }
+      break;
+    }
     case 'G':
     case 'g':
     {
@@ -1661,13 +1672,6 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel,
           (LocaleCompare(symbol,"image.skewness") == 0) ||
           (LocaleCompare(symbol,"image.standard_deviation") == 0))
         return(FxChannelStatistics(fx_info,image,channel,symbol+6,exception));
-      if (LocaleCompare(symbol,"image.extent") == 0)
-        {
-          if (image->extent != 0)
-            return(image->extent);
-          else
-            return(GetBlobSize(fx_info->images));
-        }
       if (LocaleCompare(symbol,"image.resolution.x") == 0)
         return(image->resolution.x);
       if (LocaleCompare(symbol,"image.resolution.y") == 0)