From 4d1df397e2090a46b22d11fe7d8df52baec5aa39 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 16 Aug 2010 15:02:04 +0000
Subject: [PATCH] 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

"
---
 src/osg/ClipNode.cpp                         |  3 ++-
 src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp |  5 +++++
 src/osgText/Text.cpp                         | 10 +++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/osg/ClipNode.cpp b/src/osg/ClipNode.cpp
index 8d5acfb54..4646bba5b 100644
--- a/src/osg/ClipNode.cpp
+++ b/src/osg/ClipNode.cpp
@@ -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();
diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
index e2bc11e3c..c6f21180b 100644
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
@@ -67,6 +67,11 @@ FFmpegDecoderVideo::~FFmpegDecoderVideo()
     }
 #endif
 
+    if (m_context)
+    {
+        avcodec_close(m_context);
+    }
+
     OSG_INFO<<"Destructed FFmpegDecoderVideo"<<std::endl;
 }
 
diff --git a/src/osgText/Text.cpp b/src/osgText/Text.cpp
index c987727ea..ba98b95fc 100644
--- a/src/osgText/Text.cpp
+++ b/src/osgText/Text.cpp
@@ -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
         {