From Guillaume Taze, "Here are some bugs fix :
- missing copy attribute _referenceFrame in ClipNode in copy constructor - checked iterators against the end in osgText - close codec context in ffmpeg plugin to avoid memory leak "
This commit is contained in:
parent
4e967ef3c3
commit
4d1df397e2
@ -25,7 +25,8 @@ ClipNode::ClipNode():
|
||||
|
||||
ClipNode::ClipNode(const ClipNode& cn, const CopyOp& copyop):
|
||||
Group(cn,copyop),
|
||||
_value(cn._value)
|
||||
_value(cn._value),
|
||||
_referenceFrame(cn._referenceFrame)
|
||||
{
|
||||
setStateSet(new StateSet);
|
||||
for(ClipPlaneList::const_iterator itr=cn._planes.begin();
|
||||
|
@ -67,6 +67,11 @@ FFmpegDecoderVideo::~FFmpegDecoderVideo()
|
||||
}
|
||||
#endif
|
||||
|
||||
if (m_context)
|
||||
{
|
||||
avcodec_close(m_context);
|
||||
}
|
||||
|
||||
OSG_INFO<<"Destructed FFmpegDecoderVideo"<<std::endl;
|
||||
}
|
||||
|
||||
|
@ -487,13 +487,9 @@ void Text::computeGlyphRepresentation()
|
||||
}
|
||||
}
|
||||
|
||||
if (itr!=_text.end())
|
||||
{
|
||||
// skip over spaces and return.
|
||||
while (*itr==' ') ++itr;
|
||||
if (*itr=='\n') ++itr;
|
||||
}
|
||||
|
||||
// skip over spaces and return.
|
||||
while (itr != _text.end() && *itr==' ') ++itr;
|
||||
if (itr != _text.end() && *itr=='\n') ++itr;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user