diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-07 20:06:17 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-07 20:06:17 +0400 |
commit | d835d2f4e65ae3bf8e22f8d3d60e7e6ea7a6b4ca (patch) | |
tree | 77475cb0eec4dda28415b6c9f6be51df28acf286 /intern/cycles/kernel/kernel_globals.h | |
parent | c24be7ec6e5269c54552d1fb03707b97befd48d1 (diff) |
Code cleanup: avoid some warnings due to implicit uint/int/float/double conversion.
Diffstat (limited to 'intern/cycles/kernel/kernel_globals.h')
-rw-r--r-- | intern/cycles/kernel/kernel_globals.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h index abf1f5b4cb0..fbb5060c409 100644 --- a/intern/cycles/kernel/kernel_globals.h +++ b/intern/cycles/kernel/kernel_globals.h @@ -94,7 +94,7 @@ __device float lookup_table_read(KernelGlobals *kg, float x, int offset, int siz { x = clamp(x, 0.0f, 1.0f)*(size-1); - int index = min((int)x, size-1); + int index = min(float_to_int(x), size-1); int nindex = min(index+1, size-1); float t = x - index; @@ -110,7 +110,7 @@ __device float lookup_table_read_2D(KernelGlobals *kg, float x, float y, int off { y = clamp(y, 0.0f, 1.0f)*(ysize-1); - int index = min((int)y, ysize-1); + int index = min(float_to_int(y), ysize-1); int nindex = min(index+1, ysize-1); float t = y - index; |