]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Sat, 14 Apr 2012 01:42:05 +0000 (01:42 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Sat, 14 Apr 2012 01:42:05 +0000 (01:42 +0000)
MagickCore/methods.h
MagickCore/random.c
MagickCore/random_.h
MagickWand/mogrify.c
MagickWand/operation.c

index 23f34a132667789653dd84572af5c6d6a1c31d90..83d7523061a06186148404b622737a56c2146cbe 100644 (file)
@@ -1035,7 +1035,7 @@ extern "C" {
 #define SampleImage  PrependMagickMethod(SampleImage)
 #define ScaleImage  PrependMagickMethod(ScaleImage)
 #define ScaleResampleFilter  PrependMagickMethod(ScaleResampleFilter)
-#define SeedPseudoRandomGenerator  PrependMagickMethod(SeedPseudoRandomGenerator)
+#define SetRandomSecretKey  PrependMagickMethod(SetRandomSecretKey)
 #define SeekBlob  PrependMagickMethod(SeekBlob)
 #define SegmentImage  PrependMagickMethod(SegmentImage)
 #define SelectiveBlurImage  PrependMagickMethod(SelectiveBlurImage)
index 0118e741baebb06f0e5aa19cc94f95c6b60a62ea..3aed52f228a935a260e77fe91e024d8c90cbf4c5 100644 (file)
@@ -777,19 +777,19 @@ MagickPrivate void RandomComponentTerminus(void)
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  SeedPseudoRandomGenerator() initializes the pseudo-random number generator
+%  SetRandomSecretKey() initializes the pseudo-random number generator
 %  with a random seed.
 %
-%  The format of the SeedPseudoRandomGenerator method is:
+%  The format of the SetRandomSecretKey method is:
 %
-%      void SeedPseudoRandomGenerator(const unsigned long seed)
+%      void SetRandomSecretKey(const unsigned long seed)
 %
 %  A description of each parameter follows:
 %
 %    o seed: the seed.
 %
 */
-MagickExport void SeedPseudoRandomGenerator(const unsigned long seed)
+MagickExport void SetRandomSecretKey(const unsigned long seed)
 {
   random_seed=seed;
 }
index f8213c0cd6ddb20ebb4a997be29e28572fb3ee6e..a8c14de18758ce85201c0eecbecd2f42ebd3ec39 100644 (file)
@@ -48,8 +48,8 @@ extern MagickExport unsigned long
   GetRandomSecretKey(const RandomInfo *);
 
 extern MagickExport void
-  SeedPseudoRandomGenerator(const unsigned long),
   SetRandomKey(RandomInfo *,const size_t,unsigned char *),
+  SetRandomSecretKey(const unsigned long),
   SetRandomTrueRandom(const MagickBooleanType);
 
 #if defined(__cplusplus) || defined(c_plusplus)
index 5524af2f09b5fcb41567cad03127030fc9e3e1b0..ad53ca245f42b28bc7d6e303ecbff4978b1af092 100644 (file)
@@ -7004,11 +7004,11 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
             if (*option == '+')
               {
                 seed=(size_t) time((time_t *) NULL);
-                SeedPseudoRandomGenerator(seed);
+                SetRandomSecretKey(seed);
                 break;
               }
             seed=StringToUnsignedLong(argv[i+1]);
-            SeedPseudoRandomGenerator(seed);
+            SetRandomSecretKey(seed);
             break;
           }
         if (LocaleCompare("size",option+1) == 0)
index e904e03ce3693951f1d8ff6e36773a0cd3644d83..6e12e1421ff43b62d1d5a7edf1abefc2ba50186c 100644 (file)
@@ -1277,7 +1277,7 @@ WandExport void CLISettingOptionInfo(MagickCLI *cli_wand,
         {
           if (IfMagickFalse(IsGeometry(arg1)))
             CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1);
-          SeedPseudoRandomGenerator(
+          SetRandomSecretKey(
                IfSetOption ? (size_t) StringToUnsignedLong(arg1)
                            : (size_t) time((time_t *) NULL) );
           break;