[Libreoffice-commits] core.git: 2 commits - slideshow/source
Tor Lillqvist
tml at collabora.com
Mon Oct 26 09:10:43 UTC 2015
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 102 ++++------
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx | 52 ++---
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 37 +--
3 files changed, 89 insertions(+), 102 deletions(-)
New commits:
commit c59d726976c4a27cf25d3b3d37a357f61d0a421e
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Oct 23 15:58:21 2015 +0300
Use std::shared_ptr instead of boost
Change-Id: Id1b48f190831bbd4cc75d0d9e315e5b2b491d595
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 9965194..0f55a8c 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -31,15 +31,11 @@
#include <utility>
-#include <boost/make_shared.hpp>
#include <comphelper/random.hxx>
#include "OGLTrans_TransitionImpl.hxx"
#include <math.h>
-using boost::make_shared;
-using boost::shared_ptr;
-
using std::max;
using std::min;
using std::vector;
@@ -370,13 +366,13 @@ public:
}
};
-shared_ptr<OGLTransitionImpl>
+std::shared_ptr<OGLTransitionImpl>
makeSimpleTransition()
{
- return make_shared<SimpleTransition>();
+ return std::make_shared<SimpleTransition>();
}
-shared_ptr<OGLTransitionImpl>
+std::shared_ptr<OGLTransitionImpl>
makeSimpleTransition(
const Primitives_t& rLeavingSlidePrimitives,
const Primitives_t& rEnteringSlidePrimitives,
@@ -384,13 +380,13 @@ makeSimpleTransition(
const SceneObjects_t& rSceneObjects,
const TransitionSettings& rSettings = TransitionSettings())
{
- return make_shared<SimpleTransition>(
+ return std::make_shared<SimpleTransition>(
TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives, rOverallOperations, rSceneObjects),
rSettings)
;
}
-shared_ptr<OGLTransitionImpl>
+std::shared_ptr<OGLTransitionImpl>
makeSimpleTransition(
const Primitives_t& rLeavingSlidePrimitives,
const Primitives_t& rEnteringSlidePrimitives,
@@ -400,7 +396,7 @@ makeSimpleTransition(
return makeSimpleTransition(rLeavingSlidePrimitives, rEnteringSlidePrimitives, rOverallOperations, SceneObjects_t(), rSettings);
}
-shared_ptr<OGLTransitionImpl>
+std::shared_ptr<OGLTransitionImpl>
makeSimpleTransition(
const Primitives_t& rLeavingSlidePrimitives,
const Primitives_t& rEnteringSlidePrimitives,
@@ -410,7 +406,7 @@ makeSimpleTransition(
return makeSimpleTransition(rLeavingSlidePrimitives, rEnteringSlidePrimitives, Operations_t(), rSceneObjects, rSettings);
}
-shared_ptr<OGLTransitionImpl>
+std::shared_ptr<OGLTransitionImpl>
makeSimpleTransition(
const Primitives_t& rLeavingSlidePrimitives,
const Primitives_t& rEnteringSlidePrimitives,
@@ -421,7 +417,7 @@ makeSimpleTransition(
}
-boost::shared_ptr<OGLTransitionImpl> makeOutsideCubeFaceToLeft()
+std::shared_ptr<OGLTransitionImpl> makeOutsideCubeFaceToLeft()
{
Primitive Slide;
@@ -442,7 +438,7 @@ boost::shared_ptr<OGLTransitionImpl> makeOutsideCubeFaceToLeft()
return makeSimpleTransition(aLeavingPrimitives, aEnteringPrimitives, aOperations);
}
-boost::shared_ptr<OGLTransitionImpl> makeInsideCubeFaceToLeft()
+std::shared_ptr<OGLTransitionImpl> makeInsideCubeFaceToLeft()
{
Primitive Slide;
@@ -463,7 +459,7 @@ boost::shared_ptr<OGLTransitionImpl> makeInsideCubeFaceToLeft()
return makeSimpleTransition(aLeavingPrimitives, aEnteringPrimitives, aOperations);
}
-boost::shared_ptr<OGLTransitionImpl> makeFallLeaving()
+std::shared_ptr<OGLTransitionImpl> makeFallLeaving()
{
Primitive Slide;
@@ -483,7 +479,7 @@ boost::shared_ptr<OGLTransitionImpl> makeFallLeaving()
return makeSimpleTransition(aLeavingPrimitives, aEnteringPrimitives, aSettings);
}
-boost::shared_ptr<OGLTransitionImpl> makeTurnAround()
+std::shared_ptr<OGLTransitionImpl> makeTurnAround()
{
Primitive Slide;
@@ -507,7 +503,7 @@ boost::shared_ptr<OGLTransitionImpl> makeTurnAround()
return makeSimpleTransition(aLeavingPrimitives, aEnteringPrimitives, aOperations, aSettings);
}
-boost::shared_ptr<OGLTransitionImpl> makeTurnDown()
+std::shared_ptr<OGLTransitionImpl> makeTurnDown()
{
Primitive Slide;
@@ -528,7 +524,7 @@ boost::shared_ptr<OGLTransitionImpl> makeTurnDown()
return makeSimpleTransition(aLeavingPrimitives, aEnteringPrimitives, aSettings);
}
-boost::shared_ptr<OGLTransitionImpl> makeIris()
+std::shared_ptr<OGLTransitionImpl> makeIris()
{
Primitive Slide;
@@ -569,7 +565,7 @@ boost::shared_ptr<OGLTransitionImpl> makeIris()
t += 1.0/nSteps;
}
- shared_ptr<Iris> pIris = make_shared<Iris>();
+ std::shared_ptr<Iris> pIris = std::make_shared<Iris>();
double angle = 87;
for (i = 0; i < nParts; i++) {
@@ -628,13 +624,13 @@ void RochadeTransition::displaySlides_( double nTime, ::sal_Int32 glLeavingSlide
}
}
-shared_ptr<OGLTransitionImpl>
+std::shared_ptr<OGLTransitionImpl>
makeRochadeTransition(
const Primitives_t& rLeavingSlidePrimitives,
const Primitives_t& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
- return make_shared<RochadeTransition>(
+ return std::make_shared<RochadeTransition>(
TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives),
rSettings)
;
@@ -642,7 +638,7 @@ makeRochadeTransition(
}
}
-boost::shared_ptr<OGLTransitionImpl> makeRochade()
+std::shared_ptr<OGLTransitionImpl> makeRochade()
{
Primitive Slide;
@@ -691,7 +687,7 @@ T clamp(const T& rIn)
return glm::clamp(rIn, T(-1.0), T(1.0));
}
-boost::shared_ptr<OGLTransitionImpl> makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt16 nPointsOnCircles )
+std::shared_ptr<OGLTransitionImpl> makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt16 nPointsOnCircles )
{
double dAngle(2*3.1415926/static_cast<double>( nPointsOnCircles ));
if(nCircles < 2 || nPointsOnCircles < 4)
@@ -806,7 +802,7 @@ boost::shared_ptr<OGLTransitionImpl> makeRevolvingCircles( ::sal_uInt16 nCircles
return makeSimpleTransition(aLeavingSlide, aEnteringSlide);
}
-boost::shared_ptr<OGLTransitionImpl> makeHelix( ::sal_uInt16 nRows )
+std::shared_ptr<OGLTransitionImpl> makeHelix( ::sal_uInt16 nRows )
{
double invN(1.0/static_cast<double>(nRows));
double iDn = 0.0;
@@ -838,7 +834,7 @@ boost::shared_ptr<OGLTransitionImpl> makeHelix( ::sal_uInt16 nRows )
return makeSimpleTransition(aLeavingSlide, aEnteringSlide);
}
-boost::shared_ptr<OGLTransitionImpl> makeNByMTileFlip( ::sal_uInt16 n, ::sal_uInt16 m )
+std::shared_ptr<OGLTransitionImpl> makeNByMTileFlip( ::sal_uInt16 n, ::sal_uInt16 m )
{
double invN(1.0/static_cast<double>(n));
double invM(1.0/static_cast<double>(m));
@@ -916,40 +912,40 @@ STranslate::STranslate(const glm::vec3& Vector, bool bInter, double T0, double T
{
}
-boost::shared_ptr<SRotate>
+std::shared_ptr<SRotate>
makeSRotate(const glm::vec3& Axis,const glm::vec3& Origin,double Angle,bool bInter, double T0, double T1)
{
- return make_shared<SRotate>(Axis, Origin, Angle, bInter, T0, T1);
+ return std::make_shared<SRotate>(Axis, Origin, Angle, bInter, T0, T1);
}
-boost::shared_ptr<SScale>
+std::shared_ptr<SScale>
makeSScale(const glm::vec3& Scale, const glm::vec3& Origin,bool bInter, double T0, double T1)
{
- return make_shared<SScale>(Scale, Origin, bInter, T0, T1);
+ return std::make_shared<SScale>(Scale, Origin, bInter, T0, T1);
}
-boost::shared_ptr<STranslate>
+std::shared_ptr<STranslate>
makeSTranslate(const glm::vec3& Vector,bool bInter, double T0, double T1)
{
- return make_shared<STranslate>(Vector, bInter, T0, T1);
+ return std::make_shared<STranslate>(Vector, bInter, T0, T1);
}
-boost::shared_ptr<SEllipseTranslate>
+std::shared_ptr<SEllipseTranslate>
makeSEllipseTranslate(double dWidth, double dHeight, double dStartPosition, double dEndPosition, bool bInter, double T0, double T1)
{
- return make_shared<SEllipseTranslate>(dWidth, dHeight, dStartPosition, dEndPosition, bInter, T0, T1);
+ return std::make_shared<SEllipseTranslate>(dWidth, dHeight, dStartPosition, dEndPosition, bInter, T0, T1);
}
-boost::shared_ptr<RotateAndScaleDepthByWidth>
+std::shared_ptr<RotateAndScaleDepthByWidth>
makeRotateAndScaleDepthByWidth(const glm::vec3& Axis,const glm::vec3& Origin,double Angle,bool bInter, double T0, double T1)
{
- return make_shared<RotateAndScaleDepthByWidth>(Axis, Origin, Angle, bInter, T0, T1);
+ return std::make_shared<RotateAndScaleDepthByWidth>(Axis, Origin, Angle, bInter, T0, T1);
}
-boost::shared_ptr<RotateAndScaleDepthByHeight>
+std::shared_ptr<RotateAndScaleDepthByHeight>
makeRotateAndScaleDepthByHeight(const glm::vec3& Axis,const glm::vec3& Origin,double Angle,bool bInter, double T0, double T1)
{
- return make_shared<RotateAndScaleDepthByHeight>(Axis, Origin, Angle, bInter, T0, T1);
+ return std::make_shared<RotateAndScaleDepthByHeight>(Axis, Origin, Angle, bInter, T0, T1);
}
inline double intervalInter(double t, double T0, double T1)
@@ -1173,15 +1169,15 @@ void DiamondTransition::prepare( double nTime, double /* SlideWidth */, double /
setScene(TransitionScene(aLeavingSlidePrimitives, aEnteringSlidePrimitives));
}
-shared_ptr<OGLTransitionImpl>
+std::shared_ptr<OGLTransitionImpl>
makeDiamondTransition(const TransitionSettings& rSettings)
{
- return make_shared<DiamondTransition>(TransitionScene(), rSettings);
+ return std::make_shared<DiamondTransition>(TransitionScene(), rSettings);
}
}
-boost::shared_ptr<OGLTransitionImpl> makeDiamond()
+std::shared_ptr<OGLTransitionImpl> makeDiamond()
{
TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
@@ -1189,7 +1185,7 @@ boost::shared_ptr<OGLTransitionImpl> makeDiamond()
return makeDiamondTransition(aSettings);
}
-boost::shared_ptr<OGLTransitionImpl> makeVenetianBlinds( bool vertical, int parts )
+std::shared_ptr<OGLTransitionImpl> makeVenetianBlinds( bool vertical, int parts )
{
static double t30 = tan( M_PI/6.0 );
double ln = 0;
@@ -1275,13 +1271,13 @@ void FadeSmoothlyTransition::displaySlides_( double nTime, ::sal_Int32 glLeaving
CHECK_GL_ERROR();
}
-shared_ptr<OGLTransitionImpl>
+std::shared_ptr<OGLTransitionImpl>
makeFadeSmoothlyTransition(
const Primitives_t& rLeavingSlidePrimitives,
const Primitives_t& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
- return make_shared<FadeSmoothlyTransition>(
+ return std::make_shared<FadeSmoothlyTransition>(
TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives),
rSettings)
;
@@ -1289,7 +1285,7 @@ makeFadeSmoothlyTransition(
}
-boost::shared_ptr<OGLTransitionImpl> makeFadeSmoothly()
+std::shared_ptr<OGLTransitionImpl> makeFadeSmoothly()
{
Primitive Slide;
@@ -1346,13 +1342,13 @@ void FadeThroughBlackTransition::displaySlides_( double nTime, ::sal_Int32 glLea
CHECK_GL_ERROR();
}
-shared_ptr<OGLTransitionImpl>
+std::shared_ptr<OGLTransitionImpl>
makeFadeThroughBlackTransition(
const Primitives_t& rLeavingSlidePrimitives,
const Primitives_t& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
- return make_shared<FadeThroughBlackTransition>(
+ return std::make_shared<FadeThroughBlackTransition>(
TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives),
rSettings)
;
@@ -1360,7 +1356,7 @@ makeFadeThroughBlackTransition(
}
-boost::shared_ptr<OGLTransitionImpl> makeFadeThroughBlack()
+std::shared_ptr<OGLTransitionImpl> makeFadeThroughBlack()
{
Primitive Slide;
@@ -1558,13 +1554,13 @@ GLuint StaticNoiseTransition::makeShader()
return OpenGLHelper::LoadShaders( "basicVertexShader", "staticFragmentShader" );
}
-shared_ptr<OGLTransitionImpl>
+std::shared_ptr<OGLTransitionImpl>
makeStaticNoiseTransition(
const Primitives_t& rLeavingSlidePrimitives,
const Primitives_t& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
- return make_shared<StaticNoiseTransition>(
+ return std::make_shared<StaticNoiseTransition>(
TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives),
rSettings)
;
@@ -1572,7 +1568,7 @@ makeStaticNoiseTransition(
}
-boost::shared_ptr<OGLTransitionImpl> makeStatic()
+std::shared_ptr<OGLTransitionImpl> makeStatic()
{
Primitive Slide;
@@ -1609,13 +1605,13 @@ GLuint DissolveTransition::makeShader()
return OpenGLHelper::LoadShaders( "basicVertexShader", "dissolveFragmentShader" );
}
-shared_ptr<OGLTransitionImpl>
+std::shared_ptr<OGLTransitionImpl>
makeDissolveTransition(
const Primitives_t& rLeavingSlidePrimitives,
const Primitives_t& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
- return make_shared<DissolveTransition>(
+ return std::make_shared<DissolveTransition>(
TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives),
rSettings)
;
@@ -1623,7 +1619,7 @@ makeDissolveTransition(
}
-boost::shared_ptr<OGLTransitionImpl> makeDissolve()
+std::shared_ptr<OGLTransitionImpl> makeDissolve()
{
Primitive Slide;
@@ -1641,7 +1637,7 @@ boost::shared_ptr<OGLTransitionImpl> makeDissolve()
return makeDissolveTransition(aLeavingSlide, aEnteringSlide, aSettings);
}
-boost::shared_ptr<OGLTransitionImpl> makeNewsflash()
+std::shared_ptr<OGLTransitionImpl> makeNewsflash()
{
Primitive Slide;
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
index 03ffd84..0b9b9d9 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
@@ -32,13 +32,13 @@
#include <glm/glm.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
#include <GL/glew.h>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b3dvector.hxx>
+#include <memory>
#include <vector>
class Primitive;
@@ -72,8 +72,8 @@ struct TransitionSettings
};
typedef std::vector<Primitive> Primitives_t;
-typedef std::vector<boost::shared_ptr<SceneObject> > SceneObjects_t;
-typedef std::vector<boost::shared_ptr<Operation> > Operations_t;
+typedef std::vector<std::shared_ptr<SceneObject> > SceneObjects_t;
+typedef std::vector<std::shared_ptr<Operation> > Operations_t;
class TransitionScene
{
@@ -215,26 +215,26 @@ private:
// "Constructors" of available transitions
-boost::shared_ptr<OGLTransitionImpl> makeOutsideCubeFaceToLeft();
-boost::shared_ptr<OGLTransitionImpl> makeInsideCubeFaceToLeft();
-boost::shared_ptr<OGLTransitionImpl> makeNByMTileFlip( ::sal_uInt16 n, ::sal_uInt16 m );
-boost::shared_ptr<OGLTransitionImpl> makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt16 nPointsOnCircles );
-boost::shared_ptr<OGLTransitionImpl> makeHelix( ::sal_uInt16 nRows );
-boost::shared_ptr<OGLTransitionImpl> makeFallLeaving();
-boost::shared_ptr<OGLTransitionImpl> makeTurnAround();
-boost::shared_ptr<OGLTransitionImpl> makeTurnDown();
-boost::shared_ptr<OGLTransitionImpl> makeIris();
-boost::shared_ptr<OGLTransitionImpl> makeRochade();
-boost::shared_ptr<OGLTransitionImpl> makeVenetianBlinds( bool vertical, int parts );
-boost::shared_ptr<OGLTransitionImpl> makeStatic();
-boost::shared_ptr<OGLTransitionImpl> makeDissolve();
-boost::shared_ptr<OGLTransitionImpl> makeNewsflash();
+std::shared_ptr<OGLTransitionImpl> makeOutsideCubeFaceToLeft();
+std::shared_ptr<OGLTransitionImpl> makeInsideCubeFaceToLeft();
+std::shared_ptr<OGLTransitionImpl> makeNByMTileFlip( ::sal_uInt16 n, ::sal_uInt16 m );
+std::shared_ptr<OGLTransitionImpl> makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt16 nPointsOnCircles );
+std::shared_ptr<OGLTransitionImpl> makeHelix( ::sal_uInt16 nRows );
+std::shared_ptr<OGLTransitionImpl> makeFallLeaving();
+std::shared_ptr<OGLTransitionImpl> makeTurnAround();
+std::shared_ptr<OGLTransitionImpl> makeTurnDown();
+std::shared_ptr<OGLTransitionImpl> makeIris();
+std::shared_ptr<OGLTransitionImpl> makeRochade();
+std::shared_ptr<OGLTransitionImpl> makeVenetianBlinds( bool vertical, int parts );
+std::shared_ptr<OGLTransitionImpl> makeStatic();
+std::shared_ptr<OGLTransitionImpl> makeDissolve();
+std::shared_ptr<OGLTransitionImpl> makeNewsflash();
/** 2D replacements
*/
-boost::shared_ptr<OGLTransitionImpl> makeDiamond();
-boost::shared_ptr<OGLTransitionImpl> makeFadeSmoothly();
-boost::shared_ptr<OGLTransitionImpl> makeFadeThroughBlack();
+std::shared_ptr<OGLTransitionImpl> makeDiamond();
+std::shared_ptr<OGLTransitionImpl> makeFadeSmoothly();
+std::shared_ptr<OGLTransitionImpl> makeFadeThroughBlack();
class SceneObject : private boost::noncopyable
{
@@ -409,7 +409,7 @@ private:
double angle;
};
-boost::shared_ptr<SRotate>
+std::shared_ptr<SRotate>
makeSRotate(const glm::vec3& Axis, const glm::vec3& Origin, double Angle,
bool bInter, double T0, double T1);
@@ -445,7 +445,7 @@ private:
glm::vec3 origin;
};
-boost::shared_ptr<SScale>
+std::shared_ptr<SScale>
makeSScale(const glm::vec3& Scale, const glm::vec3& Origin,bool bInter, double T0, double T1);
/** translation transformation
@@ -478,7 +478,7 @@ private:
glm::vec3 vector;
};
-boost::shared_ptr<STranslate>
+std::shared_ptr<STranslate>
makeSTranslate(const glm::vec3& Vector,bool bInter, double T0, double T1);
/** translation transformation
@@ -516,7 +516,7 @@ private:
double endPosition;
};
-boost::shared_ptr<SEllipseTranslate>
+std::shared_ptr<SEllipseTranslate>
makeSEllipseTranslate(double dWidth, double dHeight, double dStartPosition, double dEndPosition, bool bInter, double T0, double T1);
/** Same as SRotate, except the depth is scaled by the width of the slide divided by the width of the window.
@@ -534,7 +534,7 @@ private:
double angle;
};
-boost::shared_ptr<RotateAndScaleDepthByWidth>
+std::shared_ptr<RotateAndScaleDepthByWidth>
makeRotateAndScaleDepthByWidth(const glm::vec3& Axis,const glm::vec3& Origin,double Angle,bool bInter, double T0, double T1);
/** Same as SRotate, except the depth is scaled by the width of the slide divided by the height of the window.
@@ -552,7 +552,7 @@ private:
double angle;
};
-boost::shared_ptr<RotateAndScaleDepthByHeight>
+std::shared_ptr<RotateAndScaleDepthByHeight>
makeRotateAndScaleDepthByHeight(const glm::vec3& Axis,const glm::vec3& Origin,double Angle,bool bInter, double T0, double T1);
#endif // INCLUDED_SLIDESHOW_TRANSITION_HXX_
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 8cdfe21..7b00fda 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -26,11 +26,10 @@
*
************************************************************************/
-#include <boost/make_shared.hpp>
-#include <boost/shared_ptr.hpp>
-
#include <sal/types.h>
+#include <memory>
+
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
#include <com/sun/star/rendering/ColorComponentTag.hpp>
@@ -174,7 +173,7 @@ class OGLTransitionerImpl : private cppu::BaseMutex, private boost::noncopyable,
{
public:
OGLTransitionerImpl();
- void setTransition( boost::shared_ptr<OGLTransitionImpl> pOGLTransition );
+ void setTransition( std::shared_ptr<OGLTransitionImpl> pOGLTransition );
bool initialize( const Reference< presentation::XSlideShowView >& xView,
const Reference< rendering::XBitmap >& xLeavingSlide,
const Reference< rendering::XBitmap >& xEnteringSlide );
@@ -273,7 +272,7 @@ private:
/** Our Transition to be used.
*/
- boost::shared_ptr<OGLTransitionImpl> mpTransition;
+ std::shared_ptr<OGLTransitionImpl> mpTransition;
public:
/** whether we are running on ATI fglrx with bug related to textures
@@ -548,7 +547,7 @@ void OGLTransitionerImpl::impl_finishTransition()
mpTransition->finish();
}
-void OGLTransitionerImpl::setTransition( boost::shared_ptr<OGLTransitionImpl> pTransition )
+void OGLTransitionerImpl::setTransition( std::shared_ptr<OGLTransitionImpl> pTransition )
{
if ( mpTransition ) // already initialized
return;
@@ -1465,7 +1464,7 @@ public:
if ( !xRes->initialize( view, leavingBitmap, enteringBitmap ) )
return uno::Reference< presentation::XTransition >();
- boost::shared_ptr<OGLTransitionImpl> pTransition;
+ std::shared_ptr<OGLTransitionImpl> pTransition;
if( transitionType == animations::TransitionType::MISCSHAPEWIPE ) {
switch( transitionSubType )
commit 25e777f92facb202741f9b1db2888ba5c19f4d68
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Oct 26 10:20:26 2015 +0200
Simplify ifdefs
Change-Id: I5c3835f6fdc215e5d9dc1b8146c12e0d1a57da7c
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 28e68d5..8cdfe21 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -252,20 +252,16 @@ private:
#if defined( GLX_EXT_texture_from_pixmap )
GLXPixmap maLeavingPixmapGL;
GLXPixmap maEnteringPixmapGL;
+ Pixmap maLeavingPixmap;
+ Pixmap maEnteringPixmap;
+ bool mbFreeLeavingPixmap;
+ bool mbFreeEnteringPixmap;
#endif
#if defined( UNX ) && !defined( MACOSX )
bool mbRestoreSync;
#endif
bool mbUseLeavingPixmap;
bool mbUseEnteringPixmap;
-#if defined( GLX_EXT_texture_from_pixmap )
- bool mbFreeLeavingPixmap;
- bool mbFreeEnteringPixmap;
-#endif
-#if defined( UNX ) && !defined( MACOSX )
- Pixmap maLeavingPixmap;
- Pixmap maEnteringPixmap;
-#endif
/** the form the raw bytes are in for the bitmaps
*/
@@ -1381,20 +1377,16 @@ OGLTransitionerImpl::OGLTransitionerImpl()
#if defined( GLX_EXT_texture_from_pixmap )
, maLeavingPixmapGL(0)
, maEnteringPixmapGL(0)
+ , maLeavingPixmap(0)
+ , maEnteringPixmap(0)
+ , mbFreeLeavingPixmap(false)
+ , mbFreeEnteringPixmap(false)
#endif
#if defined( UNX ) && !defined( MACOSX )
, mbRestoreSync(false)
#endif
, mbUseLeavingPixmap(false)
, mbUseEnteringPixmap(false)
-#if defined( GLX_EXT_texture_from_pixmap )
- , mbFreeLeavingPixmap(false)
- , mbFreeEnteringPixmap(false)
-#endif
-#if defined( UNX ) && !defined( MACOSX )
- , maLeavingPixmap(0)
- , maEnteringPixmap(0)
-#endif
, maSlideBitmapLayout()
, maSlideSize()
, mbBrokenTexturesATI(false)
More information about the Libreoffice-commits
mailing list