]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Sun, 15 Jun 2014 17:05:35 +0000 (17:05 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Sun, 15 Jun 2014 17:05:35 +0000 (17:05 +0000)
MagickCore/option.c
MagickCore/statistic.c
MagickCore/statistic.h

index f517add2cf68649cd201385b9d178d60c53dccda..a1412d0626da3102673d008ec45e8d046b005713 100644 (file)
@@ -1042,8 +1042,6 @@ static const OptionInfo
     { "PoissonNoise", PoissonNoiseEvaluateOperator, UndefinedOptionFlag, MagickFalse },
     { "Pow", PowEvaluateOperator, UndefinedOptionFlag, MagickFalse },
     { "RightShift", RightShiftEvaluateOperator, UndefinedOptionFlag, MagickFalse },
-    { "RMS", RootMeanSquareEvaluateOperator, UndefinedOptionFlag, MagickFalse },
-    { "RootMeanSquare", RootMeanSquareEvaluateOperator, UndefinedOptionFlag, MagickFalse },
     { "Set", SetEvaluateOperator, UndefinedOptionFlag, MagickFalse },
     { "Sin", SineEvaluateOperator, UndefinedOptionFlag, MagickFalse },
     { "Sine", SineEvaluateOperator, UndefinedOptionFlag, MagickFalse },
index 80d239061f83017145106029dbb958d1ded8e5e8..f26e70cce71b800198d51695d69c1046f69a2e33 100644 (file)
@@ -369,11 +369,6 @@ static double ApplyEvaluateOperator(RandomInfo *random_info,const Quantum pixel,
       result=(double) ((size_t) pixel >> (size_t) (value+0.5));
       break;
     }
-    case RootMeanSquareEvaluateOperator:
-    {
-      result=(double) (pixel*pixel+value);
-      break;
-    }
     case SetEvaluateOperator:
     {
       result=value;
@@ -704,13 +699,6 @@ MagickExport Image *EvaluateImages(const Image *images,
               }
               break;
             }
-            case RootMeanSquareEvaluateOperator:
-            {
-              for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
-                evaluate_pixel[x].channel[i]=sqrt(evaluate_pixel[x].channel[i]/
-                  (double) number_images);
-              break;
-            }
             default:
               break;
           }
index 5917cdc476fa446ca3be816b53a00951f51db00a..db53dff3c6c67b29742e63ff7a0894344b643652 100644 (file)
@@ -89,7 +89,6 @@ typedef enum
   PoissonNoiseEvaluateOperator,
   PowEvaluateOperator,
   RightShiftEvaluateOperator,
-  RootMeanSquareEvaluateOperator,
   SetEvaluateOperator,
   SineEvaluateOperator,
   SubtractEvaluateOperator,