1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From 08782e5a72b684d336fffbf58ace57ff7b40d19f Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 28 Apr 2011 19:20:14 +0200
Subject: [PATCH 3/6] C++: Silence precision loss, may need better fix
---
source/blender/render/intern/source/RE_basicShadowBuffer.cpp | 4 ++--
source/kernel/gen_system/GEN_HashedPtr.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/source/blender/render/intern/source/RE_basicShadowBuffer.cpp b/source/blender/render/intern/source/RE_basicShadowBuffer.cpp
index 221c31d..e672f04 100644
--- a/source/blender/render/intern/source/RE_basicShadowBuffer.cpp
+++ b/source/blender/render/intern/source/RE_basicShadowBuffer.cpp
@@ -378,7 +378,7 @@ float RE_BasicShadowBuffer::readshadowbuf(struct ShadBuf *shb,
else {
/* got warning on this from alpha .... */
/* but it's working code! (ton) */
- zsamp= (int) rz;
+ zsamp= (int)(long) rz;
}
/* if(zsamp >= 0x7FFFFE00) return 1.0; */ /* geen schaduw als op oneindig wordt gesampeld*/
@@ -565,7 +565,7 @@ float RE_BasicShadowBuffer::readshadowbuf_halo(struct ShadBuf *shb, int xs, int
else {
/* same as before */
/* still working code! (ton) */
- zsamp= (int) rz;
+ zsamp= (int) (long) rz;
}
/* geen schaduw als op oneindig wordt gesampeld*/
diff --git a/source/kernel/gen_system/GEN_HashedPtr.h b/source/kernel/gen_system/GEN_HashedPtr.h
index 39662ce..8ce30f0 100644
--- a/source/kernel/gen_system/GEN_HashedPtr.h
+++ b/source/kernel/gen_system/GEN_HashedPtr.h
@@ -40,7 +40,7 @@ class GEN_HashedPtr
void* m_valptr;
public:
GEN_HashedPtr(void* val) : m_valptr(val) {};
- unsigned int hash() const { return GEN_Hash((unsigned int) m_valptr);};
+ unsigned int hash() const { return GEN_Hash((unsigned int)(unsigned long) m_valptr);};
inline friend bool operator ==(const GEN_HashedPtr & rhs, const GEN_HashedPtr & lhs) { return rhs.m_valptr == lhs.m_valptr;};
};
--
2.2.1
|
GitWeb
