[Gnash-commit] gnash ChangeLog server/parser/Timeline.h

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/21 17:02:46

Modified files:
        .              : ChangeLog 
        server/parser  : Timeline.h 

Log message:
                * server/parser/Timeline.h: fix getFrameDepths to really return
                  depths. Add output operator.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3299&r2=1.3300
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Timeline.h?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3299
retrieving revision 1.3300
diff -u -b -r1.3299 -r1.3300
--- ChangeLog   21 May 2007 16:23:42 -0000      1.3299
+++ ChangeLog   21 May 2007 17:02:46 -0000      1.3300
@@ -1,3 +1,8 @@
+2007-05-21 Sandro Santilli <address@hidden>
+
+       * server/parser/Timeline.h: fix getFrameDepths to really return
+         depths. Add output operator.
+
 2007-05-21 Tomas Groth Christensen <address@hidden>
 
        * backend/sound_handler_sdl.cpp: Only try to detach video-sound

Index: server/parser/Timeline.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Timeline.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/parser/Timeline.h    21 May 2007 11:21:36 -0000      1.2
+++ server/parser/Timeline.h    21 May 2007 17:02:46 -0000      1.3
@@ -53,6 +53,8 @@
 
 public:
 
+       friend std::ostream& operator<< (std::ostream& os, const Timeline& t);
+
        /// Construct a Timeline instance 
        Timeline()
        {
@@ -157,11 +159,12 @@
        ///     
        ///     
        ///
-       void getFrameDepths(size_t frameno, std::vector<int> depths)
+       void getFrameDepths(size_t frameno, std::vector<int>& depths)
        {
                assert(frameno < _frameDepths.size());
 
-               depths.assign(_frameDepths[frameno].begin(), 
_frameDepths[frameno].end());
+               DepthSet& from = _frameDepths[frameno];
+               depths.assign(from.begin(), from.end());
        }
 
 private:
@@ -204,6 +207,21 @@
 
 };
 
+inline std::ostream&
+operator<< (std::ostream& os, const Timeline& t)
+{
+       for (Timeline::FrameDepths::const_iterator it=t._frameDepths.begin(), 
itEnd=t._frameDepths.end(); it!=itEnd; ++it)
+       {
+               os << "[";
+               for (Timeline::DepthSet::const_iterator di=it->begin(), 
de=it->end(); di!=de; ++di)
+               {
+                       if ( di != it->begin() ) os << ",";
+                       os << *di;
+               }
+               os << "]";
+       }
+       return os;
+}
 
 } // end of namespace gnash