X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fguid.cpp;fp=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fguid.cpp;h=ed0336f009e3f4b8c44be7b59ed5c288176876c6;hb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;hp=bf234752b59f38f1577e73fdbb280d73ddb71007;hpb=cee5940bae97612105db8b7e1ffcf513f9d9150c;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/guid.cpp b/synfig-core/trunk/src/synfig/guid.cpp index bf23475..ed0336f 100644 --- a/synfig-core/trunk/src/synfig/guid.cpp +++ b/synfig-core/trunk/src/synfig/guid.cpp @@ -87,12 +87,12 @@ public: { next=x; } - + unsigned long i32() { static const unsigned long a(1664525); static const unsigned long c(1013904223); - + return next=next*a+c; } @@ -104,10 +104,10 @@ public: float f() { static const float m(int(65535)); - + return float(i16())/m; } - + unsigned long operator()(const unsigned long& m) { if(m==65536) @@ -146,10 +146,10 @@ static void _get_rand_long_long(uint64_t &x) { //subtractive_rng _c(clock()); unsigned short* data(reinterpret_cast(&x)); - data[0]=_a(65536); - data[1]=_a(65536); - data[2]=_a(65536); - data[3]=_a(65536); + data[0]=_a(65536); + data[1]=_a(65536); + data[2]=_a(65536); + data[3]=_a(65536); } #else @@ -160,7 +160,7 @@ static void _get_rand_long_long(uint64_t &x) static void get_rand_long_long(uint64_t &x) { _GUID* guid(reinterpret_cast<_GUID*>(&x)); - CoCreateGuid(guid); + CoCreateGuid(guid); } #else @@ -195,7 +195,7 @@ synfig::GUID::make_unique() synfig::GUID synfig::GUID::hasher(const String& str) -{ +{ #ifdef HASH_MAP_H hash string_hash_; const unsigned int seed( @@ -211,7 +211,7 @@ synfig::GUID::hasher(const String& str) seed=(seed>>(32-(i%24)))^(seed<<(i%24)) } #endif - + GUID_RNG random(seed); GUID ret(0); ret.data.u_32.a=random(~(unsigned int)0);