canvas/source/opengl/ogl_canvashelper.cxx | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
New commits:
commit ae78051c22d5a9bc7b5728482d59720fed7e6146
Author: Mario J. Rugiero <mrugi...@gmail.com>
Date: Sat Oct 31 14:40:27 2015 -0300
Replaced boost::bind by std::bind in
canvas/source/opengl/ogl_canvashelper.cxx
Chose not to use lambdas instead because the number of arguments in these
calls
would have made it way too verbose, hurting readability.
Change-Id: I8662a937ec10ca0fac6cd7e0d78b6268e8023ada
Reviewed-on: https://gerrit.libreoffice.org/19707
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx
b/canvas/source/opengl/ogl_canvashelper.cxx
index 61a6773..919015f 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -10,7 +10,7 @@
#include <sal/config.h>
#include <memory>
-#include <boost/bind.hpp>
+#include <functional>
#include <GL/glew.h>
#include <basegfx/polygon/b2dpolygontriangulator.hxx>
@@ -37,9 +37,8 @@
#include "ogl_canvashelper.hxx"
-#include <functional>
-
using namespace ::com::sun::star;
+using namespace ::std::placeholders;
namespace oglcanvas
{
@@ -410,7 +409,7 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState );
- rAct.maFunction = ::boost::bind(&lcl_drawPoint,
+ rAct.maFunction = ::std::bind(&lcl_drawPoint,
_1,_2,_3,_4,_5,
aPoint);
}
@@ -428,9 +427,9 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState );
- rAct.maFunction = ::boost::bind(&lcl_drawLine,
- _1,_2,_3,_4,_5,
- aStartPoint,aEndPoint);
+ rAct.maFunction = ::std::bind(&lcl_drawLine,
+ _1, _2, _3, _4, _5,
+ aStartPoint, aEndPoint);
}
}
@@ -448,7 +447,7 @@ namespace oglcanvas
setupGraphicsState( rAct, viewState, renderState );
// TODO(F2): subdivide&render whole curve
- rAct.maFunction = ::boost::bind(&lcl_drawLine,
+ rAct.maFunction = ::std::bind(&lcl_drawLine,
_1,_2,_3,_4,_5,
geometry::RealPoint2D(
aBezierSegment.Px,
@@ -601,7 +600,7 @@ namespace oglcanvas
const ::canvas::ParametricPolyPolygon::Values& rValues(
pGradient->getValues() );
- rAct.maFunction =
::boost::bind(&lcl_fillGradientPolyPolygon,
+ rAct.maFunction = ::std::bind(&lcl_fillGradientPolyPolygon,
_1,_2,_3,_4,
rValues,
textures[0],
@@ -644,7 +643,7 @@ namespace oglcanvas
aPixelData,
canvas::tools::getStdColorSpace()));
- rAct.maFunction =
::boost::bind(&lcl_fillTexturedPolyPolygon,
+ rAct.maFunction =
::std::bind(&lcl_fillTexturedPolyPolygon,
_1,_2,_3,_4,
textures[0],
aSize,
@@ -822,7 +821,7 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState );
- rAct.maFunction = ::boost::bind(&lcl_drawOwnBitmap,
+ rAct.maFunction = ::std::bind(&lcl_drawOwnBitmap,
_1,_2,_3,_4,_5,
*pOwnBitmap);
}
@@ -851,7 +850,7 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState );
- rAct.maFunction = ::boost::bind(&lcl_drawGenericBitmap,
+ rAct.maFunction = ::std::bind(&lcl_drawGenericBitmap,
_1,_2,_3,_4,_5,
aSize, aARGBBytes,
rtl_crc32(0,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
