This commit is contained in:
cristy
2012-04-14 01:42:05 +00:00
parent e7452651d4
commit d7761bbc11
5 changed files with 9 additions and 9 deletions
+1 -1
View 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)
+4 -4
View 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;
}
+1 -1
View 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)
+2 -2
View 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)
+1 -1
View 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;