diff options
| author |  archshift | 2015-02-18 22:46:21 -0800 |
|---|---|---|
| committer | archshift | 2015-02-19 22:26:25 -0800 |
| commit | 4fb75d220aeaa66d3e907cc2311acf6c29433800 (patch) | |
| tree | 8fa12b7d7dd3fde83ce126c0ffe3c8011d839f4f /src/common/hash.cpp | |
| parent | Remove duplication of INSERT_PADDING_WORDS between pica.h and gpu.h (diff) | |
| download | yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.gz yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.xz yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.zip | |
Misc cleanup of common and related functions
Diffstat (limited to 'src/common/hash.cpp')
| -rw-r--r-- | src/common/hash.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/hash.cpp b/src/common/hash.cpp index 50c7cb5f9..0624dab8d 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp | |||
| @@ -156,7 +156,7 @@ u64 GetMurmurHash3(const u8 *src, int len, u32 samples) | |||
| 156 | const u8 * data = (const u8*)src; | 156 | const u8 * data = (const u8*)src; |
| 157 | const int nblocks = len / 16; | 157 | const int nblocks = len / 16; |
| 158 | u32 Step = (len / 8); | 158 | u32 Step = (len / 8); |
| 159 | if(samples == 0) samples = max(Step, 1u); | 159 | if(samples == 0) samples = std::max(Step, 1u); |
| 160 | Step = Step / samples; | 160 | Step = Step / samples; |
| 161 | if(Step < 1) Step = 1; | 161 | if(Step < 1) Step = 1; |
| 162 | 162 | ||
| @@ -234,7 +234,7 @@ u64 GetCRC32(const u8 *src, int len, u32 samples) | |||
| 234 | u32 Step = (len / 8); | 234 | u32 Step = (len / 8); |
| 235 | const u64 *data = (const u64 *)src; | 235 | const u64 *data = (const u64 *)src; |
| 236 | const u64 *end = data + Step; | 236 | const u64 *end = data + Step; |
| 237 | if(samples == 0) samples = max(Step, 1u); | 237 | if(samples == 0) samples = std::max(Step, 1u); |
| 238 | Step = Step / samples; | 238 | Step = Step / samples; |
| 239 | if(Step < 1) Step = 1; | 239 | if(Step < 1) Step = 1; |
| 240 | while(data < end) | 240 | while(data < end) |
| @@ -266,7 +266,7 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples) | |||
| 266 | u32 Step = (len / 8); | 266 | u32 Step = (len / 8); |
| 267 | const u64 *data = (const u64 *)src; | 267 | const u64 *data = (const u64 *)src; |
| 268 | const u64 *end = data + Step; | 268 | const u64 *end = data + Step; |
| 269 | if(samples == 0) samples = max(Step, 1u); | 269 | if(samples == 0) samples = std::max(Step, 1u); |
| 270 | Step = Step / samples; | 270 | Step = Step / samples; |
| 271 | if(Step < 1) Step = 1; | 271 | if(Step < 1) Step = 1; |
| 272 | while(data < end) | 272 | while(data < end) |
| @@ -309,7 +309,7 @@ u64 GetCRC32(const u8 *src, int len, u32 samples) | |||
| 309 | u32 Step = (len/4); | 309 | u32 Step = (len/4); |
| 310 | const u32 *data = (const u32 *)src; | 310 | const u32 *data = (const u32 *)src; |
| 311 | const u32 *end = data + Step; | 311 | const u32 *end = data + Step; |
| 312 | if(samples == 0) samples = max(Step, 1u); | 312 | if(samples == 0) samples = std::max(Step, 1u); |
| 313 | Step = Step / samples; | 313 | Step = Step / samples; |
| 314 | if(Step < 1) Step = 1; | 314 | if(Step < 1) Step = 1; |
| 315 | while(data < end) | 315 | while(data < end) |
| @@ -381,7 +381,7 @@ u64 GetMurmurHash3(const u8* src, int len, u32 samples) | |||
| 381 | u32 out[2]; | 381 | u32 out[2]; |
| 382 | const int nblocks = len / 8; | 382 | const int nblocks = len / 8; |
| 383 | u32 Step = (len / 4); | 383 | u32 Step = (len / 4); |
| 384 | if(samples == 0) samples = max(Step, 1u); | 384 | if(samples == 0) samples = std::max(Step, 1u); |
| 385 | Step = Step / samples; | 385 | Step = Step / samples; |
| 386 | if(Step < 1) Step = 1; | 386 | if(Step < 1) Step = 1; |
| 387 | 387 | ||
| @@ -457,7 +457,7 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples) | |||
| 457 | u32 Step = (len / 8); | 457 | u32 Step = (len / 8); |
| 458 | const u64 *data = (const u64 *)src; | 458 | const u64 *data = (const u64 *)src; |
| 459 | const u64 *end = data + Step; | 459 | const u64 *end = data + Step; |
| 460 | if(samples == 0) samples = max(Step, 1u); | 460 | if(samples == 0) samples = std::max(Step, 1u); |
| 461 | Step = Step / samples; | 461 | Step = Step / samples; |
| 462 | if(Step < 1) Step = 1; | 462 | if(Step < 1) Step = 1; |
| 463 | while(data < end) | 463 | while(data < end) |