diff options
Diffstat (limited to 'slideshow/source/engine/activities/interpolation.hxx')
| -rw-r--r-- | slideshow/source/engine/activities/interpolation.hxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/slideshow/source/engine/activities/interpolation.hxx b/slideshow/source/engine/activities/interpolation.hxx index 620a019f661d..9409965c8846 100644 --- a/slideshow/source/engine/activities/interpolation.hxx +++ b/slideshow/source/engine/activities/interpolation.hxx @@ -28,11 +28,11 @@ #ifndef INCLUDED_SLIDESHOW_INTERPOLATION_HXX #define INCLUDED_SLIDESHOW_INTERPOLATION_HXX -#include "lerp.hxx" +#include <basegfx/tools/lerp.hxx> -namespace slideshow +namespace basegfx { - namespace internal + namespace tools { // Interpolator specializations // ============================ @@ -42,9 +42,10 @@ namespace slideshow // not-straight-forward-interpolatable types /// Specialization for RGBColor, to employ color-specific interpolator - template<> RGBColor lerp< RGBColor >( const RGBColor& rFrom, - const RGBColor& rTo, - double t ) + template<> ::slideshow::internal::RGBColor lerp< ::slideshow::internal::RGBColor >( + const ::slideshow::internal::RGBColor& rFrom, + const ::slideshow::internal::RGBColor& rTo, + double t ) { return interpolate( rFrom, rTo, t ); } @@ -78,14 +79,20 @@ namespace slideshow "lerp<bool> called" ); return rTo; } + } +} +namespace slideshow +{ + namespace internal + { template< typename ValueType > struct Interpolator { ValueType operator()( const ValueType& rFrom, const ValueType& rTo, double t ) const { - return lerp( rFrom, rTo, t ); + return basegfx::tools::lerp( rFrom, rTo, t ); } }; |