From d7761bbc118576cf4141d0e33f3c53157da63243 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 14 Apr 2012 01:42:05 +0000 Subject: [PATCH] --- MagickCore/methods.h | 2 +- MagickCore/random.c | 8 ++++---- MagickCore/random_.h | 2 +- MagickWand/mogrify.c | 4 ++-- MagickWand/operation.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MagickCore/methods.h b/MagickCore/methods.h index 23f34a132..83d752306 100644 --- a/MagickCore/methods.h +++ b/MagickCore/methods.h @@ -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) diff --git a/MagickCore/random.c b/MagickCore/random.c index 0118e741b..3aed52f22 100644 --- a/MagickCore/random.c +++ b/MagickCore/random.c @@ -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; } diff --git a/MagickCore/random_.h b/MagickCore/random_.h index f8213c0cd..a8c14de18 100644 --- a/MagickCore/random_.h +++ b/MagickCore/random_.h @@ -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) diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 5524af2f0..ad53ca245 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -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) diff --git a/MagickWand/operation.c b/MagickWand/operation.c index e904e03ce..6e12e1421 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -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; -- 2.40.0