Changeset 11611

Timestamp:

07/10/08 16:23:13 (7 weeks ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/magick/fx.c (modified) (8 diffs)

ImageMagick/trunk/magick/fx.c

@@ -1001 +1001 @@
 {
   char
+    key[MaxTextExtent],
     *q,
     subexpression[MaxTextExtent],
+    statistic[MaxTextExtent],
     symbol[MaxTextExtent];
 
@@ -1078 +1080 @@
             p++;
         }
-      if (*p == 'p')
+      if ((isalpha((int) *(p+1)) == 0) && (*p == 'p'))
         {
           p++;
@@ -1245 +1247 @@
       break;
     }
+    case 'D':
+    case 'd':
+    {
+      if (LocaleCompare(symbol,"depth") == 0)
+        {
+          unsigned long
+            depth;
+
+          (void) FormatMagickString(key,MaxTextExtent,"%s.%p.%ld",symbol,image,
+            (long) channel);
+          value=(const char *) GetValueFromSplayTree(fx_info->symbols,key);
+          if (value != (const char *) NULL)
+            return(QuantumScale*atof(value));
+          (void) DeleteNodeFromSplayTree(fx_info->symbols,key);
+          depth=GetImageChannelDepth(image,channel,exception);
+          (void) FormatMagickString(statistic,MaxTextExtent,"%lu",depth);
+          (void) AddValueToSplayTree(fx_info->symbols,ConstantString(key),
+            ConstantString(statistic));
+          return(QuantumScale*atof(statistic));
+        }
+      break;
+    }
     case 'G':
     case 'g':
@@ -1295 +1319 @@
           (LocaleCompare(symbol,"image.standard_deviation") == 0))
         {
-          char
-            key[MaxTextExtent],
-            statistic[MaxTextExtent];
-
+          /*
+            Deprecated.
+          */
           (void) FormatMagickString(key,MaxTextExtent,"%s.%p.%ld",symbol,image,
             (long) channel);
@@ -1346 +1369 @@
           return(QuantumScale*atof(statistic));
         }
-      if (LocaleCompare(symbol,"image.page.height") == 0)
-        return(image->page.height);
-      if (LocaleCompare(symbol,"image.page.width") == 0)
-        return(image->page.width);
-      if (LocaleCompare(symbol,"image.page.x") == 0)
-        return(image->page.x);
-      if (LocaleCompare(symbol,"image.page.y") == 0)
-        return(image->page.y);
       if (LocaleCompare(symbol,"image.resolution.x") == 0)
         return(image->x_resolution);
@@ -1398 +1413 @@
     case 'm':
     {
+      if (LocaleCompare(symbol,"maxima") == 0)
+        {
+          double
+            maxima,
+            minima;
+
+          (void) FormatMagickString(key,MaxTextExtent,"%s.%p.%ld",symbol,image,
+            (long) channel);
+          value=(const char *) GetValueFromSplayTree(fx_info->symbols,key);
+          if (value != (const char *) NULL)
+            return(QuantumScale*atof(value));
+          (void) DeleteNodeFromSplayTree(fx_info->symbols,key);
+          (void) GetImageChannelRange(image,channel,&minima,&maxima,exception);
+          (void) FormatMagickString(statistic,MaxTextExtent,"%g",maxima);
+          (void) AddValueToSplayTree(fx_info->symbols,ConstantString(key),
+            ConstantString(statistic));
+          return(QuantumScale*atof(statistic));
+        }
+      if (LocaleCompare(symbol,"mean") == 0)
+        {
+          double
+            mean,
+            standard_deviation;
+
+          (void) FormatMagickString(key,MaxTextExtent,"%s.%p.%ld",symbol,image,
+            (long) channel);
+          value=(const char *) GetValueFromSplayTree(fx_info->symbols,key);
+          if (value != (const char *) NULL)
+            return(QuantumScale*atof(value));
+          (void) DeleteNodeFromSplayTree(fx_info->symbols,key);
+          (void) GetImageChannelMean(image,channel,&mean,&standard_deviation,
+            exception);
+          (void) FormatMagickString(statistic,MaxTextExtent,"%g",mean);
+          (void) AddValueToSplayTree(fx_info->symbols,ConstantString(key),
+            ConstantString(statistic));
+          return(QuantumScale*atof(statistic));
+        }
+      if (LocaleCompare(symbol,"minima") == 0)
+        {
+          double
+            maxima,
+            minima;
+
+          (void) FormatMagickString(key,MaxTextExtent,"%s.%p.%ld",symbol,image,
+            (long) channel);
+          value=(const char *) GetValueFromSplayTree(fx_info->symbols,key);
+          if (value != (const char *) NULL)
+            return(QuantumScale*atof(value));
+          (void) DeleteNodeFromSplayTree(fx_info->symbols,key);
+          (void) GetImageChannelRange(image,channel,&minima,&maxima,exception);
+          (void) FormatMagickString(statistic,MaxTextExtent,"%g",minima);
+          (void) AddValueToSplayTree(fx_info->symbols,ConstantString(key),
+            ConstantString(statistic));
+          return(QuantumScale*atof(statistic));
+        }
       if (LocaleCompare(symbol,"m") == 0)
         return(QuantumScale*pixel.blue);
@@ -1416 +1486 @@
       break;
     }
+    case 'P':
+    case 'p':
+    {
+      if (LocaleCompare(symbol,"page.height") == 0)
+        return((MagickRealType) image->page.height);
+      if (LocaleCompare(symbol,"page.width") == 0)
+        return((MagickRealType) image->page.width);
+      if (LocaleCompare(symbol,"page.x") == 0)
+        return((MagickRealType) image->page.x);
+      if (LocaleCompare(symbol,"page.y") == 0)
+        return((MagickRealType) image->page.y);
+      break;
+    }
     case 'R':
     case 'r':
     {
+      if (LocaleCompare(symbol,"resolution.x") == 0)
+        return(image->x_resolution);
+      if (LocaleCompare(symbol,"resolution.y") == 0)
+        return(image->y_resolution);
       if (LocaleCompare(symbol,"r") == 0)
         return(QuantumScale*pixel.red);
@@ -1436 +1523 @@
             RoundToQuantum(pixel.blue),&hue,&saturation,&lightness);
           return(saturation);
+        }
+      if (LocaleCompare(symbol,"standard_deviation") == 0)
+        {
+          double
+            mean,
+            standard_deviation;
+
+          (void) FormatMagickString(key,MaxTextExtent,"%s.%p.%ld",symbol,image,
+            (long) channel);
+          value=(const char *) GetValueFromSplayTree(fx_info->symbols,key);
+          if (value != (const char *) NULL)
+            return(QuantumScale*atof(value));
+          (void) DeleteNodeFromSplayTree(fx_info->symbols,key);
+          (void) GetImageChannelMean(image,channel,&mean,&standard_deviation,
+            exception);
+          (void) FormatMagickString(statistic,MaxTextExtent,"%g",
+            standard_deviation);
+          (void) AddValueToSplayTree(fx_info->symbols,ConstantString(key),
+            ConstantString(statistic));
+          return(QuantumScale*atof(statistic));
         }
       break;