ETL::surface_: when returning a value_type, first cast the accumulato…

…r type to it.
synfig · Oct 24, 2012 · f8b92c3 · f8b92c3
1 parent 18900f8
commit f8b92c3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/ETL/ETL/_surface.h b/ETL/ETL/_surface.h
@@ -431,7 +431,7 @@ class surface
 		if(e>=epsilon)ret+=(*this)[v][u+1]*e;
 		if(f>=epsilon)ret+=(*this)[v+1][u]*f;
 		if(g>=epsilon)ret+=(*this)[v+1][u+1]*g;
-		return ret;
+		return (value_type)(ret);
 	}
 
 	//! Cosine sample
@@ -491,7 +491,7 @@ class surface
 		if(f>=epsilon)ret+=(*this)[v+1][u]*f;
 		if(g>=epsilon)ret+=(*this)[v+1][u+1]*g;
 
-		return ret;
+		return (value_type)(ret);
 	}
 
 	//! Cubic sample
@@ -619,7 +619,7 @@ class surface
 		}
 
 		//return the cumulative column evaluation
-		return xfa[0]*tyf[0] + xfa[1]*tyf[1] + xfa[2]*tyf[2] + xfa[3]*tyf[3];
+		return (value_type)(xfa[0]*tyf[0] + xfa[1]*tyf[1] + xfa[2]*tyf[2] + xfa[3]*tyf[3]);
 #undef f
 	}
 
@@ -754,7 +754,7 @@ class surface
 		}
 
 		acum *= 1/weight;
-		return acum;
+		return (value_type)(acum);
 	}
 
 	//! Rectangle sample clipped
@@ -926,7 +926,7 @@ class surface
 		}
 
 		acum *= 1/weight;
-		return acum;
+		return (value_type)(acum);
 	}
 };