diff --git a/CMakeModules/FindRSVG.cmake b/CMakeModules/FindRSVG.cmake index cae658648..8d219ff21 100644 --- a/CMakeModules/FindRSVG.cmake +++ b/CMakeModules/FindRSVG.cmake @@ -5,7 +5,9 @@ IF(PKG_CONFIG_FOUND) INCLUDE(FindPkgConfig) - PKG_CHECK_MODULES(RSVG librsvg-2.0) + #Version 2.35 introduces the rsvg_cleanup function which is used + PKG_CHECK_MODULES(RSVG librsvg-2.0>=2.35) + PKG_CHECK_MODULES(CAIRO cairo) IF (RSVG_FOUND AND NOT CAIRO_FOUND) diff --git a/include/osg/ValueObject b/include/osg/ValueObject index d6ec0bd39..ed8ff2df2 100644 --- a/include/osg/ValueObject +++ b/include/osg/ValueObject @@ -44,6 +44,7 @@ class ValueObject : public Object class GetValueVisitor { public: + virtual ~GetValueVisitor() {} virtual void apply(bool /*value*/) {} virtual void apply(char /*value*/) {} virtual void apply(unsigned char /*value*/) {} @@ -69,6 +70,7 @@ class ValueObject : public Object class SetValueVisitor { public: + virtual ~SetValueVisitor() {} virtual void apply(bool& /*value*/) {} virtual void apply(char& /*value*/) {} virtual void apply(unsigned char& /*value*/) {}