Author: Carlos Lopez <[email protected]>
Date: Wed Oct 24 21:04:28 2012 +0200
ETL::surface_: when returning a value_type, first cast the accumulator type to
it.
---
ETL/ETL/_surface.h | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ETL/ETL/_surface.h b/ETL/ETL/_surface.h
index bd936ec..e016a53 100644
--- a/ETL/ETL/_surface.h
+++ b/ETL/ETL/_surface.h
@@ -431,7 +431,7 @@ public:
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 @@ public:
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 @@ public:
}
//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 @@ public:
}
acum *= 1/weight;
- return acum;
+ return (value_type)(acum);
}
//! Rectangle sample clipped
@@ -926,7 +926,7 @@ public:
}
acum *= 1/weight;
- return acum;
+ return (value_type)(acum);
}
};
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
