[Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/12 11:18:52

Modified files:
        .              : ChangeLog 
        backend        : render_handler_agg.cpp 
        libmedia/ffmpeg: VideoDecoderFfmpeg.cpp VideoDecoderFfmpeg.h 

Log message:
        boost::foreach.hpp is not available as of boost-1.33.1.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5885&r2=1.5886
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.132&r2=1.133
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5885
retrieving revision 1.5886
diff -u -b -r1.5885 -r1.5886
--- ChangeLog   12 Mar 2008 10:32:48 -0000      1.5885
+++ ChangeLog   12 Mar 2008 11:18:50 -0000      1.5886
@@ -1,5 +1,11 @@
 2008-03-12 Sandro Santilli <address@hidden>
 
+       * backend/render_handler_agg.cpp,
+         libmedia/ffmpeg/VideoDecoderFfmpeg.{h,cpp}
+         boost::foreach.hpp is not available as of boost-1.33.1.
+
+2008-03-12 Sandro Santilli <address@hidden>
+
        * server/PropertyList.{cpp,h} (setValue): allow passing flags to use
          when creating new properties.
        * server/as_object.cpp: avoid the double scan when initializing

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- backend/render_handler_agg.cpp      12 Mar 2008 03:46:02 -0000      1.132
+++ backend/render_handler_agg.cpp      12 Mar 2008 11:18:51 -0000      1.133
@@ -171,7 +171,7 @@
 #include "render_handler_agg_bitmap.h"
 #include "render_handler_agg_style.h"
 
-#include <boost/foreach.hpp>
+//#include <boost/foreach.hpp>
 
 #ifndef round
 #define round(x) rint(x)
@@ -1058,11 +1058,20 @@
     
     paths_out.reserve(paths_in.size());
     
+    typedef std::vector<path> PathVect;
+    for (PathVect::const_iterator i=paths_in.begin(), e=paths_in.end(); i!=e; 
++i)
+    {
+       Path<float> floating_path = *i;
+       floating_path.transform(mat);
+       paths_out.push_back(floating_path);
+    }
+#if 0
     BOOST_FOREACH(const path& in_path, paths_in) {
       Path<float> floating_path = in_path;
       floating_path.transform(mat);
       paths_out.push_back(floating_path);
     }
+#endif
 
   } // apply_matrix
 

Index: libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/ffmpeg/VideoDecoderFfmpeg.cpp      5 Mar 2008 03:55:54 -0000       
1.6
+++ libmedia/ffmpeg/VideoDecoderFfmpeg.cpp      12 Mar 2008 11:18:51 -0000      
1.7
@@ -26,7 +26,9 @@
 }
 #endif
 #include <boost/scoped_array.hpp>
-#include <boost/foreach.hpp>
+//#include <boost/foreach.hpp>
+#include <boost/bind.hpp>
+#include <algorithm>
 
 namespace gnash {
 namespace media {
@@ -191,9 +193,12 @@
 {
   std::auto_ptr<image::rgb> ret;
 
+  std::for_each(_video_frames.begin(), _video_frames.end(), 
boost::bind(&gnash::media::VideoDecoderFfmpeg::decode, this, _1));
+#if 0
   BOOST_FOREACH(const EncodedVideoFrame* frame, _video_frames) {
     ret = decode(frame->data(), frame->dataSize());
   }
+#endif
 
   _video_frames.clear();
 

Index: libmedia/ffmpeg/VideoDecoderFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/ffmpeg/VideoDecoderFfmpeg.h        5 Mar 2008 03:55:54 -0000       
1.6
+++ libmedia/ffmpeg/VideoDecoderFfmpeg.h        12 Mar 2008 11:18:52 -0000      
1.7
@@ -63,6 +63,11 @@
 private:
 
   std::auto_ptr<image::rgb> decode(boost::uint8_t* input, boost::uint32_t 
input_size);
+
+  std::auto_ptr<image::rgb> decode(const EncodedVideoFrame* vf)
+  {
+       return decode(vf->data(), vf->dataSize());
+  }
 private:
 
   AVCodec* _videoCodec;