diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-09 21:45:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-09 21:45:22 +0400 |
| commit | 43361487bad926a9b32ce879f5b6961154507dfc (patch) | |
| tree | 6a91b1e7709fbd85c9b70e735e81db71edb20ab2 /intern/cycles/util/util_color.h | |
| parent | 0fbb6bff27139d66951fe223ff322c609d368a18 (diff) | |
code cleanup: quiet all warnings about double promotion (either by changing the type or explicitly casting).
Diffstat (limited to 'intern/cycles/util/util_color.h')
| -rw-r--r-- | intern/cycles/util/util_color.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/util_color.h index 8b4a175f498..5136ea5c5db 100644 --- a/intern/cycles/util/util_color.h +++ b/intern/cycles/util/util_color.h @@ -29,15 +29,15 @@ __device float color_srgb_to_scene_linear(float c) if(c < 0.04045f) return (c < 0.0f)? 0.0f: c * (1.0f/12.92f); else - return pow((c + 0.055f)*(1.0f/1.055f), 2.4f); + return powf((c + 0.055f) * (1.0f / 1.055f), 2.4f); } __device float color_scene_linear_to_srgb(float c) { if(c < 0.0031308f) return (c < 0.0f)? 0.0f: c * 12.92f; - else - return 1.055f * pow(c, 1.0f/2.4f) - 0.055f; + else + return 1.055f * powf(c, 1.0f / 2.4f) - 0.055f; } #ifndef __KERNEL_OPENCL__ |