diff options
Diffstat (limited to 'intern/cycles/util/util_math_int2.h')
| -rw-r--r-- | intern/cycles/util/util_math_int2.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/util/util_math_int2.h b/intern/cycles/util/util_math_int2.h index dd401d9a091..0295cd51f7e 100644 --- a/intern/cycles/util/util_math_int2.h +++ b/intern/cycles/util/util_math_int2.h @@ -34,7 +34,7 @@ ccl_device_inline int2 operator+=(int2 &a, const int2 &b); ccl_device_inline int2 operator-(const int2 &a, const int2 &b); ccl_device_inline int2 operator*(const int2 &a, const int2 &b); ccl_device_inline int2 operator/(const int2 &a, const int2 &b); -#endif /* !__KERNEL_OPENCL__ */ +#endif /* !__KERNEL_OPENCL__ */ /******************************************************************************* * Definition. @@ -43,35 +43,35 @@ ccl_device_inline int2 operator/(const int2 &a, const int2 &b); #ifndef __KERNEL_OPENCL__ ccl_device_inline bool operator==(const int2 a, const int2 b) { - return (a.x == b.x && a.y == b.y); + return (a.x == b.x && a.y == b.y); } ccl_device_inline int2 operator+(const int2 &a, const int2 &b) { - return make_int2(a.x + b.x, a.y + b.y); + return make_int2(a.x + b.x, a.y + b.y); } ccl_device_inline int2 operator+=(int2 &a, const int2 &b) { - return a = a + b; + return a = a + b; } ccl_device_inline int2 operator-(const int2 &a, const int2 &b) { - return make_int2(a.x - b.x, a.y - b.y); + return make_int2(a.x - b.x, a.y - b.y); } ccl_device_inline int2 operator*(const int2 &a, const int2 &b) { - return make_int2(a.x * b.x, a.y * b.y); + return make_int2(a.x * b.x, a.y * b.y); } ccl_device_inline int2 operator/(const int2 &a, const int2 &b) { - return make_int2(a.x / b.x, a.y / b.y); + return make_int2(a.x / b.x, a.y / b.y); } -#endif /* !__KERNEL_OPENCL__ */ +#endif /* !__KERNEL_OPENCL__ */ CCL_NAMESPACE_END -#endif /* __UTIL_MATH_INT2_H__ */ +#endif /* __UTIL_MATH_INT2_H__ */ |