aboutsummaryrefslogtreecommitdiffstats
path: root/src/blind-triangular-wave.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2017-07-15 01:04:14 +0200
committerMattias Andrée <maandree@kth.se>2017-07-15 01:04:14 +0200
commitf3cde9060c57320c9ed7a9b4bcb494bd411fb1f4 (patch)
tree41a1a50970c7875038e25b6a0a632e23b1ce6001 /src/blind-triangular-wave.c
parentFix blind-{cross,dot,quaternion}-product and blind-vector-projection (diff)
downloadblind-f3cde9060c57320c9ed7a9b4bcb494bd411fb1f4.tar.gz
blind-f3cde9060c57320c9ed7a9b4bcb494bd411fb1f4.tar.bz2
blind-f3cde9060c57320c9ed7a9b4bcb494bd411fb1f4.tar.xz
Fix warnings
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'src/blind-triangular-wave.c')
-rw-r--r--src/blind-triangular-wave.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/blind-triangular-wave.c b/src/blind-triangular-wave.c
index 923c74b..523e045 100644
--- a/src/blind-triangular-wave.c
+++ b/src/blind-triangular-wave.c
@@ -21,7 +21,7 @@ static int spiral = 0;
a = posmod(a, (TYPE)2);\
a = a > 1 ? 2 - a : a;\
if (spiral)\
- a = (a > 0.5 ? 1 - a : a) * 2;\
+ a = (a > (TYPE)0.5 ? 1 - a : a) * 2; \
((TYPE *)(stream->buf))[4 * i + 0] = a;\
((TYPE *)(stream->buf))[4 * i + 1] = a;\
((TYPE *)(stream->buf))[4 * i + 2] = a;\
@@ -42,10 +42,10 @@ static int spiral = 0;
z = z > 1 ? 2 - z : z;\
a = a > 1 ? 2 - a : a;\
if (spiral) {\
- x = (x > 0.5 ? 1 - x : x) * 2;\
- y = (y > 0.5 ? 1 - y : y) * 2;\
- z = (z > 0.5 ? 1 - z : z) * 2;\
- a = (a > 0.5 ? 1 - a : a) * 2;\
+ x = (x > (TYPE)0.5 ? 1 - x : x) * 2;\
+ y = (y > (TYPE)0.5 ? 1 - y : y) * 2;\
+ z = (z > (TYPE)0.5 ? 1 - z : z) * 2;\
+ a = (a > (TYPE)0.5 ? 1 - a : a) * 2;\
}\
((TYPE *)(stream->buf))[4 * i + 0] = x;\
((TYPE *)(stream->buf))[4 * i + 1] = y;\