FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed memory leak with assignment of default value to ObjectSerializer

Browse Source
This commit is contained in:
Robert Osfield 2018-09-06 11:50:21 +01:00
parent 34d58d447d
commit d07fe93f34
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/osgDB/Serializer
View File

@ -551,21 +551,24 @@ public:
}; };
template<typename C, typename P> template<typename C, typename P>
class ObjectSerializer : public TemplateSerializer<P*> class ObjectSerializer : public BaseSerializer
{ {
public: public:
typedef TemplateSerializer<P*> ParentType;
typedef const P* (C::*Getter)() const; typedef const P* (C::*Getter)() const;
typedef void (C::*Setter)( P* ); typedef void (C::*Setter)( P* );
ObjectSerializer( const char* name, P* def, Getter gf, Setter sf ) : ParentType(name, def), _getter(gf), _setter(sf) ObjectSerializer( const char* name, P* def, Getter gf, Setter sf ) :
BaseSerializer(READ_WRITE_PROPERTY),
_name(name), _defaultValue(def), _getter(gf), _setter(sf)
{ {
ParentType::setUsage( _getter!=0, _setter!=0); setUsage( _getter!=0, _setter!=0);
} }
virtual bool set(osg::Object& obj, void* value) { C& object = OBJECT_CAST<C&>(obj); (object.*_setter)( dynamic_cast<P*>(*(reinterpret_cast<osg::Object**>(value))) ); return true; } virtual bool set(osg::Object& obj, void* value) { C& object = OBJECT_CAST<C&>(obj); (object.*_setter)( dynamic_cast<P*>(*(reinterpret_cast<osg::Object**>(value))) ); return true; }
virtual bool get(const osg::Object& obj, void* value) { const C& object = OBJECT_CAST<const C&>(obj);*(reinterpret_cast<const osg::Object**>(value )) = dynamic_cast<const osg::Object*>((object.*_getter)()); return true; } virtual bool get(const osg::Object& obj, void* value) { const C& object = OBJECT_CAST<const C&>(obj);*(reinterpret_cast<const osg::Object**>(value )) = dynamic_cast<const osg::Object*>((object.*_getter)()); return true; }
virtual const std::string& getName() const { return _name; }
virtual bool read( InputStream& is, osg::Object& obj ) virtual bool read( InputStream& is, osg::Object& obj )
{ {
C& object = OBJECT_CAST<C&>(obj); C& object = OBJECT_CAST<C&>(obj);
@ -579,7 +582,7 @@ public:
(object.*_setter)( value.get() ); (object.*_setter)( value.get() );
} }
} }
else if ( is.matchString(ParentType::_name) ) else if ( is.matchString(_name) )
{ {
is >> hasObject; is >> hasObject;
if ( hasObject ) if ( hasObject )
@ -606,9 +609,9 @@ public:
os.writeObject( value ); os.writeObject( value );
} }
} }
else if ( ParentType::_defaultValue!=value ) else if ( _defaultValue!=value )
{ {
os << os.PROPERTY((ParentType::_name).c_str()) << hasObject; os << os.PROPERTY(_name.c_str()) << hasObject;
if ( hasObject ) if ( hasObject )
{ {
os << os.BEGIN_BRACKET << std::endl; os << os.BEGIN_BRACKET << std::endl;
@ -621,6 +624,8 @@ public:
} }
public: public:
std::string _name;
osg::ref_ptr<P> _defaultValue;
Getter _getter; Getter _getter;
Setter _setter; Setter _setter;
}; };

2
src/osgWrappers/serializers/osg/PrimitiveSetIndirect.cpp
View File

@ -135,7 +135,7 @@ REGISTER_OBJECT_WRAPPER( DrawArraysIndirect,
osg::DrawArraysIndirect, osg::DrawArraysIndirect,
"osg::Object osg::BufferData osg::PrimitiveSet osg::DrawArraysIndirect" ) "osg::Object osg::BufferData osg::PrimitiveSet osg::DrawArraysIndirect" )
{ {
ADD_OBJECT_SERIALIZER( IndirectCommandArray, osg::IndirectCommandDrawArrays ,new osg::DefaultIndirectCommandDrawArrays()); ADD_OBJECT_SERIALIZER( IndirectCommandArray, osg::IndirectCommandDrawArrays, new osg::DefaultIndirectCommandDrawArrays());
ADD_UINT_SERIALIZER( FirstCommandToDraw, 0); ADD_UINT_SERIALIZER( FirstCommandToDraw, 0);
ADD_INT_SERIALIZER( Stride, 0); ADD_INT_SERIALIZER( Stride, 0);
} }