From a73773c1725dd85fd162be19ba13a58d5d4c9717 Mon Sep 17 00:00:00 2001
From: valerio <valerio@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Tue, 13 Apr 2010 08:04:09 +0000
Subject: [PATCH] Fix to make it compile with double precision

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@1977 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
 modules/gfx/src/impl/calc_ambient.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/gfx/src/impl/calc_ambient.cc b/modules/gfx/src/impl/calc_ambient.cc
index 94f3076b2..c1e2cea98 100644
--- a/modules/gfx/src/impl/calc_ambient.cc
+++ b/modules/gfx/src/impl/calc_ambient.cc
@@ -53,12 +53,12 @@ namespace {
 		    -std::numeric_limits<float>::max());
 
     for(EntryList::const_iterator it=elist.begin();it!=elist.end();++it) {
-      minc[0]=std::min(it->v[0],minc[0]);
-      minc[1]=std::min(it->v[1],minc[1]);
-      minc[2]=std::min(it->v[2],minc[2]);
-      maxc[0]=std::max(it->v[0],maxc[0]);
-      maxc[1]=std::max(it->v[1],maxc[1]);
-      maxc[2]=std::max(it->v[2],maxc[2]);
+      minc[0]=std::min(it->v[0],static_cast<float>(minc[0]));
+      minc[1]=std::min(it->v[1],static_cast<float>(minc[1]));
+      minc[2]=std::min(it->v[2],static_cast<float>(minc[2]));
+      maxc[0]=std::max(it->v[0],static_cast<float>(maxc[0]));
+      maxc[1]=std::max(it->v[1],static_cast<float>(maxc[1]));
+      maxc[2]=std::max(it->v[2],static_cast<float>(maxc[2]));
     }
     return std::make_pair(minc,maxc);
   }
-- 
GitLab