[Bf-blender-cvs] [036d35d] master: Fix for MSVC 2008 compiler errors.
Tamito Kajiyama
noreply at git.blender.org
Mon Feb 24 17:17:38 CET 2014
Commit: 036d35dd2471bc490c266cf4f7d4aba10080cb10
Author: Tamito Kajiyama
Date: Tue Feb 25 01:16:52 2014 +0900
https://developer.blender.org/rB036d35dd2471bc490c266cf4f7d4aba10080cb10
Fix for MSVC 2008 compiler errors.
===================================================================
M extern/carve/include/carve/mesh_simplify.hpp
===================================================================
diff --git a/extern/carve/include/carve/mesh_simplify.hpp b/extern/carve/include/carve/mesh_simplify.hpp
index 2126c57..f0a0a96 100644
--- a/extern/carve/include/carve/mesh_simplify.hpp
+++ b/extern/carve/include/carve/mesh_simplify.hpp
@@ -1470,7 +1470,7 @@ namespace carve {
heapval_t last;
std::vector<heapval_t> heap;
- point_enumerator_t(vector_t _origin, int _base, int _n_dp) : origin(_origin), rounding_fac(pow(_base, _n_dp)), last(-1.0, _origin), heap() {
+ point_enumerator_t(vector_t _origin, int _base, int _n_dp) : origin(_origin), rounding_fac(pow((double)_base, _n_dp)), last(-1.0, _origin), heap() {
for (size_t i = 0; i < (1 << 3); ++i) {
vector_t t = origin;
for (size_t j = 0; j < 3; ++j) {
@@ -1527,7 +1527,7 @@ namespace carve {
}
aabb_t getAABB() const {
- std::set<face_t *>::iterator i = faces.begin();
+ std::set<face_t *>::const_iterator i = faces.begin();
aabb_t aabb = (*i)->getAABB();
while (++i != faces.end()) {
aabb.unionAABB((*i)->getAABB());
More information about the Bf-blender-cvs
mailing list