summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-31 12:28:28 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-01-31 17:25:52 +0000
commit1fd280f2c63cdf8d24b48c02fe384f0bc20682c1 (patch)
tree35b84f9730d7a6def967869336cc437e94ca6439 /canvas
parentde368b7783dff197ae279e0720c61efb2e0ff274 (diff)
boost::tuple -> std::tuple
Change-Id: Ia08c184b792ff73d3ed49d6a5d54dec1a35943e9 Reviewed-on: https://gerrit.libreoffice.org/21955 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/cairo/cairo_canvashelper.cxx5
-rw-r--r--canvas/source/directx/dx_canvashelper_texturefill.cxx4
-rw-r--r--canvas/source/vcl/canvashelper_texturefill.cxx8
3 files changed, 8 insertions, 9 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index b516db0f071f..fa766268e931 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -20,8 +20,7 @@
#include <sal/config.h>
#include <algorithm>
-
-#include <boost/tuple/tuple.hpp>
+#include <tuple>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/point/b2dpoint.hxx>
@@ -868,7 +867,7 @@ namespace cairocanvas
std::ptrdiff_t nIndex;
double fAlpha;
- boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(fT);
+ std::tie(nIndex,fAlpha)=aLerper.lerp(fT);
setColor(pCairo, lerp(pColors[nIndex], pColors[nIndex+1], fAlpha));
cairo_rectangle( pCairo, -1+fT, -1+fT, 2-2*fT, 2-2*fT );
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index 3d5f893a29cf..2cd86360acf6 100644
--- a/canvas/source/directx/dx_canvashelper_texturefill.cxx
+++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
-#include <boost/tuple/tuple.hpp>
+#include <tuple>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
@@ -325,7 +325,7 @@ namespace dxcanvas
std::ptrdiff_t nIndex;
double fAlpha;
const double fT( i/double(nStepCount) );
- boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(fT);
+ std::tie(nIndex,fAlpha)=aLerper.lerp(fT);
const Gdiplus::Color aFillColor(
static_cast<BYTE>( basegfx::tools::lerp(rColors[nIndex].GetRed(),rColors[nIndex+1].GetRed(),fAlpha) ),
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index 8f85a4f5b797..4f9d6000d8a6 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
-#include <boost/tuple/tuple.hpp>
+#include <tuple>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/numeric/ftools.hxx>
@@ -205,7 +205,7 @@ namespace vclcanvas
{
std::ptrdiff_t nIndex;
double fAlpha;
- boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(double(i)/nStepCount);
+ std::tie(nIndex,fAlpha)=aLerper.lerp(double(i)/nStepCount);
rOutDev.SetFillColor(
Color( (sal_uInt8)(basegfx::tools::lerp(rColors[nIndex].GetRed(),rColors[nIndex+1].GetRed(),fAlpha)),
@@ -371,7 +371,7 @@ namespace vclcanvas
std::ptrdiff_t nIndex;
double fAlpha;
- boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(fT);
+ std::tie(nIndex,fAlpha)=aLerper.lerp(fT);
// lerp color
rOutDev.SetFillColor(
@@ -429,7 +429,7 @@ namespace vclcanvas
std::ptrdiff_t nIndex;
double fAlpha;
- boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(fT);
+ std::tie(nIndex,fAlpha)=aLerper.lerp(fT);
// lerp color
rOutDev.SetFillColor(