diff options
| author | Armin Le Grand <alg@apache.org> | 2012-10-04 15:27:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-11 10:32:54 +0100 |
| commit | 59db4be207ca6651a29366d326436ba2f40bb6ab (patch) | |
| tree | 6fb697302f7c650a4b5ed2ff71551caf231cce3b /drawinglayer | |
| parent | 5e39bc0937940e8d0f78668366e9de447269f0df (diff) | |
Related: #i120604# corrected 3d gradients
adapted basegfx to be smarter in some areas
(cherry picked from commit 888e64505474808166c29ada24178cc3e58d6c18)
Conflicts:
basegfx/inc/basegfx/pixel/bpixel.hxx
basegfx/inc/basegfx/point/b2dhompoint.hxx
basegfx/inc/basegfx/point/b3dhompoint.hxx
basegfx/inc/basegfx/raster/rasterconvert3d.hxx
basegfx/inc/basegfx/tuple/b2dtuple.hxx
basegfx/inc/basegfx/tuple/b2i64tuple.hxx
basegfx/inc/basegfx/tuple/b2ituple.hxx
basegfx/inc/basegfx/tuple/b3dtuple.hxx
basegfx/inc/basegfx/tuple/b3i64tuple.hxx
basegfx/inc/basegfx/tuple/b3ituple.hxx
basegfx/source/point/b2dhompoint.cxx
basegfx/source/tuple/b2ituple.cxx
Change-Id: Id92864093dd40d34bd20b130cc3b405a7b8f9d91
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/texture/texture.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx index c42f75c22c03..f69c9736ac40 100644 --- a/drawinglayer/source/texture/texture.cxx +++ b/drawinglayer/source/texture/texture.cxx @@ -157,7 +157,7 @@ namespace drawinglayer { const double fScaler(basegfx::tools::getLinearGradientAlpha(rUV, maGradientInfo)); - rBColor = (maStart * (1.0 - fScaler)) + (maEnd * fScaler); + rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } } // end of namespace texture } // end of namespace drawinglayer @@ -220,7 +220,7 @@ namespace drawinglayer { const double fScaler(basegfx::tools::getAxialGradientAlpha(rUV, maGradientInfo)); - rBColor = (maStart * (1.0 - fScaler)) + (maEnd * fScaler); + rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } } // end of namespace texture } // end of namespace drawinglayer @@ -277,7 +277,7 @@ namespace drawinglayer { const double fScaler(basegfx::tools::getRadialGradientAlpha(rUV, maGradientInfo)); - rBColor = (maStart * (1.0 - fScaler)) + (maEnd * fScaler); + rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } } // end of namespace texture } // end of namespace drawinglayer @@ -354,7 +354,7 @@ namespace drawinglayer { const double fScaler(basegfx::tools::getEllipticalGradientAlpha(rUV, maGradientInfo)); - rBColor = (maStart * (1.0 - fScaler)) + (maEnd * fScaler); + rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } } // end of namespace texture } // end of namespace drawinglayer @@ -413,7 +413,7 @@ namespace drawinglayer { const double fScaler(basegfx::tools::getSquareGradientAlpha(rUV, maGradientInfo)); - rBColor = (maStart * (1.0 - fScaler)) + (maEnd * fScaler); + rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } } // end of namespace texture } // end of namespace drawinglayer @@ -490,7 +490,7 @@ namespace drawinglayer { const double fScaler(basegfx::tools::getRectangularGradientAlpha(rUV, maGradientInfo)); - rBColor = (maStart * (1.0 - fScaler)) + (maEnd * fScaler); + rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } } // end of namespace texture } // end of namespace drawinglayer |