Kaydet (Commit) ae78051c authored tarafından Mario J. Rugiero's avatar Mario J. Rugiero Kaydeden (comit) David Tardon

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/19707Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 92a5be6b
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <sal/config.h> #include <sal/config.h>
#include <memory> #include <memory>
#include <boost/bind.hpp> #include <functional>
#include <GL/glew.h> #include <GL/glew.h>
#include <basegfx/polygon/b2dpolygontriangulator.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx>
...@@ -37,9 +37,8 @@ ...@@ -37,9 +37,8 @@
#include "ogl_canvashelper.hxx" #include "ogl_canvashelper.hxx"
#include <functional>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::std::placeholders;
namespace oglcanvas namespace oglcanvas
{ {
...@@ -410,7 +409,7 @@ namespace oglcanvas ...@@ -410,7 +409,7 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back(); Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState ); setupGraphicsState( rAct, viewState, renderState );
rAct.maFunction = ::boost::bind(&lcl_drawPoint, rAct.maFunction = ::std::bind(&lcl_drawPoint,
_1,_2,_3,_4,_5, _1,_2,_3,_4,_5,
aPoint); aPoint);
} }
...@@ -428,9 +427,9 @@ namespace oglcanvas ...@@ -428,9 +427,9 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back(); Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState ); setupGraphicsState( rAct, viewState, renderState );
rAct.maFunction = ::boost::bind(&lcl_drawLine, rAct.maFunction = ::std::bind(&lcl_drawLine,
_1,_2,_3,_4,_5, _1, _2, _3, _4, _5,
aStartPoint,aEndPoint); aStartPoint, aEndPoint);
} }
} }
...@@ -448,7 +447,7 @@ namespace oglcanvas ...@@ -448,7 +447,7 @@ namespace oglcanvas
setupGraphicsState( rAct, viewState, renderState ); setupGraphicsState( rAct, viewState, renderState );
// TODO(F2): subdivide&render whole curve // TODO(F2): subdivide&render whole curve
rAct.maFunction = ::boost::bind(&lcl_drawLine, rAct.maFunction = ::std::bind(&lcl_drawLine,
_1,_2,_3,_4,_5, _1,_2,_3,_4,_5,
geometry::RealPoint2D( geometry::RealPoint2D(
aBezierSegment.Px, aBezierSegment.Px,
...@@ -601,7 +600,7 @@ namespace oglcanvas ...@@ -601,7 +600,7 @@ namespace oglcanvas
const ::canvas::ParametricPolyPolygon::Values& rValues( const ::canvas::ParametricPolyPolygon::Values& rValues(
pGradient->getValues() ); pGradient->getValues() );
rAct.maFunction = ::boost::bind(&lcl_fillGradientPolyPolygon, rAct.maFunction = ::std::bind(&lcl_fillGradientPolyPolygon,
_1,_2,_3,_4, _1,_2,_3,_4,
rValues, rValues,
textures[0], textures[0],
...@@ -644,7 +643,7 @@ namespace oglcanvas ...@@ -644,7 +643,7 @@ namespace oglcanvas
aPixelData, aPixelData,
canvas::tools::getStdColorSpace())); canvas::tools::getStdColorSpace()));
rAct.maFunction = ::boost::bind(&lcl_fillTexturedPolyPolygon, rAct.maFunction = ::std::bind(&lcl_fillTexturedPolyPolygon,
_1,_2,_3,_4, _1,_2,_3,_4,
textures[0], textures[0],
aSize, aSize,
...@@ -822,7 +821,7 @@ namespace oglcanvas ...@@ -822,7 +821,7 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back(); Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState ); setupGraphicsState( rAct, viewState, renderState );
rAct.maFunction = ::boost::bind(&lcl_drawOwnBitmap, rAct.maFunction = ::std::bind(&lcl_drawOwnBitmap,
_1,_2,_3,_4,_5, _1,_2,_3,_4,_5,
*pOwnBitmap); *pOwnBitmap);
} }
...@@ -851,7 +850,7 @@ namespace oglcanvas ...@@ -851,7 +850,7 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back(); Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState ); setupGraphicsState( rAct, viewState, renderState );
rAct.maFunction = ::boost::bind(&lcl_drawGenericBitmap, rAct.maFunction = ::std::bind(&lcl_drawGenericBitmap,
_1,_2,_3,_4,_5, _1,_2,_3,_4,_5,
aSize, aARGBBytes, aSize, aARGBBytes,
rtl_crc32(0, rtl_crc32(0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment