summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/shapes/backgroundshape.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'slideshow/source/engine/shapes/backgroundshape.cxx')
-rw-r--r--slideshow/source/engine/shapes/backgroundshape.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx
index d304b9f901e6..3028b6f44c85 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -187,6 +187,8 @@ namespace slideshow::internal
{ return pBgShape->getViewLayer() == rLayer; } ) < 2,
"BackgroundShape::removeViewLayer(): Duplicate ViewLayer entries!" );
+// TODO : needed for the moment since ANDROID doesn't know size_t return from std::erase_if
+#if defined ANDROID
ViewBackgroundShapeVector::iterator aIter;
if( (aIter=::std::remove_if( maViewShapes.begin(),
@@ -202,6 +204,14 @@ namespace slideshow::internal
maViewShapes.erase( aIter, aEnd );
return true;
+#else
+
+ size_t nb = std::erase_if(maViewShapes,
+ [&rLayer]( const ViewBackgroundShapeSharedPtr& pBgShape )
+ { return pBgShape->getViewLayer() == rLayer; } );
+ // if nb == 0, it means view shape seemingly was not added, failed
+ return (nb != 0);
+#endif
}
void BackgroundShape::clearAllViewLayers()